Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Stevens <jan@playpass.be>2015-08-25 17:52:58 +0300
committerJan Stevens <jan@playpass.be>2015-08-25 17:52:58 +0300
commitd4c7c325eca7e60bc2dc2b300d75319f052086fe (patch)
tree713d935afdf6af6d184a6990b47a65363aa7b1d9 /assets/stylesheets
parenta3f606b2c2daeceef765c2843364f1a04a1b43ae (diff)
Updated to latest v4-dev build and fixed some leftover stuff
Diffstat (limited to 'assets/stylesheets')
-rw-r--r--assets/stylesheets/bootstrap/_breadcrumb.scss2
-rw-r--r--assets/stylesheets/bootstrap/_carousel.scss4
-rw-r--r--assets/stylesheets/bootstrap/_custom-forms.scss8
-rw-r--r--assets/stylesheets/bootstrap/_dropdown.scss6
-rw-r--r--assets/stylesheets/bootstrap/_navbar.scss2
-rw-r--r--assets/stylesheets/bootstrap/_popover.scss14
-rw-r--r--assets/stylesheets/bootstrap/_print.scss6
-rw-r--r--assets/stylesheets/bootstrap/_reboot.scss4
-rw-r--r--assets/stylesheets/bootstrap/_type.scss6
-rw-r--r--assets/stylesheets/bootstrap/_variables.scss2
-rw-r--r--assets/stylesheets/bootstrap/mixins/_clearfix.scss2
11 files changed, 28 insertions, 28 deletions
diff --git a/assets/stylesheets/bootstrap/_breadcrumb.scss b/assets/stylesheets/bootstrap/_breadcrumb.scss
index d2302b8..07ca300 100644
--- a/assets/stylesheets/bootstrap/_breadcrumb.scss
+++ b/assets/stylesheets/bootstrap/_breadcrumb.scss
@@ -8,7 +8,7 @@
> li {
display: inline-block;
- + li:before {
+ + li::before {
$nbsp: "\00a0";
padding-right: .5rem;
padding-left: .5rem;
diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap/_carousel.scss
index c5a7fdf..c7d182b 100644
--- a/assets/stylesheets/bootstrap/_carousel.scss
+++ b/assets/stylesheets/bootstrap/_carousel.scss
@@ -141,12 +141,12 @@
}
.icon-prev {
- &:before {
+ &::before {
content: "\2039";// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
}
}
.icon-next {
- &:before {
+ &::before {
content: "\203a";// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
}
}
diff --git a/assets/stylesheets/bootstrap/_custom-forms.scss b/assets/stylesheets/bootstrap/_custom-forms.scss
index 0565f2f..1fec265 100644
--- a/assets/stylesheets/bootstrap/_custom-forms.scss
+++ b/assets/stylesheets/bootstrap/_custom-forms.scss
@@ -109,7 +109,7 @@
.c-input {
display: inline;
- &:after {
+ &::after {
display: block;
margin-bottom: .25rem;
content: "";
@@ -180,7 +180,7 @@
.file input {
min-width: 14rem;
margin: 0;
- filter: alpha(opacity=0);
+ filter: alpha(opacity = 0);
opacity: 0;
}
.file-custom {
@@ -199,10 +199,10 @@
border-radius: .25rem;
@include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05));
}
-.file-custom:after {
+.file-custom::after {
content: "Choose file...";
}
-.file-custom:before {
+.file-custom::before {
position: absolute;
top: -.075rem;
right: -.075rem;
diff --git a/assets/stylesheets/bootstrap/_dropdown.scss b/assets/stylesheets/bootstrap/_dropdown.scss
index 3b0df96..aa1a9d1 100644
--- a/assets/stylesheets/bootstrap/_dropdown.scss
+++ b/assets/stylesheets/bootstrap/_dropdown.scss
@@ -6,7 +6,7 @@
.dropdown-toggle {
// Generate the caret automatically
- &:after {
+ &::after {
display: inline-block;
width: 0;
height: 0;
@@ -26,9 +26,9 @@
.dropup {
.dropdown-toggle {
- &:after {
- border-bottom: $caret-width solid;
+ &::after {
border-top: 0;
+ border-bottom: $caret-width solid;
}
}
}
diff --git a/assets/stylesheets/bootstrap/_navbar.scss b/assets/stylesheets/bootstrap/_navbar.scss
index 94cf100..7fbd444 100644
--- a/assets/stylesheets/bootstrap/_navbar.scss
+++ b/assets/stylesheets/bootstrap/_navbar.scss
@@ -93,7 +93,7 @@
margin-left: $navbar-padding-horizontal;
overflow: hidden;
- &:before {
+ &::before {
content: "\00a0";
}
}
diff --git a/assets/stylesheets/bootstrap/_popover.scss b/assets/stylesheets/bootstrap/_popover.scss
index 2bd8415..674a8f3 100644
--- a/assets/stylesheets/bootstrap/_popover.scss
+++ b/assets/stylesheets/bootstrap/_popover.scss
@@ -29,7 +29,7 @@
margin-left: -$popover-arrow-outer-width;
border-top-color: $popover-arrow-outer-color;
border-bottom-width: 0;
- &:after {
+ &::after {
bottom: 1px;
margin-left: -$popover-arrow-width;
content: "";
@@ -49,7 +49,7 @@
margin-top: -$popover-arrow-outer-width;
border-right-color: $popover-arrow-outer-color;
border-left-width: 0;
- &:after {
+ &::after {
bottom: -$popover-arrow-width;
left: 1px;
content: "";
@@ -69,7 +69,7 @@
margin-left: -$popover-arrow-outer-width;
border-top-width: 0;
border-bottom-color: $popover-arrow-outer-color;
- &:after {
+ &::after {
top: 1px;
margin-left: -$popover-arrow-width;
content: "";
@@ -89,7 +89,7 @@
margin-top: -$popover-arrow-outer-width;
border-right-width: 0;
border-left-color: $popover-arrow-outer-color;
- &:after {
+ &::after {
right: 1px;
bottom: -$popover-arrow-width;
content: "";
@@ -118,11 +118,11 @@
// Arrows
//
-// .popover-arrow is outer, .popover-arrow:after is inner
+// .popover-arrow is outer, .popover-arrow::after is inner
.popover-arrow {
&,
- &:after {
+ &::after {
position: absolute;
display: block;
width: 0;
@@ -134,7 +134,7 @@
.popover-arrow {
border-width: $popover-arrow-outer-width;
}
-.popover-arrow:after {
+.popover-arrow::after {
content: "";
border-width: $popover-arrow-width;
}
diff --git a/assets/stylesheets/bootstrap/_print.scss b/assets/stylesheets/bootstrap/_print.scss
index 4bbece5..e9cc65e 100644
--- a/assets/stylesheets/bootstrap/_print.scss
+++ b/assets/stylesheets/bootstrap/_print.scss
@@ -7,8 +7,8 @@
@media print {
*,
- *:before,
- *:after {
+ *::before,
+ *::after {
text-shadow: none !important;
box-shadow: none !important;
}
@@ -18,7 +18,7 @@
text-decoration: underline;
}
- abbr[title]:after {
+ abbr[title]::after {
content: " (" attr(title) ")";
}
diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss
index de32aae..0c0accb 100644
--- a/assets/stylesheets/bootstrap/_reboot.scss
+++ b/assets/stylesheets/bootstrap/_reboot.scss
@@ -22,8 +22,8 @@ html {
}
*,
-*:before,
-*:after {
+*::before,
+*::after {
box-sizing: inherit;
}
diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap/_type.scss
index 3d349e6..2d2de68 100644
--- a/assets/stylesheets/bootstrap/_type.scss
+++ b/assets/stylesheets/bootstrap/_type.scss
@@ -143,7 +143,7 @@ mark,
line-height: $line-height;
color: $blockquote-small-color;
- &:before {
+ &::before {
content: "\2014 \00A0"; // em dash, nbsp
}
}
@@ -159,8 +159,8 @@ mark,
// Account for citation
footer {
- &:before { content: ""; }
- &:after {
+ &::before { content: ""; }
+ &::after {
content: "\00A0 \2014"; // nbsp, em dash
}
}
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index b96e45b..e4b6387 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -179,7 +179,7 @@ $hr-border-width: $border-width !default;
//
// Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-$line-height-lg: (4/3) !default;
+$line-height-lg: (4 / 3) !default;
$line-height-sm: 1.5 !default;
$border-radius: .25rem !default;
diff --git a/assets/stylesheets/bootstrap/mixins/_clearfix.scss b/assets/stylesheets/bootstrap/mixins/_clearfix.scss
index 439455f..d0ae125 100644
--- a/assets/stylesheets/bootstrap/mixins/_clearfix.scss
+++ b/assets/stylesheets/bootstrap/mixins/_clearfix.scss
@@ -1,5 +1,5 @@
@mixin clearfix() {
- &:after {
+ &::after {
content: "";
display: table;
clear: both;