From bc2ade0124383c66da5c8903f5c01dacbc0266be Mon Sep 17 00:00:00 2001 From: Tom Hutchison Date: Wed, 26 Apr 2017 17:02:20 -0400 Subject: [PATCH] Sitenotice fix (#32) * removing classes .panel and .radius from sitenotice and usertalk * Fixes for echo, indicators, missing indicator.gif --- Pivot.skin.php | 7 ++- assets/scripts/pivot.js | 2 + assets/stylesheets/indicator.gif | Bin 0 -> 673 bytes assets/stylesheets/pivot.css | 93 +++++++++++++++++-------------- 4 files changed, 58 insertions(+), 44 deletions(-) create mode 100644 assets/stylesheets/indicator.gif diff --git a/Pivot.skin.php b/Pivot.skin.php index 5a99ed8..8f839a2 100644 --- a/Pivot.skin.php +++ b/Pivot.skin.php @@ -187,14 +187,15 @@ class pivotTemplate extends BaseTemplate {
+
- data['sitenotice'] ) { ?>
html( 'sitenotice' ); ?>
- data['newtalk'] ) { ?>
html( 'newtalk' ); ?>
+ data['sitenotice'] ) { ?>
html( 'sitenotice' ); ?>
+ data['newtalk'] ) { ?>
html( 'newtalk' ); ?>
diff --git a/assets/scripts/pivot.js b/assets/scripts/pivot.js index 00c6948..b49e8cf 100644 --- a/assets/scripts/pivot.js +++ b/assets/scripts/pivot.js @@ -11,8 +11,10 @@ jQuery(document).ready(function() { // The Echo extension puts an item in personal tools that Foreground really should have in the top menu // to make this easier, we move it here and loaded earlier to speed up transform + jQuery("#pt-notifications").prependTo("#echo-notifications-alerts"); jQuery("#pt-notifications-message").prependTo("#echo-notifications-messages"); jQuery("#pt-notifications-alert").prependTo("#echo-notifications-alerts"); + jQuery("#pt-notifications-notice").prependTo("#echo-notifications-notice"); // Append font-awesome icons jQuery('[id^=ca-nstab] a').prepend('
') diff --git a/assets/stylesheets/indicator.gif b/assets/stylesheets/indicator.gif new file mode 100644 index 0000000000000000000000000000000000000000..f2a1bc0c6f545e20e631a96e8e92f9822e75d046 GIT binary patch literal 673 zcmZ?wbhEHb6krfw_{6~Q|Nnmm28Kh24mmkF0U1e2Nli^nlO|14{3qpHl$uzQnxasi zS(2fUn3Y(Olb@KPmzkHA&!G5|g@FsGT=74*pKD04vtxj(k)8oFBTz^Oh=E26FfcG1 zbL_hF&)}42ws10s6^G;;cE1^EoUR)U5A70}d2pLv!jVIT7j&Z~EblI3x0K*v_sV|m z0W=b9G$XP(CLnYCdK49;TX=SFc-G}o=oA=|U?{1O;Nu!CwW3C5Yw7*Bi4yD$3fCnb zwK+>}QdQ9sf*QnxY>*kpE+b{_Q;sJloS71)&(@kO!}mqf@1v(v;*8Y=G9S3kY~Cw# zY=t&c z;3~JK4HxB^lY(MD+sYeQ=t%XSSW;x^1M?dTvN=W^yNcAcy`HCte31C;)5xP%b~qs> zDP&4(%TBqBNGHwnryK;BdMI$fEg xd0mc!C@j^ZpLxYv4HmnPfI0THYuv<%+6iSmMn&w3dPGDfL1|=LY008wP(boU~ literal 0 HcmV?d00001 diff --git a/assets/stylesheets/pivot.css b/assets/stylesheets/pivot.css index 0bdc526..d0dfd11 100644 --- a/assets/stylesheets/pivot.css +++ b/assets/stylesheets/pivot.css @@ -770,51 +770,59 @@ div.mw-htmlform-field-HTMLCheckField div.mw-label { height:0; } /* Add improved styling for the Echo extension */ #echo-notifications { - float: right; - display: inline-block; - margin: -.5em 0; - position: relative; - z-index: 10000; - height: 23px; + float: right; + display: inline-block; + margin: -1em 1em .5em; + position: relative; + z-index: 500; + max-height: 30px; } +#echo-notifications-notice, +#echo-notifications-alerts, +#echo-notifications-messages, +#echo-notifications { + display: inline-block; +} +#pt-notifications-notice .mw-echo-notifications-badge, #pt-notifications-alert .mw-echo-notifications-badge, #pt-notifications-message .mw-echo-notifications-badge { - background-size: 1.6em !important; - display: inline !important; - font-size: 1.2em; - filter: invert(25%); - color: transparent; + background-size: 1.4em !important; + font-size: 1.1em; + color: transparent; + filter: invert(15%); + height: auto !important; + display: block !important; +} +#echo-notifications li { + list-style: none; +} +#echo-notifications-messages { + float: right; +} +#echo-notifications-alerts { + float: right; +} +#pt-notifications-alert .mw-echo-unseen-notifications, #pt-notifications-message .mw-echo-unseen-notifications { + color: #0645ad !important; } #echo-notifications li { - list-style: none; -} - -#echo-notifications-messages { - float: right; -} -#echo-notifications-alerts { - float: right; -} - -#pt-notifications-alert .mw-echo-unseen-notifications, -#pt-notifications-message .mw-echo-unseen-notifications { - color: #0645ad !important; + margin: 0 0 0 1em; } /* Make Echo extension more mobile friendly on small widths */ @media only screen and (max-width: 450px) { -.oo-ui-popupWidget-popup { - width: auto !important; - position: relative !important; - margin-left: -260px !important; - font-size: 75% !important; -} -.oo-ui-clippableElement-clippable.oo-ui-popupWidget-body { - width: 100% !important; -} + .oo-ui-popupWidget-popup { + width: auto !important; + position: relative !important; + margin-left: -260px !important; + font-size: 75% !important; + } + .oo-ui-clippableElement-clippable.oo-ui-popupWidget-body { + width: 100% !important; + } } /* Aside CSS */ @@ -1158,12 +1166,15 @@ ul[class*="block-grid"] { } .mw-indicators { - float: right; - line-height: 1.6; - font-size: 0.875em; - position: relative; - margin: -.5em .5em 0; - max-height: 25px; - width: auto; - z-index: 1; + float: right; + line-height: 1.6; + font-size: 0.875em; + position: relative; + margin: -1em .5em .5em 1em; + max-height: 30px; + width: auto; + z-index: 1; +} +.mw-indicator { + display: inline-block; } \ No newline at end of file