Changed media query breakpoints

width >= 1151px is now treated as desktop,
width <= 1150px will now be served the iPad version

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js
index ae4d51821cb9937b5830685e1fd98053079af15d..c59b69cf6b8f7486c3c7e51d0c3cf89a4cfb5992 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js
@@ -17,11 +17,11 @@ define(['Core', 'Dictionary'], function(Core, Dictionary) {
                'screen-sm': '(min-width: 545px) and (max-width: 768px)',       /* tablet (portrait) */
                'screen-sm-down': '(max-width: 768px)',                         /* smartphone + tablet (portrait) */
                'screen-sm-up': '(min-width: 545px)',                           /* tablet (portrait) + tablet (landscape) + desktop */
-               'screen-sm-md': '(min-width: 545px) and (max-width: 1024px)',   /* tablet (portrait) + tablet (landscape) */
-               'screen-md': '(min-width: 769px) and (max-width: 1024px)',      /* tablet (landscape) */
-               'screen-md-down': '(max-width: 1024px)',                        /* smartphone + tablet (portrait) + tablet (landscape) */
-               'screen-md-up': '(min-width: 1024px)',                          /* tablet (landscape) + desktop */
-               'screen-lg': '(min-width: 1025px)'                              /* desktop */
+               'screen-sm-md': '(min-width: 545px) and (max-width: 1150px)',   /* tablet (portrait) + tablet (landscape) */
+               'screen-md': '(min-width: 769px) and (max-width: 1150px)',      /* tablet (landscape) */
+               'screen-md-down': '(max-width: 1150px)',                        /* smartphone + tablet (portrait) + tablet (landscape) */
+               'screen-md-up': '(min-width: 769px)',                           /* tablet (landscape) + desktop */
+               'screen-lg': '(min-width: 1151px)'                              /* desktop */
        });
        
        /**

diff --git a/wcfsetup/install/files/style/bootstrap/mixin/mediaQuery.scss b/wcfsetup/install/files/style/bootstrap/mixin/mediaQuery.scss
index 61f33039966e9310604dde639c7eed2e9854f206..4c74cab1fab0d997bf8b174daa2b0acda73ab508 100644 (file)
--- a/wcfsetup/install/files/style/bootstrap/mixin/mediaQuery.scss
+++ b/wcfsetup/install/files/style/bootstrap/mixin/mediaQuery.scss
@@ -28,21 +28,21 @@
 
 /* tablet (portrait) + tablet (landscape) */
 @mixin screen-sm-md() {
-       @media (min-width: 545px) and (max-width: 1024px) {
+       @media (min-width: 545px) and (max-width: 1150px) {
                @content;
        }
 }
 
 /* tablet (landscape) */
 @mixin screen-md() {
-       @media (min-width: 769px) and (max-width: 1024px) {
+       @media (min-width: 769px) and (max-width: 1150px) {
                @content;
        }
 }
 
 /* smartphone + tablet (portrait) + tablet (landscape) */
 @mixin screen-md-down() {
-       @media (max-width: 1024px) {
+       @media (max-width: 1150px) {
                @content;
        }
 }
@@ -56,7 +56,7 @@
 
 /* desktop */
 @mixin screen-lg() {
-       @media (min-width: 1025px) {
+       @media (min-width: 1151px) {
                @content;
        }
 }

diff --git a/wcfsetup/install/files/style/layout/global.scss b/wcfsetup/install/files/style/layout/global.scss
index 510b743b48d6f84e45af53e9f0c06df31b5bf824..de504a8d29ea5acc7e6686641c0b329983512ffc 100644 (file)
--- a/wcfsetup/install/files/style/layout/global.scss
+++ b/wcfsetup/install/files/style/layout/global.scss
@@ -10,7 +10,7 @@
                padding: 0 20px;
                
                @if $useFluidLayout {
-                       min-width: $wcfLayoutMinWidth;
+                       //min-width: $wcfLayoutMinWidth;
                        max-width: $wcfLayoutMaxWidth;
                } @else {
                        width: $wcfLayoutFixedWidth;