From df155f4e9ce3b93163c19d249862054821145537 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 28 Aug 2016 11:16:19 +0200 Subject: [PATCH] Restored original breakpoints, but without layout min-width --- wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js | 8 ++++---- .../install/files/style/bootstrap/mixin/mediaQuery.scss | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Screen.js index c59b69cf6b..50f3f7f361 100644 --- 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: 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-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: 769px)', /* tablet (landscape) + desktop */ - 'screen-lg': '(min-width: 1151px)' /* desktop */ + 'screen-lg': '(min-width: 1025px)' /* desktop */ }); /** diff --git a/wcfsetup/install/files/style/bootstrap/mixin/mediaQuery.scss b/wcfsetup/install/files/style/bootstrap/mixin/mediaQuery.scss index 4c74cab1fa..61f3303996 100644 --- 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: 1150px) { + @media (min-width: 545px) and (max-width: 1024px) { @content; } } /* tablet (landscape) */ @mixin screen-md() { - @media (min-width: 769px) and (max-width: 1150px) { + @media (min-width: 769px) and (max-width: 1024px) { @content; } } /* smartphone + tablet (portrait) + tablet (landscape) */ @mixin screen-md-down() { - @media (max-width: 1150px) { + @media (max-width: 1024px) { @content; } } @@ -56,7 +56,7 @@ /* desktop */ @mixin screen-lg() { - @media (min-width: 1151px) { + @media (min-width: 1025px) { @content; } } -- 2.20.1