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

Change subject: Set font of the wb-firstHeading toolbar back to sans-serif
......................................................................


Set font of the wb-firstHeading toolbar back to sans-serif

I marked a few spots with FIXME. These lines can be removed
in 4 weeks when all caches got flushed.

Bug: 57436

Change-Id: I0865d144c70a726eb97b42a247d32131463bb6df
(cherry picked from commit b9180d4d56987bb068b42b5efc5720a4e6ad0aff)
---
M lib/resources/wikibase.css
M repo/resources/themes/default/wikibase.toc.css
2 files changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/lib/resources/wikibase.css b/lib/resources/wikibase.css
index c148c50..ac6e61d 100644
--- a/lib/resources/wikibase.css
+++ b/lib/resources/wikibase.css
@@ -165,10 +165,14 @@
 
 /********** LABEL **********/
 
+#content .wb-firstHeading {
+       font-size: 100%; /* required since Gerrit 
Ic5ba836364d04b2c3814777b69b5f47fce25292a */
+}
+
 .wb-firstHeading {
        border-bottom: 0;
-       margin-bottom: 0;
-       padding-top: 0;
+       margin-bottom: 0; /* FIXME: Should be removed if the Typography refresh 
is stable */
+       padding-top: 0; /* FIXME: Should be removed if the Typography refresh 
is stable */
        clear: both; /* so success bar after new item created won't float 
heading */
 }
 
@@ -212,6 +216,8 @@
 /* the following lines are used to vertically position the toolbar on the 
baseline of the heading
 (label) which has a bigger font size */
 .wb-firstHeading .wb-editsection {
+       /* FIXME: Should use the LESS variable @content-font-family */
+       font-family: Arimo, "Liberation Sans", "Helvetica Neue", Helvetica, 
Arial, sans-serif;
        line-height: 188%;
        top: .3em; /* even out margin of label container in view mode */
 }
@@ -228,11 +234,6 @@
 .wb-firstHeading .wikibase-toolbar .wikibase-toolbarlabel /* tooltip */ {
        font-size: 100%;
        margin-bottom: 0; /* even out border of label container in view mode */
-}
-
-/* FIXME: Very specific selector to temporary overrule VectorBeta extension */
-#content .wb-firstHeading {
-       font-size: 100%;
 }
 
 /********** /LABEL **********/
@@ -1047,4 +1048,4 @@
        margin: 0;
        border: none;
 }
-/***** /DIFF VIEW *****/
\ No newline at end of file
+/***** /DIFF VIEW *****/
diff --git a/repo/resources/themes/default/wikibase.toc.css 
b/repo/resources/themes/default/wikibase.toc.css
index b3e1bf5..c6e0b6f 100644
--- a/repo/resources/themes/default/wikibase.toc.css
+++ b/repo/resources/themes/default/wikibase.toc.css
@@ -37,7 +37,7 @@
        border-right: 0;
 }
 
-/* FIXME: Very specific selector to temporary overrule VectorBeta extension */
+/* FIXME: Should be removed if the Typography refresh is stable */
 #content .wb-entity #toc {
        margin-top: 1.8em;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0865d144c70a726eb97b42a247d32131463bb6df
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.23-wmf21
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WikidataJenkins <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to