From 49d0d7976fd33ae4a3be4c5d7bf90a6cc8b66bea Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 9 Apr 2013 22:02:42 +0200 Subject: [PATCH] Add optimizations for mobile devices --- wcfsetup/install/files/js/WCF.js | 7 +- wcfsetup/install/files/style/alert.less | 2 +- wcfsetup/install/files/style/button.less | 2 +- wcfsetup/install/files/style/dialog.less | 6 +- wcfsetup/install/files/style/form.less | 4 +- wcfsetup/install/files/style/layout.less | 95 ++++++++++++++++++------ 6 files changed, 86 insertions(+), 30 deletions(-) diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 9c38fbbbb0..15671fd1a5 100755 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -84,6 +84,11 @@ String.prototype.hashCode = function() { **/ (function(a){(jQuery.browser=jQuery.browser||{}).mobile=/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))})(navigator.userAgent||navigator.vendor||window.opera); +(function() { + jQuery.browser = jQuery.browser || { }; + jQuery.browser.touch = (!!('ontouchstart' in window) || !!('msmaxtouchpoints' in window.navigator)); +})(); + /** * Initialize WCF namespace */ @@ -4118,7 +4123,7 @@ WCF.Effect.BalloonTooltip = Class.extend({ * Initializes tooltips. */ init: function() { - if (jQuery.browser.mobile) return; + if (jQuery.browser.touch) return; if (!this._didInit) { // create empty div diff --git a/wcfsetup/install/files/style/alert.less b/wcfsetup/install/files/style/alert.less index 881ed51d29..312cde6327 100644 --- a/wcfsetup/install/files/style/alert.less +++ b/wcfsetup/install/files/style/alert.less @@ -30,7 +30,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .info, .error, .success, diff --git a/wcfsetup/install/files/style/button.less b/wcfsetup/install/files/style/button.less index 09575acda5..fbfc8f0c6f 100644 --- a/wcfsetup/install/files/style/button.less +++ b/wcfsetup/install/files/style/button.less @@ -154,7 +154,7 @@ button.active:hover { } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .buttonGroup { min-height: 21px; min-width: 21px; diff --git a/wcfsetup/install/files/style/dialog.less b/wcfsetup/install/files/style/dialog.less index 4b571caaa3..047cd7290d 100644 --- a/wcfsetup/install/files/style/dialog.less +++ b/wcfsetup/install/files/style/dialog.less @@ -11,7 +11,7 @@ .boxShadow(0, 1px, rgba(0, 0, 0, .3), 23px); } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .dialogContainer { border: 0; left: 0 !important; @@ -69,7 +69,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .dialogTitlebar { .borderRadius(0); } @@ -115,7 +115,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .dialogContent { max-height: none !important; diff --git a/wcfsetup/install/files/style/form.less b/wcfsetup/install/files/style/form.less index b099395304..751351f2fe 100644 --- a/wcfsetup/install/files/style/form.less +++ b/wcfsetup/install/files/style/form.less @@ -126,7 +126,7 @@ dl:not(.plain) { } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { dl:not(.plain) { > dt { float: none; @@ -356,7 +356,7 @@ textarea { width: 100%; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { textarea { max-height: 160px; } diff --git a/wcfsetup/install/files/style/layout.less b/wcfsetup/install/files/style/layout.less index cc69354c64..a3b3254b9b 100644 --- a/wcfsetup/install/files/style/layout.less +++ b/wcfsetup/install/files/style/layout.less @@ -3,7 +3,7 @@ padding: 0 @wcfLayoutFluidGap; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .layoutFluid { padding: 0; } @@ -14,7 +14,7 @@ width: @wcfLayoutFixedWidth; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .layoutFixed { width: auto; } @@ -26,7 +26,7 @@ z-index: 100; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { #pageHeader { margin-top: 48px; } @@ -148,7 +148,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .userPanel { height: auto; @@ -240,7 +240,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .logo { display: none; } @@ -293,7 +293,7 @@ } /* main menu */ -@media only screen and (min-width: 641px) { +@media only screen and (min-width: 769px) { .mainMenu { > ul { background-color: @wcfMainMenuBackgroundColor; @@ -342,7 +342,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .mainMenu { position: relative; @@ -389,8 +389,14 @@ } } } - - + } + } +} + +@media only screen and (min-width: 641px) and (max-width: 768px) { + .mainMenu { + > .invisible { + margin-left: @wcfGapMedium; } } } @@ -463,7 +469,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .navigation { > ul.navigationIcons, > ul.navigationItems, @@ -484,7 +490,7 @@ border-top: 1px solid @wcfContainerBorderColor; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .navigationHeader { background-color: transparent; border: 0; @@ -510,7 +516,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .footerContent { margin: 0 @wcfGapMedium; } @@ -615,7 +621,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { /* hide sidebar */ #main { position: relative; @@ -684,6 +690,15 @@ } } +@media only screen and (min-width: 769px) and (max-width: 1239px) { + #main { + > div > .content { + padding-left: @wcfGapLarge + @wcfGapSmall; + padding-right: @wcfGapLarge + @wcfGapSmall; + } + } +} + /* basic layout elements */ .boxHeadline { margin-top: @wcfGapMedium; @@ -725,7 +740,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .boxHeadline { margin-top: @wcfGapSmall; margin-left: @wcfGapSmall; @@ -733,6 +748,13 @@ } } +@media only screen and (min-width: 641px) and (max-width: 768px) { + .boxHeadline { + margin-left: @wcfGapMedium; + margin-right: @wcfGapMedium; + } +} + .contentNavigation { display: table; width: 100%; @@ -759,7 +781,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .contentNavigation { box-sizing:border-box; -moz-box-sizing:border-box; @@ -769,6 +791,13 @@ } } +@media only screen and (min-width: 641px) and (max-width: 768px) { + .contentNavigation { + padding-left: @wcfGapMedium; + padding-right: @wcfGapMedium; + } +} + .container { background-color: @wcfContainerBackgroundColor; border: 1px solid @wcfContainerBorderColor; @@ -778,7 +807,7 @@ padding: @wcfGapMedium @wcfGapLarge @wcfGapMedium; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .container { border-width: 1px 0; } @@ -788,6 +817,13 @@ } } +@media only screen and (min-width: 641px) and (max-width: 768px) { + .containerPadding { + padding-left: @wcfGapMedium; + padding-right: @wcfGapMedium; + } +} + .containerHeadline { margin-bottom: @wcfGapSmall; @@ -875,7 +911,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .containerList { > li { padding: @wcfGapSmall; @@ -903,6 +939,14 @@ } } +@media only screen and (min-width: 641px) and (max-width: 768px) { + .containerList { + > li { + padding: @wcfGapSmall @wcfGapMedium; + } + } +} + @media screen and (min-width: 1240px) { .containerList { &.doubleColumned { @@ -1006,7 +1050,7 @@ } } -@media only screen and (min-width: 641px) { +@media only screen and (min-width: 769px) { .containerBoxList { &.doubleColumned, &.tripleColumned { @@ -1111,7 +1155,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .content > .breadcrumbs { display: none; } @@ -1256,7 +1300,7 @@ margin-bottom: @wcfGapSmall; } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .tabMenu { > ul { margin-left: @wcfGapTiny; @@ -1330,7 +1374,7 @@ } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .tabularBox { border-width: 1px 0; } @@ -1340,6 +1384,13 @@ } } +@media only screen and (min-width: 641px) and (max-width: 768px) { + .tabularBoxTitle > hgroup { + padding-left: @wcfGapMedium; + padding-right: @wcfGapMedium; + } +} + .table { border-spacing: 0; width: 100%; @@ -1705,7 +1756,7 @@ ul.inlineDataList { } } -@media only screen and (max-width: 640px) { +@media only screen and (max-width: 768px) { .pageNavigation { > ul > li { &:not(.skip):not(.active) { -- 2.20.1