jenkins-bot has submitted this change and it was merged.

Change subject: Escape non-standard CSS values in LESS source
......................................................................


Escape non-standard CSS values in LESS source

Use LESS escaping to protect non-standard '!ie' keywords from LESS
compiler quirks. Anything in a ~"..." block will be passed through the
LESS compiler as a literal value.

Bug: T114036
Change-Id: I91b71f9f3b5a605f6a0414da03d849667fbffdd5
---
M resources/main.less
M resources/screen-full.less
2 files changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Isarra: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/main.less b/resources/main.less
index f9ddc6f..f0d0938 100644
--- a/resources/main.less
+++ b/resources/main.less
@@ -152,9 +152,9 @@
                float: right;
                clear: right;
                margin-top: .5em;
-               _margin-top: -2px;
+               margin-top: -2px ~"!ie";
                margin-bottom: 0;
-               _margin-bottom: -8px;
+               margin-bottom: -8px ~"!ie";
                font-size: 85%;
 
                h3 {
@@ -171,9 +171,9 @@
                }
                #searchGoButton {
                        border: solid 1px #bbb;
-                       height: 30px !ie;
+                       height: 30px ~"!ie";
                        min-width: 4em;
-                       margin: 8px 0 !ie;
+                       margin: 8px 0 ~"!ie";
                }
        }
 
@@ -536,7 +536,7 @@
 
                li {
                        display: inline-block;
-                       display: inline !ie;
+                       display: inline ~"!ie";
                        margin: .3em .75em 0 0;
 
                        &.selected a {
@@ -675,7 +675,7 @@
        border-bottom: solid 1px @soft-border;
        color: @text-grey;
        display: inline-block;
-       display: inline !ie;
+       display: inline ~"!ie";
 }
 #toc a, .mw-editsection a {
        color: @link-grey;
@@ -688,7 +688,7 @@
        margin-top: .5em;
        margin-right: 1em;
        display: inline-block;
-       display: inline !ie;
+       display: inline ~"!ie";
 }
 
 
diff --git a/resources/screen-full.less b/resources/screen-full.less
index 3116f37..4ef11e2 100644
--- a/resources/screen-full.less
+++ b/resources/screen-full.less
@@ -29,8 +29,8 @@
        padding-bottom: 0;
        font-size: 90%;
        clear: both;
-       height: 20px !ie;
-       padding-top: .5em !ie;
+       height: 20px ~"!ie";
+       padding-top: .5em ~"!ie";
 
        .navigation,
        .navigation-tools {
@@ -47,7 +47,7 @@
        }
        h3 {
                display: inline-block;
-               display: inline !ie;
+               display: inline ~"!ie";
                padding: 0 1.75em 0 0;
                margin: .6em 1.5em .45em 0;
                font-weight: normal;
@@ -70,7 +70,7 @@
        .mw-portlet {
                position: relative;
                display: inline-block;
-               display: inline !ie;
+               display: inline ~"!ie";
 
                .p-body {
                        display: none;

-- 
To view, visit https://gerrit.wikimedia.org/r/242353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I91b71f9f3b5a605f6a0414da03d849667fbffdd5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/GreyStuff
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Isarra <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to