Skip to content

Commit 5718caf

Browse files
committed
Fixed themes styles
1 parent b543f21 commit 5718caf

File tree

15 files changed

+616
-115
lines changed

15 files changed

+616
-115
lines changed

gulpfile.js

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,13 @@ gulp.task('js-min', function() {
7676
gulp.task('css', function() {
7777
var pkg = getPackageJson();
7878

79-
return gulp.src('./src/*.scss')
80-
.pipe($.sass())
79+
return gulp.src('./src/selectric.scss')
80+
.pipe($.sass({
81+
outputStyle: 'expanded'
82+
}))
8183
.pipe($.autoprefixer({
8284
browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7']
8385
}))
84-
.pipe($.csscomb())
8586
.pipe($.header([
8687
'/*======================================',
8788
' Selectric v<%= pkg.version %>',
@@ -91,6 +92,17 @@ gulp.task('css', function() {
9192
.pipe($.connect.reload());
9293
});
9394

95+
gulp.task('themes-css', function() {
96+
return gulp.src('**/*.scss', { cwd: './src/themes/' })
97+
.pipe($.sass({
98+
outputStyle: 'expanded'
99+
}))
100+
.pipe($.autoprefixer({
101+
browsers: ['last 2 versions', '> 1%', 'ie 8', 'ie 7']
102+
}))
103+
.pipe(gulp.dest('./public/themes/'));
104+
});
105+
94106
/**
95107
* Live preview
96108
*/
@@ -111,9 +123,10 @@ gulp.task('html', function() {
111123
* Watch
112124
*/
113125
gulp.task('watch', ['serve'], function() {
114-
gulp.watch(['*.js'], { cwd: './src/' }, ['js', 'js-min']);
115-
gulp.watch(['*.scss'], { cwd: './src/' }, ['css']);
116-
gulp.watch(['*.html'], { cwd: './public/' }, ['html']);
126+
gulp.watch(['*.js'], { cwd: './src/' }, ['js', 'js-min']);
127+
gulp.watch(['*.scss'], { cwd: './src/' }, ['css']);
128+
gulp.watch(['**/*.scss'], { cwd: './src/themes/' }, ['themes-css']);
129+
gulp.watch(['*.html'], { cwd: './public/' }, ['html']);
117130
});
118131

119132

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"gulp-autoprefixer": "^3.1.0",
3838
"gulp-bump": "^2.2.0",
3939
"gulp-connect": "^5.0.0",
40-
"gulp-csscomb": "^3.0.7",
4140
"gulp-eslint": "^3.0.1",
4241
"gulp-gh-pages": "^0.5.4",
4342
"gulp-header": "^1.8.7",

public/jquery.selectric.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* /,'
1010
* /'
1111
*
12-
* Selectric ϟ v1.11.0 (Sep 28 2016) - http://lcdsantos.github.io/jQuery-Selectric/
12+
* Selectric ϟ v1.11.0 (Sep 29 2016) - http://lcdsantos.github.io/jQuery-Selectric/
1313
*
1414
* Copyright (c) 2016 Leonardo Santos; MIT License
1515
*

public/jquery.selectric.min.js

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

public/selectric.css

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
background: #F8F8F8;
1717
position: relative;
1818
}
19+
1920
.selectric .label {
2021
display: block;
2122
white-space: nowrap;
@@ -31,6 +32,7 @@
3132
-ms-user-select: none;
3233
user-select: none;
3334
}
35+
3436
.selectric .button {
3537
display: block;
3638
position: absolute;
@@ -43,6 +45,7 @@
4345
font: 0/0 a;
4446
*font: 20px/38px Lucida Sans Unicode, Arial Unicode MS, Arial;
4547
}
48+
4649
.selectric .button:after {
4750
content: " ";
4851
position: absolute;
@@ -59,25 +62,29 @@
5962
}
6063

6164
.selectric-focus .selectric {
62-
border-color: #AAA;
65+
border-color: #aaaaaa;
6366
}
6467

6568
.selectric-hover .selectric {
66-
border-color: #C4C4C4;
69+
border-color: #c4c4c4;
6770
}
71+
6872
.selectric-hover .selectric .button {
69-
color: #A2A2A2;
73+
color: #a2a2a2;
7074
}
75+
7176
.selectric-hover .selectric .button:after {
72-
border-top-color: #A2A2A2;
77+
border-top-color: #a2a2a2;
7378
}
7479

7580
.selectric-open {
7681
z-index: 9999;
7782
}
83+
7884
.selectric-open .selectric {
79-
border-color: #C4C4C4;
85+
border-color: #c4c4c4;
8086
}
87+
8188
.selectric-open .selectric-items {
8289
display: block;
8390
}
@@ -98,16 +105,19 @@
98105
width: 0;
99106
height: 0;
100107
}
108+
101109
.selectric-hide-select select {
102110
position: absolute;
103111
left: -100%;
104112
}
113+
105114
.selectric-hide-select.selectric-is-native {
106115
position: absolute;
107116
width: 100%;
108117
height: 100%;
109118
z-index: 10;
110119
}
120+
111121
.selectric-hide-select.selectric-is-native select {
112122
position: absolute;
113123
top: 0;
@@ -150,18 +160,21 @@
150160
top: 100%;
151161
left: 0;
152162
background: #F8F8F8;
153-
border: 1px solid #C4C4C4;
163+
border: 1px solid #c4c4c4;
154164
z-index: -1;
155165
box-shadow: 0 0 10px -6px;
156166
}
167+
157168
.selectric-items .selectric-scroll {
158169
height: 100%;
159170
overflow: auto;
160171
}
172+
161173
.selectric-above .selectric-items {
162174
top: auto;
163175
bottom: 100%;
164176
}
177+
165178
.selectric-items ul, .selectric-items li {
166179
list-style: none;
167180
padding: 0;
@@ -170,24 +183,29 @@
170183
line-height: 20px;
171184
min-height: 20px;
172185
}
186+
173187
.selectric-items li {
174188
display: block;
175189
padding: 10px;
176190
color: #666;
177191
cursor: pointer;
178192
}
193+
179194
.selectric-items li.selected {
180195
background: #E0E0E0;
181196
color: #444;
182197
}
198+
183199
.selectric-items li.highlighted {
184200
background: #D0D0D0;
185201
color: #444;
186202
}
203+
187204
.selectric-items li:hover {
188205
background: #D5D5D5;
189206
color: #444;
190207
}
208+
191209
.selectric-items .disabled {
192210
filter: alpha(opacity=50);
193211
opacity: 0.5;
@@ -199,6 +217,7 @@
199217
-ms-user-select: none;
200218
user-select: none;
201219
}
220+
202221
.selectric-items .selectric-group .selectric-group-label {
203222
font-weight: bold;
204223
padding-left: 10px;
@@ -210,10 +229,12 @@
210229
background: none;
211230
color: #444;
212231
}
232+
213233
.selectric-items .selectric-group.disabled li {
214234
filter: alpha(opacity=100);
215235
opacity: 1;
216236
}
237+
217238
.selectric-items .selectric-group li {
218239
padding-left: 25px;
219240
}

0 commit comments

Comments
 (0)