diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-07-14 13:35:06 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-07-14 13:35:06 +0200 |
| commit | 33c3b3817b00aa9384760813643fac0e33daaaff (patch) | |
| tree | 481c880b00a32ba5887834b52a17248bac8bfc7c /lib/tpl/dokuwiki/script.js | |
| parent | 040f0e135c37c5b544f16277ff69205369df5f1f (diff) | |
| parent | fbd8067eeeb9f424981aad8b283e17f734c738c3 (diff) | |
| download | rpg-33c3b3817b00aa9384760813643fac0e33daaaff.tar.gz rpg-33c3b3817b00aa9384760813643fac0e33daaaff.tar.bz2 | |
merge master in branch
Diffstat (limited to 'lib/tpl/dokuwiki/script.js')
| -rw-r--r-- | lib/tpl/dokuwiki/script.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 3ed8dbabe..4eb92a417 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -1,11 +1,10 @@ /** * We handle several device classes based on browser width. - * see http://twitter.github.com/bootstrap/scaffolding.html#responsive * - * - desktop: 980+ - * - mobile: < 980 - * - tablet 481 - 979 (ostensibly for tablets in portrait mode) - * - phone <= 480 + * - desktop: > __tablet_width__ (as set in style.ini) + * - mobile: + * - tablet <= __tablet_width__ + * - phone <= __phone_width__ */ var device_class = ''; // not yet known var device_classes = 'desktop mobile tablet phone'; @@ -13,7 +12,7 @@ var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here - var screen_mode = jQuery('#screen__mode').css('z-index'); + var screen_mode = jQuery('#screen__mode').css('z-index') + ''; // determine our device pattern // TODO: consider moving into dokuwiki core |