loader: Fix default font size at device-width viewport
authorYoumin Ha <youmin.ha@samsung.com>
Wed, 3 Apr 2013 12:59:13 +0000 (21:59 +0900)
committerYoumin Ha <youmin.ha@samsung.com>
Wed, 3 Apr 2013 13:50:40 +0000 (22:50 +0900)
Set only 22px for default, and 19px for less than 360px viewport width.
Used media-query.

Change-Id: I837a267b79dcadeafbd461a1de189bd9532a4b3d

src/js/jquery.mobile.tizen.loader.js
src/themes/tizen/common/jquery.mobile.core.less

index cecf178..3973bd2 100644 (file)
@@ -457,23 +457,20 @@ If developers do not give a viewport meta tag, Tizen Web UI Framework automatica
                                viewportWidth = "screen-width";
                        }
 
+                       // screen-width support
                        if ( "screen-width" == viewportWidth ) {
-                               viewportWidth = document.documentElement.clientWidth;
+                               viewportWidth = window.innerWidth;
                        }
 
+                       // set viewport meta tag
                        viewportWidth = this.setViewport( viewportWidth );      // If custom viewport setting exists, get viewport width
 
-                       if ( isNaN( viewportWidth ) ) { // device-width
-                               // By default, when the viewport is set to device-width, default font-size is not changed.
-                               // However, if current document width is less than defaultViewportWidth(determined by theme),
-                               //   default font-size is scaled to scale widgets smaller.
-                               if( document.documentElement.clientWidth <  this.frameworkData.defaultViewportWidth ) {
-                                       ratio = parseFloat( document.documentElement.clientWidth / this.frameworkData.defaultViewportWidth );
-                               }
+                       if ( viewportWidth == "device-width" ) {
+                               // Do nothing!
                        } else {        // fixed width!
                                ratio = parseFloat( viewportWidth / this.frameworkData.defaultViewportWidth );
+                               this.scaleBaseFontSize( themeDefaultFontSize, ratio );
                        }
-                       this.scaleBaseFontSize( themeDefaultFontSize, ratio );
                },
        };
 
index 41048ba..ee5436e 100644 (file)
 
 /* some unsets - more probably needed */
 .ui-mobile, .ui-mobile body { height: 100%; font-size: @font_size_default; }
+@media all and (max-width:359px) {
+       .ui-mobile, .ui-mobile body { font-size: floor(@font_size_default*320/360); }
+}
+
 .ui-mobile fieldset, .ui-page { padding: 0; margin: 0; }
 .ui-mobile a img, .ui-mobile fieldset { border: 0; }