Skip to content

Commit ed15112

Browse files
bootflatbootflat
committed
update sass 3.3.3 support
1 parent ab64428 commit ed15112

22 files changed

Lines changed: 123 additions & 127 deletions

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BOOTFLAT is an open source Flat UI KIT based on Bootstrap 3.1.0 CSS framework. It provides a faster, easier and less repetitive way for web developers to create elegant web apps.
44

5-
Bootflat is built on the foundations of Bootstrap, visioned in a stunning flat design. Bootstrap itself is a trusted, reliable and proven tool for developers. Built with `Sass 3.3.0.rc.2`.
5+
Bootflat is built on the foundations of Bootstrap, visioned in a stunning flat design. Bootstrap itself is a trusted, reliable and proven tool for developers. Built with `Sass 3.3.3`.
66

77
Bootflat is compatible with the following browsers: `IE8, IE9, IE10, Firefox, Safari, Opera, Chrome`.
88

‎bootflat/css/bootflat.css‎

Lines changed: 28 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootflat/css/bootflat.css.map‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootflat/css/bootflat.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootflat/scss/bootflat/_accordion.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $accordion-panel-shadow: 0 1px 2px rgba(0, 0, 0, .2) !defa
2222
*/
2323

2424
.accordion {
25-
& #{&}-header {
25+
& &-header {
2626
margin-top: 0;
2727
font-size: 16px;
2828
display: block;

‎bootflat/scss/bootflat/_alert.scss‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@ $alert-link-color: $mediumgray-light !default;
2626
font-weight: bold;
2727
}
2828

29-
#{&}-dismissable .close {
29+
&-dismissable .close {
3030
color: $alert-close-color;
3131
@include opacity($opacity: 70, $filter: true);
3232
}
3333

34-
@at-root #{&}-info {
34+
@at-root &-info {
3535
background-color: lighten($alert-primary, 10%);
3636
border: $alert-primary;
3737
}
38-
@at-root #{&}-warning {
38+
@at-root &-warning {
3939
background-color: lighten($alert-warning, 10%);
4040
border: $alert-warning;
4141
}
42-
@at-root #{&}-danger {
42+
@at-root &-danger {
4343
background-color: lighten($alert-danger, 10%);
4444
border: $alert-danger;
4545
}
46-
@at-root #{&}-success {
46+
@at-root &-success {
4747
background-color: lighten($alert-success, 10%);
4848
border: $alert-success;
4949
}
5050

51-
@at-root & #{&}-link {
51+
@at-root & &-link {
5252
cursor: pointer;
5353
text-decoration: underline;
5454
@include opacity($opacity: 65, $filter: true);

‎bootflat/scss/bootflat/_button.scss‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
5858
@include opacity($opacity: $button-opacity, $filter: true);
5959
}
6060

61-
@at-root #{&}-link {
61+
@at-root &-link {
6262
&,
6363
&:hover,
6464
&:focus,
@@ -77,7 +77,7 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
7777
}
7878
}
7979

80-
@at-root #{&}-default {
80+
@at-root &-default {
8181
color: $button-font-color-dark;
8282
border-color: $button-normal !important;
8383

@@ -94,12 +94,12 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
9494
background-color: $button-default;
9595
}
9696
}
97-
@at-root .open .dropdown-toggle#{&}-default {
97+
@at-root .open .dropdown-toggle.btn-default {
9898
border-color: $button-normal-hover;
9999
background-color: $button-normal-hover;
100100
}
101101

102-
@at-root #{&}-primary {
102+
@at-root &-primary {
103103
&,
104104
&:active,
105105
&.active,
@@ -114,12 +114,12 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
114114
background-color: $button-primary-hover;
115115
}
116116
}
117-
@at-root .open .dropdown-toggle#{&}-primary {
117+
@at-root .open .dropdown-toggle.btn-primary {
118118
border-color: $button-primary-hover;
119119
background-color: $button-primary-hover;
120120
}
121121

122-
@at-root #{&}-info {
122+
@at-root &-info {
123123
&,
124124
&:active,
125125
&.active,
@@ -134,12 +134,12 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
134134
background-color: $button-info-hover;
135135
}
136136
}
137-
@at-root .open .dropdown-toggle#{&}-info {
137+
@at-root .open .dropdown-toggle.btn-info {
138138
border-color: $button-info-hover;
139139
background-color: $button-info-hover;
140140
}
141141

142-
@at-root #{&}-success {
142+
@at-root &-success {
143143
&,
144144
&:active,
145145
&.active,
@@ -154,12 +154,12 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
154154
background-color: $button-success-hover;
155155
}
156156
}
157-
@at-root .open .dropdown-toggle#{&}-success {
157+
@at-root .open .dropdown-toggle.btn-success {
158158
border-color: $button-success-hover;
159159
background-color: $button-success-hover;
160160
}
161161

162-
@at-root #{&}-warning {
162+
@at-root &-warning {
163163
&,
164164
&:active,
165165
&.active,
@@ -174,18 +174,18 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
174174
background-color: $button-warning-hover;
175175
}
176176
}
177-
@at-root .open .dropdown-toggle#{&}-warning {
177+
@at-root .open .dropdown-toggle.btn-warning {
178178
border-color: $button-warning-hover;
179179
background-color: $button-warning-hover;
180180
}
181181

182-
@at-root #{&}-danger {
182+
@at-root &-danger {
183183
&,
184184
&:active,
185185
&.active,
186186
&.disabled,
187187
&[disabled],
188-
.open .dropdown-toggle#{&} {
188+
.open .dropdown-toggle.btn {
189189
border-color: $button-danger;
190190
background-color: $button-danger;
191191
}
@@ -195,7 +195,7 @@ $button-shaodw: inset 0 1px 2px rgba(0, 0, 0, .125) !default;
195195
background-color: $button-danger-hover;
196196
}
197197
}
198-
@at-root .open .dropdown-toggle#{&}-danger {
198+
@at-root .open .dropdown-toggle.btn-danger {
199199
border-color: $button-danger-hover;
200200
background-color: $button-danger-hover;
201201
}

‎bootflat/scss/bootflat/_button_group.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* --------------------------------------------------
99
*/
1010
.btn-group {
11-
@at-root #{&}.open .dropdown-toggle {
11+
@at-root &.open .dropdown-toggle {
1212
@include box-shadow($value: inset 0 1px 2px rgba(0, 0, 0, .125));
1313
}
1414

1515
& .btn {
1616
border-left-color: darken($button-normal, 7%);
1717
}
1818

19-
@at-root #{&}.open .btn-default.dropdown-toggle,
19+
@at-root &.open .btn-default.dropdown-toggle,
2020
& .btn-default:focus,
2121
& .btn-default:active,
2222
& .btn-default.active {

0 commit comments

Comments
 (0)