Merge "Correct feature phone threshold detection"

This commit is contained in:
jenkins-bot 2017-10-04 21:48:49 +00:00 committed by Gerrit Code Review
commit 8db065c142
8 changed files with 12 additions and 10 deletions

View file

@ -15,8 +15,10 @@
@grayLight: @colorGray12;
@grayLightest: @colorGray14;
@wgMFDeviceWidthMobileSmall: 320px;
@wgMFDeviceWidthDesktop: 1000px;
@width-breakpoint-mobile: 320px;
@width-breakpoint-desktop: 1000px;
// For backwards compatibility with MobileFrontend skinStyles
@wgMFDeviceWidthDesktop: @width-breakpoint-desktop;
@skinContentBgColor: #fff;
@ -85,7 +87,7 @@
@contentPaddingTablet: 3.35em;
// note since content does not use view border box we have to include padding.
@contentMaxWidthTablet: @wgMFDeviceWidthDesktop - ( 2 * @contentPaddingTablet );
@contentMaxWidthTablet: @width-breakpoint-desktop - ( 2 * @contentPaddingTablet );
@contentTopPadding: 1.6em;
// Wiki specific variables

View file

@ -112,7 +112,7 @@
}
// On small devices that don't support Javascript, hide the page actions bar
@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
.client-nojs {
#page-actions {
display: none;

View file

@ -28,7 +28,7 @@ body {
word-wrap: break-word;
}
@media all and ( max-width: @wgMFDeviceWidthMobileSmall ) {
@media all and ( max-width: @width-breakpoint-mobile - 1 ) {
body {
font-size: 0.8em;
}

View file

@ -119,7 +119,7 @@ A file for css that optimises the Minerva skin on larger devices.
}
}
@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
@media screen and ( min-width: @width-breakpoint-desktop ) {
// FIXME: Zero should use banner-container class or better - append to banner-container
#mw-mf-page-center .mw-mf-banner,
.banner-container,

View file

@ -1,6 +1,6 @@
@import 'minerva.variables';
@media screen and ( min-width: @wgMFDeviceWidthDesktop ) {
@media screen and ( min-width: @width-breakpoint-desktop ) {
.language-overlay {
.overlay-content {
margin: 0;

View file

@ -7,7 +7,7 @@
// can point to anything in the containing content area and avoid
// padding issues such as https://phabricator.wikimedia.org/F287611
#mw-mf-page-center .pointer-overlay {
max-width: @wgMFDeviceWidthDesktop;
max-width: @width-breakpoint-desktop;
}
}

View file

@ -45,7 +45,7 @@
}
}
@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
@media all and ( min-width: @width-breakpoint-desktop ) {
.search-overlay {
.overlay-content {
// align with the search form

View file

@ -24,7 +24,7 @@
}
}
@media all and ( min-width: @wgMFDeviceWidthDesktop ) {
@media all and ( min-width: @width-breakpoint-desktop ) {
.overlay-header {
// Make sure the close button and secondary button icon images are aligned
// with the content.