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
46a524f3
Commit
46a524f3
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #17058 from kkirsche/patch-6
Use double colons for psuedo elements
parents
c8ab0a56
d51f0a4f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
scss/_breadcrumb.scss
+1
-1
scss/_breadcrumb.scss
scss/_carousel.scss
+2
-2
scss/_carousel.scss
scss/_custom-forms.scss
+3
-3
scss/_custom-forms.scss
scss/_dropdown.scss
+2
-2
scss/_dropdown.scss
scss/_navbar.scss
+1
-1
scss/_navbar.scss
scss/_popover.scss
+7
-7
scss/_popover.scss
scss/_print.scss
+3
-3
scss/_print.scss
scss/_progress.scss
+1
-1
scss/_progress.scss
scss/_reboot.scss
+2
-2
scss/_reboot.scss
scss/_type.scss
+3
-3
scss/_type.scss
scss/mixins/_clearfix.scss
+1
-1
scss/mixins/_clearfix.scss
with
26 additions
and
26 deletions
+26
-26
scss/_breadcrumb.scss
+
1
-
1
View file @
46a524f3
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
>
li
{
>
li
{
display
:
inline-block
;
display
:
inline-block
;
+
li
:before
{
+
li
:
:
before
{
$nbsp
:
"\00a0"
;
$nbsp
:
"\00a0"
;
padding-right
:
.5rem
;
padding-right
:
.5rem
;
padding-left
:
.5rem
;
padding-left
:
.5rem
;
...
...
This diff is collapsed.
Click to expand it.
scss/_carousel.scss
+
2
-
2
View file @
46a524f3
...
@@ -141,12 +141,12 @@
...
@@ -141,12 +141,12 @@
}
}
.icon-prev
{
.icon-prev
{
&
:before
{
&
:
:
before
{
content
:
"\2039"
;
// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
content
:
"\2039"
;
// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
}
}
}
}
.icon-next
{
.icon-next
{
&
:before
{
&
:
:
before
{
content
:
"\203a"
;
// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
content
:
"\203a"
;
// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_custom-forms.scss
+
3
-
3
View file @
46a524f3
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
.c-input
{
.c-input
{
display
:
inline
;
display
:
inline
;
&
:after
{
&
:
:
after
{
display
:
block
;
display
:
block
;
margin-bottom
:
.25rem
;
margin-bottom
:
.25rem
;
content
:
""
;
content
:
""
;
...
@@ -199,10 +199,10 @@
...
@@ -199,10 +199,10 @@
border-radius
:
.25rem
;
border-radius
:
.25rem
;
@include
box-shadow
(
inset
0
.2rem
.4rem
rgba
(
0
,
0
,
0
,.
05
));
@include
box-shadow
(
inset
0
.2rem
.4rem
rgba
(
0
,
0
,
0
,.
05
));
}
}
.file-custom
:after
{
.
file-custom
:
:
after
{
content
:
"Choose file..."
;
content
:
"Choose file..."
;
}
}
.file-custom
:before
{
.
file-custom
:
:
before
{
position
:
absolute
;
position
:
absolute
;
top
:
-.075rem
;
top
:
-.075rem
;
right
:
-.075rem
;
right
:
-.075rem
;
...
...
This diff is collapsed.
Click to expand it.
scss/_dropdown.scss
+
2
-
2
View file @
46a524f3
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.dropdown-toggle
{
.dropdown-toggle
{
// Generate the caret automatically
// Generate the caret automatically
&
:after
{
&
:
:
after
{
display
:
inline-block
;
display
:
inline-block
;
width
:
0
;
width
:
0
;
height
:
0
;
height
:
0
;
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
.dropup
{
.dropup
{
.dropdown-toggle
{
.dropdown-toggle
{
&
:after
{
&
:
:
after
{
border-bottom
:
$caret-width
solid
;
border-bottom
:
$caret-width
solid
;
border-top
:
0
;
border-top
:
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_navbar.scss
+
1
-
1
View file @
46a524f3
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
margin-left
:
$navbar-padding-horizontal
;
margin-left
:
$navbar-padding-horizontal
;
overflow
:
hidden
;
overflow
:
hidden
;
&
:before
{
&
:
:
before
{
content
:
"\00a0"
;
content
:
"\00a0"
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_popover.scss
+
7
-
7
View file @
46a524f3
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
margin-left
:
-
$popover-arrow-outer-width
;
margin-left
:
-
$popover-arrow-outer-width
;
border-top-color
:
$popover-arrow-outer-color
;
border-top-color
:
$popover-arrow-outer-color
;
border-bottom-width
:
0
;
border-bottom-width
:
0
;
&
:after
{
&
:
:
after
{
bottom
:
1px
;
bottom
:
1px
;
margin-left
:
-
$popover-arrow-width
;
margin-left
:
-
$popover-arrow-width
;
content
:
""
;
content
:
""
;
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
margin-top
:
-
$popover-arrow-outer-width
;
margin-top
:
-
$popover-arrow-outer-width
;
border-right-color
:
$popover-arrow-outer-color
;
border-right-color
:
$popover-arrow-outer-color
;
border-left-width
:
0
;
border-left-width
:
0
;
&
:after
{
&
:
:
after
{
bottom
:
-
$popover-arrow-width
;
bottom
:
-
$popover-arrow-width
;
left
:
1px
;
left
:
1px
;
content
:
""
;
content
:
""
;
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
margin-left
:
-
$popover-arrow-outer-width
;
margin-left
:
-
$popover-arrow-outer-width
;
border-top-width
:
0
;
border-top-width
:
0
;
border-bottom-color
:
$popover-arrow-outer-color
;
border-bottom-color
:
$popover-arrow-outer-color
;
&
:after
{
&
:
:
after
{
top
:
1px
;
top
:
1px
;
margin-left
:
-
$popover-arrow-width
;
margin-left
:
-
$popover-arrow-width
;
content
:
""
;
content
:
""
;
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
margin-top
:
-
$popover-arrow-outer-width
;
margin-top
:
-
$popover-arrow-outer-width
;
border-right-width
:
0
;
border-right-width
:
0
;
border-left-color
:
$popover-arrow-outer-color
;
border-left-color
:
$popover-arrow-outer-color
;
&
:after
{
&
:
:
after
{
right
:
1px
;
right
:
1px
;
bottom
:
-
$popover-arrow-width
;
bottom
:
-
$popover-arrow-width
;
content
:
""
;
content
:
""
;
...
@@ -118,11 +118,11 @@
...
@@ -118,11 +118,11 @@
// Arrows
// Arrows
//
//
// .popover-arrow is outer, .popover-arrow:after is inner
// .popover-arrow is outer, .popover-arrow:
:
after is inner
.popover-arrow
{
.popover-arrow
{
&
,
&
,
&
:after
{
&
:
:
after
{
position
:
absolute
;
position
:
absolute
;
display
:
block
;
display
:
block
;
width
:
0
;
width
:
0
;
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
.popover-arrow
{
.popover-arrow
{
border-width
:
$popover-arrow-outer-width
;
border-width
:
$popover-arrow-outer-width
;
}
}
.popover-arrow
:after
{
.
popover-arrow
:
:
after
{
content
:
""
;
content
:
""
;
border-width
:
$popover-arrow-width
;
border-width
:
$popover-arrow-width
;
}
}
This diff is collapsed.
Click to expand it.
scss/_print.scss
+
3
-
3
View file @
46a524f3
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
@media
print
{
@media
print
{
*,
*,
*
:before
,
*
:
:
before
,
*
:after
{
*:
:
after
{
text-shadow
:
none
!
important
;
text-shadow
:
none
!
important
;
box-shadow
:
none
!
important
;
box-shadow
:
none
!
important
;
}
}
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
abbr
[
title
]
:after
{
abbr
[
title
]
:
:
after
{
content
:
" ("
attr
(
title
)
")"
;
content
:
" ("
attr
(
title
)
")"
;
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_progress.scss
+
1
-
1
View file @
46a524f3
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
@include
border-radius
(
$border-radius
);
@include
border-radius
(
$border-radius
);
@include
box-shadow
(
inset
0
.1rem
.1rem
rgba
(
0
,
0
,
0
,.
1
));
@include
box-shadow
(
inset
0
.1rem
.1rem
rgba
(
0
,
0
,
0
,.
1
));
}
}
.progress
[
value
]
::-webkit-progress-value::before
{
.progress
[
value
]
::-webkit-progress-value::
:
before
{
content
:
attr
(
value
);
content
:
attr
(
value
);
}
}
.progress
[
value
]
::-webkit-progress-value
{
.progress
[
value
]
::-webkit-progress-value
{
...
...
This diff is collapsed.
Click to expand it.
scss/_reboot.scss
+
2
-
2
View file @
46a524f3
...
@@ -22,8 +22,8 @@ html {
...
@@ -22,8 +22,8 @@ html {
}
}
*,
*,
*
:before
,
*
:
:
before
,
*
:after
{
*:
:
after
{
box-sizing
:
inherit
;
box-sizing
:
inherit
;
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/_type.scss
+
3
-
3
View file @
46a524f3
...
@@ -143,7 +143,7 @@ mark,
...
@@ -143,7 +143,7 @@ mark,
line-height
:
$line-height
;
line-height
:
$line-height
;
color
:
$blockquote-small-color
;
color
:
$blockquote-small-color
;
&
:before
{
&
:
:
before
{
content
:
"\2014 \00A0"
;
// em dash, nbsp
content
:
"\2014 \00A0"
;
// em dash, nbsp
}
}
}
}
...
@@ -159,8 +159,8 @@ mark,
...
@@ -159,8 +159,8 @@ mark,
// Account for citation
// Account for citation
footer
{
footer
{
&
:before
{
content
:
""
;
}
&
:
:
before
{
content
:
""
;
}
&
:after
{
&
:
:
after
{
content
:
"\00A0 \2014"
;
// nbsp, em dash
content
:
"\00A0 \2014"
;
// nbsp, em dash
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
scss/mixins/_clearfix.scss
+
1
-
1
View file @
46a524f3
@mixin
clearfix
()
{
@mixin
clearfix
()
{
&
:after
{
&
:
:
after
{
content
:
""
;
content
:
""
;
display
:
table
;
display
:
table
;
clear
:
both
;
clear
:
both
;
...
...
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