Skip to content

Commit 40c400d

Browse files
author
scottjehl
committed
Merge remote branch 'origin/master'
2 parents f9d7ff9 + e725007 commit 40c400d

File tree

6 files changed

+39
-74
lines changed

6 files changed

+39
-74
lines changed

‎Makefile

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
# The files to include when compiling the CSS files
2-
CSSFILES = css/structure/jquery.mobile.core.css \
3-
css/structure/jquery.mobile.transitions.css \
4-
css/structure/jquery.mobile.grids.css \
5-
css/structure/jquery.mobile.fixedToolbar.css \
6-
css/structure/jquery.mobile.navbar.css \
7-
css/structure/jquery.mobile.button.css \
8-
css/structure/jquery.mobile.collapsible.css \
9-
css/structure/jquery.mobile.controlgroup.css \
10-
css/structure/jquery.mobile.dialog.css \
11-
css/structure/jquery.mobile.forms.checkboxradio.css \
12-
css/structure/jquery.mobile.forms.fieldcontain.css \
13-
css/structure/jquery.mobile.forms.select.css \
14-
css/structure/jquery.mobile.forms.textinput.css \
15-
css/structure/jquery.mobile.listview.css \
16-
css/structure/jquery.mobile.forms.slider.css
17-
CSSTHEMEFILES = css/themes/${THEME}/jquery.mobile.theme.css
18-
19-
20-
21-
221
# Helper Variables
232
# The command to replace the @VERSION in the files with the actual version
243
VER = sed "s/v@VERSION/$$(git log -1 --format=format:"Git Build: SHA1: %H <> Date: %cd")/"
@@ -65,13 +44,18 @@ css: init
6544
--type css ${OUTPUT}/${NAME}.compiled.css >> ${OUTPUT}/${NAME}.min.css
6645
@@rm ${OUTPUT}/${NAME}.compiled.css
6746
# Build the CSS Structure-only file
47+
${RUN_JS} \
48+
external/r.js/dist/r.js \
49+
-o cssIn=css/structure/jquery.mobile.structure.css \
50+
out=${OUTPUT}/${STRUCTURE}.compiled.css
6851
@@cat LICENSE-INFO.txt | ${VER} > ${OUTPUT}/${STRUCTURE}.css
69-
@@cat ${CSSFILES} >> ${OUTPUT}/${STRUCTURE}.css
52+
@@cat ${OUTPUT}/${STRUCTURE}.compiled.css >> ${OUTPUT}/${STRUCTURE}.css
7053
# ..... and then minify it
7154
@@echo ${VER_MIN} > ${OUTPUT}/${STRUCTURE}.min.css
7255
@@java -XX:ReservedCodeCacheSize=64m \
7356
-jar build/yuicompressor-2.4.6.jar \
74-
--type css ${OUTPUT}/${STRUCTURE}.css >> ${OUTPUT}/${STRUCTURE}.min.css
57+
--type css ${OUTPUT}/${STRUCTURE}.compiled.css >> ${OUTPUT}/${STRUCTURE}.min.css
58+
@@rm ${OUTPUT}/${STRUCTURE}.compiled.css
7559
# ..... and then copy in the images
7660
@@cp -R css/themes/${THEME}/images ${OUTPUT}/
7761
# Css portion is complete.

‎css/structure/jquery.mobile.forms.slider.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ a.ui-slider-handle .ui-btn-inner { padding-left: 0; padding-right: 0; }
1414
}
1515
div.ui-slider-switch { height: 32px; overflow: hidden; margin-left: 0; }
1616
div.ui-slider-inneroffset { margin-left: 50%; position: absolute; top: 1px; height: 100%; width: 50%; }
17-
a.ui-slider-handle-snapping { -webkit-transition: left 70ms linear; }
17+
a.ui-slider-handle-snapping { -webkit-transition: left 70ms linear; -moz-transition: left 70ms linear; }
1818
div.ui-slider-labelbg { position: absolute; top:0; margin: 0; border-width: 0; }
1919
div.ui-slider-switch div.ui-slider-labelbg-a { width: 60%; height: 100%; left: 0; }
2020
div.ui-slider-switch div.ui-slider-labelbg-b { width: 60%; height: 100%; right: 0; }

‎css/structure/jquery.mobile.structure.css

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
@import url( "jquery.mobile.core.css" );
2+
@import url( "jquery.mobile.transitions.css" );
3+
@import url( "jquery.mobile.transitions.fade.css" );
4+
@import url( "jquery.mobile.transitions.pop.css" );
5+
@import url( "jquery.mobile.transitions.slide.css" );
6+
@import url( "jquery.mobile.transitions.slidedown.css" );
7+
@import url( "jquery.mobile.transitions.slideup.css" );
8+
@import url( "jquery.mobile.transitions.flip.css" );
9+
@import url( "jquery.mobile.transitions.turn.css" );
10+
@import url( "jquery.mobile.transitions.flow.css" );
11+
@import url( "jquery.mobile.grids.css" );
12+
@import url( "jquery.mobile.fixedToolbar.css" );
13+
@import url( "jquery.mobile.navbar.css" );
14+
@import url( "jquery.mobile.button.css" );
15+
@import url( "jquery.mobile.collapsible.css" );
16+
@import url( "jquery.mobile.controlgroup.css" );
17+
@import url( "jquery.mobile.dialog.css" );
18+
@import url( "jquery.mobile.forms.checkboxradio.css" );
19+
@import url( "jquery.mobile.forms.fieldcontain.css" );
20+
@import url( "jquery.mobile.forms.select.css" );
21+
@import url( "jquery.mobile.forms.textinput.css" );
22+
@import url( "jquery.mobile.listview.css" );
23+
@import url( "jquery.mobile.forms.slider.css" );

‎css/themes/default/jquery.mobile.css

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,2 @@
11
@import url( "jquery.mobile.theme.css" );
2-
@import url( "../../structure/jquery.mobile.core.css" );
3-
@import url( "../../structure/jquery.mobile.transitions.css" );
4-
@import url( "../../structure/jquery.mobile.transitions.fade.css" );
5-
@import url( "../../structure/jquery.mobile.transitions.pop.css" );
6-
@import url( "../../structure/jquery.mobile.transitions.slide.css" );
7-
@import url( "../../structure/jquery.mobile.transitions.slidedown.css" );
8-
@import url( "../../structure/jquery.mobile.transitions.slideup.css" );
9-
@import url( "../../structure/jquery.mobile.transitions.flip.css" );
10-
@import url( "../../structure/jquery.mobile.transitions.turn.css" );
11-
@import url( "../../structure/jquery.mobile.transitions.flow.css" );
12-
@import url( "../../structure/jquery.mobile.grids.css" );
13-
@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
14-
@import url( "../../structure/jquery.mobile.navbar.css" );
15-
@import url( "../../structure/jquery.mobile.button.css" );
16-
@import url( "../../structure/jquery.mobile.collapsible.css" );
17-
@import url( "../../structure/jquery.mobile.controlgroup.css" );
18-
@import url( "../../structure/jquery.mobile.dialog.css" );
19-
@import url( "../../structure/jquery.mobile.forms.checkboxradio.css" );
20-
@import url( "../../structure/jquery.mobile.forms.fieldcontain.css" );
21-
@import url( "../../structure/jquery.mobile.forms.select.css" );
22-
@import url( "../../structure/jquery.mobile.forms.textinput.css" );
23-
@import url( "../../structure/jquery.mobile.listview.css" );
24-
@import url( "../../structure/jquery.mobile.forms.slider.css" );
2+
@import url( "../../structure/jquery.mobile.structure.css" );

‎css/themes/valencia/jquery.mobile.css

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,2 @@
11
@import url( "jquery.mobile.theme.css" );
2-
@import url( "../../structure/jquery.mobile.core.css" );
3-
@import url( "../../structure/jquery.mobile.transitions.css" );
4-
@import url( "../../structure/jquery.mobile.transitions.fade.css" );
5-
@import url( "../../structure/jquery.mobile.transitions.pop.css" );
6-
@import url( "../../structure/jquery.mobile.transitions.slide.css" );
7-
@import url( "../../structure/jquery.mobile.transitions.slidedown.css" );
8-
@import url( "../../structure/jquery.mobile.transitions.slideup.css" );
9-
@import url( "../../structure/jquery.mobile.transitions.flip.css" );
10-
@import url( "../../structure/jquery.mobile.transitions.turn.css" );
11-
@import url( "../../structure/jquery.mobile.transitions.flow.css" );
12-
@import url( "../../structure/jquery.mobile.grids.css" );
13-
@import url( "../../structure/jquery.mobile.fixedToolbar.css" );
14-
@import url( "../../structure/jquery.mobile.navbar.css" );
15-
@import url( "../../structure/jquery.mobile.button.css" );
16-
@import url( "../../structure/jquery.mobile.collapsible.css" );
17-
@import url( "../../structure/jquery.mobile.controlgroup.css" );
18-
@import url( "../../structure/jquery.mobile.dialog.css" );
19-
@import url( "../../structure/jquery.mobile.forms.checkboxradio.css" );
20-
@import url( "../../structure/jquery.mobile.forms.fieldcontain.css" );
21-
@import url( "../../structure/jquery.mobile.forms.select.css" );
22-
@import url( "../../structure/jquery.mobile.forms.textinput.css" );
23-
@import url( "../../structure/jquery.mobile.listview.css" );
24-
@import url( "../../structure/jquery.mobile.forms.slider.css" );
2+
@import url( "../../structure/jquery.mobile.structure.css" );

‎js/jquery.mobile.fixedToolbar.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,11 @@ define( [ "jquery", "jquery.mobile.widget", "jquery.mobile.core", "jquery.mobile
134134
show: function(){
135135
var hideClass = "ui-fixed-hidden",
136136
$el = this.element,
137-
scroll = $( window ).scrollTop(),
137+
$win = $( window ),
138+
scroll = $win.scrollTop(),
138139
elHeight = $el.height(),
139140
pHeight = $el.closest( ".ui-page" ).height(),
140-
viewportHeight = Math.min( screen.height, $( window ).height() ),
141+
viewportHeight = Math.min( screen.height, $win.height() ),
141142
tbtype = $el.is( ".ui-header" ) ? "header" : "footer";
142143

143144
if( this.options.transition && this.options.transition !== "none" &&
@@ -158,10 +159,11 @@ define( [ "jquery", "jquery.mobile.widget", "jquery.mobile.core", "jquery.mobile
158159
hide: function(){
159160
var hideClass = "ui-fixed-hidden",
160161
$el = this.element,
161-
scroll = $( window ).scrollTop(),
162+
$win = $( window ),
163+
scroll = $win.scrollTop(),
162164
elHeight = $el.height(),
163165
pHeight = $el.closest( ".ui-page" ).height(),
164-
viewportHeight = Math.min( screen.height, $( window ).height() ),
166+
viewportHeight = Math.min( screen.height, $win.height() ),
165167
tbtype = $el.is( ".ui-header" ) ? "header" : "footer";
166168

167169
if( this.options.transition && this.options.transition !== "none" &&

0 commit comments

Comments
 (0)