Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
916761d5
Commit
916761d5
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix styles on right aligned blockquote to flip padding and border appropriately
parent
9daf1661
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bootstrap.css
+5
-1
bootstrap.css
bootstrap.min.css
+1
-1
bootstrap.min.css
lib/type.less
+4
-0
lib/type.less
with
10 additions
and
2 deletions
+10
-2
bootstrap.css
+
5
-
1
View file @
916761d5
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 8 01:5
4
:4
2
PST 2012
* Date: Sun Jan 8 01:5
6
:4
7
PST 2012
*/
*/
html
,
body
{
html
,
body
{
margin
:
0
;
margin
:
0
;
...
@@ -485,6 +485,10 @@ blockquote small:before {
...
@@ -485,6 +485,10 @@ blockquote small:before {
}
}
blockquote
.pull-right
{
blockquote
.pull-right
{
float
:
right
;
float
:
right
;
padding-left
:
0
;
padding-right
:
15px
;
border-left
:
0
;
border-right
:
5px
solid
#eee
;
}
}
blockquote
.pull-right
p
,
blockquote
.pull-right
small
{
blockquote
.pull-right
p
,
blockquote
.pull-right
small
{
text-align
:
right
;
text-align
:
right
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
1
-
1
View file @
916761d5
...
@@ -87,7 +87,7 @@ em{font-style:italic;font-weight:inherit;line-height:inherit;}
...
@@ -87,7 +87,7 @@ em{font-style:italic;font-weight:inherit;line-height:inherit;}
abbr
{
font-size
:
90%
;
text-transform
:
uppercase
;
border-bottom
:
1px
dotted
#ddd
;
cursor
:
help
;}
abbr
{
font-size
:
90%
;
text-transform
:
uppercase
;
border-bottom
:
1px
dotted
#ddd
;
cursor
:
help
;}
blockquote
{
padding-left
:
15px
;
margin-bottom
:
18px
;
border-left
:
5px
solid
#eee
;}
blockquote
p
{
margin-bottom
:
0
;
font-size
:
300
;
font-weight
:
16px
;
line-height
:
22.5px
;}
blockquote
{
padding-left
:
15px
;
margin-bottom
:
18px
;
border-left
:
5px
solid
#eee
;}
blockquote
p
{
margin-bottom
:
0
;
font-size
:
300
;
font-weight
:
16px
;
line-height
:
22.5px
;}
blockquote
small
{
display
:
block
;
line-height
:
18px
;
color
:
#999999
;}
blockquote
small
:before
{
content
:
'\2014 \00A0'
;}
blockquote
small
{
display
:
block
;
line-height
:
18px
;
color
:
#999999
;}
blockquote
small
:before
{
content
:
'\2014 \00A0'
;}
blockquote
.pull-right
{
float
:
right
;}
blockquote
.pull-right
p
,
blockquote
.pull-right
small
{
text-align
:
right
;}
blockquote
.pull-right
{
float
:
right
;
padding-left
:
0
;
padding-right
:
15px
;
border-left
:
0
;
border-right
:
5px
solid
#eee
;
}
blockquote
.pull-right
p
,
blockquote
.pull-right
small
{
text-align
:
right
;}
address
{
display
:
block
;
margin-bottom
:
18px
;
line-height
:
18px
;}
address
{
display
:
block
;
margin-bottom
:
18px
;
line-height
:
18px
;}
code
,
pre
{
padding
:
0
3px
2px
;
font-family
:
Menlo
,
Monaco
,
"Courier New"
,
monospace
;
font-size
:
12px
;
color
:
#333333
;
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;}
code
,
pre
{
padding
:
0
3px
2px
;
font-family
:
Menlo
,
Monaco
,
"Courier New"
,
monospace
;
font-size
:
12px
;
color
:
#333333
;
-webkit-border-radius
:
3px
;
-moz-border-radius
:
3px
;
border-radius
:
3px
;}
code
{
padding
:
1px
3px
;
background-color
:
#fee9cc
;}
code
{
padding
:
1px
3px
;
background-color
:
#fee9cc
;}
...
...
This diff is collapsed.
Click to expand it.
lib/type.less
+
4
-
0
View file @
916761d5
...
@@ -165,6 +165,10 @@ blockquote {
...
@@ -165,6 +165,10 @@ blockquote {
// Float right with text-align: right
// Float right with text-align: right
&.pull-right {
&.pull-right {
float: right;
float: right;
padding-left: 0;
padding-right: 15px;
border-left: 0;
border-right: 5px solid #eee;
p,
p,
small {
small {
text-align: right;
text-align: right;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets