Skip to content

Commit e3f02d6

Browse files
committed
more work on active state
1 parent a39432b commit e3f02d6

File tree

7 files changed

+26
-22
lines changed

7 files changed

+26
-22
lines changed

Gruntfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ module.exports = function (grunt) {
3636
stylus: {
3737
files: ['src/stylus/**/*.styl'],
3838
tasks: ['stylus', 'concat', 'copy', 'cssmin']
39+
},
40+
css: {
41+
files: ['src/css/global.css'],
42+
tasks: ['concat', 'copy', 'cssmin']
3943
}
4044
}
4145
});
@@ -46,5 +50,5 @@ module.exports = function (grunt) {
4650
grunt.loadNpmTasks('grunt-contrib-copy');
4751
grunt.loadNpmTasks('grunt-contrib-cssmin');
4852

49-
grunt.registerTask('default', ['concat', 'copy', 'cssmin']);
53+
grunt.registerTask('default', ['stylus', 'concat', 'copy', 'cssmin']);
5054
};

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ Include link to `jquery.mobile.flatui.css`
1111
<link rel="stylesheet" type="text/css" href="jquery.mobile.flatui.css" />
1212
```
1313

14-
![jQuery-Mobile-Flat-UI-Theme](http://oi49.tinypic.com/w82peh.jpg)
14+
![jQuery-Mobile-Flat-UI-Theme](http://oi46.tinypic.com/212i9dz.jpg)
15+
16+
17+
##License:
18+
<pre>
19+
The MIT License
20+
</pre>

demo/css/jquery.mobile.flatui.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@
292292
/* Active class used as the "on" state across all themes
293293
-----------------------------------------------------------------------------------------------------------*/
294294
.ui-btn-active {
295-
border: 1px solid #2C3E50 /*{global-active-border}*/;
296-
background: #2C3E50 /*{global-active-background-color}*/;
295+
border: 1px solid #1abc9c /*{global-active-border}*/;
296+
background: #1abc9c /*{global-active-background-color}*/;
297297
font-weight: bold;
298298
color: #ffffff /*{global-active-color}*/;
299299
cursor: pointer;
@@ -314,10 +314,8 @@
314314
-----------------------------------------------------------------------------------------------------------*/
315315

316316
.ui-slider-handle {
317-
/*
318-
background: #ff0000;
319-
border: 1px solid #ff0000;
320-
*/
317+
background: #16a085;
318+
border: 1px solid #16a085;
321319
}
322320

323321
.ui-slider-label.ui-btn-corner-all,

demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h3>Section 3</h3>
115115
<input type="range" name="slider" value="50" min="0" max="100" data-highlight="true" />
116116
</div>
117117
</div>
118-
</div><!--end_swatches-->
118+
</div>
119119

120120
<div id="highlight"> </div>
121121
</body>

generated/jquery.mobile.flatui.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@
292292
/* Active class used as the "on" state across all themes
293293
-----------------------------------------------------------------------------------------------------------*/
294294
.ui-btn-active {
295-
border: 1px solid #2C3E50 /*{global-active-border}*/;
296-
background: #2C3E50 /*{global-active-background-color}*/;
295+
border: 1px solid #1abc9c /*{global-active-border}*/;
296+
background: #1abc9c /*{global-active-background-color}*/;
297297
font-weight: bold;
298298
color: #ffffff /*{global-active-color}*/;
299299
cursor: pointer;
@@ -314,10 +314,8 @@
314314
-----------------------------------------------------------------------------------------------------------*/
315315

316316
.ui-slider-handle {
317-
/*
318-
background: #ff0000;
319-
border: 1px solid #ff0000;
320-
*/
317+
background: #16a085;
318+
border: 1px solid #16a085;
321319
}
322320

323321
.ui-slider-label.ui-btn-corner-all,

generated/jquery.mobile.flatui.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.

src/css/global.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* Active class used as the "on" state across all themes
22
-----------------------------------------------------------------------------------------------------------*/
33
.ui-btn-active {
4-
border: 1px solid #2C3E50 /*{global-active-border}*/;
5-
background: #2C3E50 /*{global-active-background-color}*/;
4+
border: 1px solid #1abc9c /*{global-active-border}*/;
5+
background: #1abc9c /*{global-active-background-color}*/;
66
font-weight: bold;
77
color: #ffffff /*{global-active-color}*/;
88
cursor: pointer;
@@ -23,10 +23,8 @@
2323
-----------------------------------------------------------------------------------------------------------*/
2424

2525
.ui-slider-handle {
26-
/*
27-
background: #ff0000;
28-
border: 1px solid #ff0000;
29-
*/
26+
background: #16a085;
27+
border: 1px solid #16a085;
3028
}
3129

3230
.ui-slider-label.ui-btn-corner-all,

0 commit comments

Comments
 (0)