mediawiki/pivot
1
0
Fork 0
mirror of https://github.com/Hutchy68/pivot.git synced 2024-11-21 18:09:03 +01:00
Code Issues Releases Wiki Activity

Sitenotice fix (#32)

Browse Source 
* removing classes .panel and .radius from sitenotice and usertalk

* Fixes for echo, indicators, missing indicator.gif
This commit is contained in:
Tom Hutchison 2017-04-26 17:02:20 -04:00 committed by GitHub
parent afc69b150a
commit bc2ade0124
4 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Pivot.skin.php
View File

@ -187,14 +187,15 @@ class pivotTemplate extends BaseTemplate {
<div id="echo-notifications"> <div id="echo-notifications">
<div id="echo-notifications-alerts"></div> <div id="echo-notifications-alerts"></div>
<div id="echo-notifications-messages"></div> <div id="echo-notifications-messages"></div>
<div id="echo-notifications-notice"></div>
</div> </div>
<?php endif; ?> <?php endif; ?>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<div id="siteNotice" class="sitenotice panel radius"><?php echo $this->text('sitename') . ' '. wfMessage( 'pivot-browsermsg' )->text(); ?></div> <div id="siteNotice" class="sitenotice"><?php echo $this->text('sitename') . ' '. wfMessage( 'pivot-browsermsg' )->text(); ?></div>
<![endif]--> <![endif]-->
<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice panel radius"><?php $this->html( 'sitenotice' ); ?></div><?php } ?> <?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice"><?php $this->html( 'sitenotice' ); ?></div><?php } ?>
<?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk panel radius"><?php $this->html( 'newtalk' ); ?></div><?php } ?> <?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk"><?php $this->html( 'newtalk' ); ?></div><?php } ?>
</div> </div>
</div> </div>

2
assets/scripts/pivot.js
View File

@ -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 // 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 // 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-message").prependTo("#echo-notifications-messages");
jQuery("#pt-notifications-alert").prependTo("#echo-notifications-alerts"); jQuery("#pt-notifications-alert").prependTo("#echo-notifications-alerts");
jQuery("#pt-notifications-notice").prependTo("#echo-notifications-notice");
// Append font-awesome icons // Append font-awesome icons
jQuery('[id^=ca-nstab] a').prepend('<div id="drop-icon"><i class="fa fa-file fa-fw"></i></div>') jQuery('[id^=ca-nstab] a').prepend('<div id="drop-icon"><i class="fa fa-file fa-fw"></i></div>')

BIN
assets/stylesheets/indicator.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 673 B

93
assets/stylesheets/pivot.css
View File

@ -770,51 +770,59 @@ div.mw-htmlform-field-HTMLCheckField div.mw-label { height:0; }
/* Add improved styling for the Echo extension */ /* Add improved styling for the Echo extension */
#echo-notifications { #echo-notifications {
float: right; float: right;
display: inline-block; display: inline-block;
margin: -.5em 0; margin: -1em 1em .5em;
position: relative; position: relative;
z-index: 10000; z-index: 500;
height: 23px; 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-alert .mw-echo-notifications-badge,
#pt-notifications-message .mw-echo-notifications-badge { #pt-notifications-message .mw-echo-notifications-badge {
background-size: 1.6em !important; background-size: 1.4em !important;
display: inline !important; font-size: 1.1em;
font-size: 1.2em; color: transparent;
filter: invert(25%); filter: invert(15%);
color: transparent; 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 { #echo-notifications li {
list-style: none; margin: 0 0 0 1em;
}
#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;
} }
/* Make Echo extension more mobile friendly on small widths */ /* Make Echo extension more mobile friendly on small widths */
@media only screen and (max-width: 450px) { @media only screen and (max-width: 450px) {
.oo-ui-popupWidget-popup { .oo-ui-popupWidget-popup {
width: auto !important; width: auto !important;
position: relative !important; position: relative !important;
margin-left: -260px !important; margin-left: -260px !important;
font-size: 75% !important; font-size: 75% !important;
} }
.oo-ui-clippableElement-clippable.oo-ui-popupWidget-body { .oo-ui-clippableElement-clippable.oo-ui-popupWidget-body {
width: 100% !important; width: 100% !important;
} }
} }
/* Aside CSS */ /* Aside CSS */
@ -1158,12 +1166,15 @@ ul[class*="block-grid"] {
} }
.mw-indicators { .mw-indicators {
float: right; float: right;
line-height: 1.6; line-height: 1.6;
font-size: 0.875em; font-size: 0.875em;
position: relative; position: relative;
margin: -.5em .5em 0; margin: -1em .5em .5em 1em;
max-height: 25px; max-height: 30px;
width: auto; width: auto;
z-index: 1; z-index: 1;
}
.mw-indicator {
display: inline-block;
} }