Skip to content

Commit 43ff419

Browse files
committed
Fixing sass issues iwth :not() and @extend using together bug
1 parent 7f03950 commit 43ff419

File tree

7 files changed

+245
-246
lines changed

7 files changed

+245
-246
lines changed

gulpfile.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@ var browserSync = require('browser-sync');
66
var reload = browserSync.reload;
77
var autoprefixer = require('gulp-autoprefixer');
88
var plumber = require('gulp-plumber');
9-
var watch = require('gulp-watch');
109

1110
var config = {
12-
djangoHost: '0.0.0.0',
11+
djangoHost: 'localhost',
1312
djangoPort: 8000,
1413
jsPort: 8001,
1514
watchSassFiles: 'suit/sass/**/*.scss',
1615
cssOutputDir: 'suit/static/suit/css/',
1716
watchHtmlFiles: [
1817
'suit/templates/**/*.html',
1918
'demo/demo/templates/**/*.html'
20-
],
19+
]
2120
};
2221

2322
gulp.task('styles', function () {

package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
"description": "Django Suit development tools",
55
"author": "Kaspars Sprogis",
66
"devDependencies": {
7-
"browser-sync": "^2.11.1",
8-
"gulp": "^3.9.0",
7+
"browser-sync": "^2.17.1",
8+
"gulp": "^3.9.1",
99
"gulp-autoprefixer": "^3.1.0",
1010
"gulp-plumber": "^1.0.1",
11-
"gulp-sass": "^2.1.1",
12-
"gulp-watch": "^4.3.5"
11+
"gulp-sass": "^2.3.2"
1312
}
1413
}

suit/sass/_mixins.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
@mixin suit-box-shadow($darken: 5%) {
77
box-shadow: 0 1px 0 0 darken($body-bg, $darken);
88
}
9+
@mixin text-semibold() { font-weight: 500; }
910
.text-lighter { font-weight: 200; }
1011
.text-light { font-weight: 300; }
1112
.text-normal { font-weight: 400; }
12-
.text-semibold { font-weight: 500; }
13+
.text-semibold { @include text-semibold(); }
1314
.text-light-bold {
1415
@extend .text-light;
1516
strong {

suit/sass/components/_buttons.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@extend .btn;
88
@extend .btn-#{$state};
99
@if $size {
10-
@extend .btn-#{$size};
10+
@extend .btn-#{$size} !optional;
1111
}
1212
@if $round {
1313
border-radius: 70px;

suit/sass/components/_submit_row.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
margin-bottom: .5rem;
1212
}
1313
input[type='submit'], input[type='button'], button {
14-
&:not(.btn) {
14+
&:not([class*=".btn-"]) {
1515
@extend .btn;
1616
@extend .btn-lg;
1717
@extend .btn-secondary;
@@ -88,7 +88,7 @@
8888
}
8989
}
9090
&.heading {
91-
@extend .text-semibold;
91+
@include text-semibold();
9292
font-size: $font-size-lg;
9393
padding: 0 $grid-gutter-width/3 $grid-gutter-width/4;
9494
&.heading-inverse {

suit/sass/layout/_content.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ body.change-form {
3939
margin-left: .5rem;
4040
}
4141
> a {
42-
@extend .btn-round;
43-
&:not(.btn) {
42+
&:not([class*="btn-"]) {
43+
@extend .btn-round;
4444
@include btn-mixin(info, none, sm, round=true);
4545
&.addlink {
4646
@include btn-mixin(success, $icon-plus-circle, sm, round=true);

suit/static/suit/css/suit.css

+233-233
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)