mirror of
				https://github.com/Hutchy68/pivot.git
				synced 2025-11-03 18:57:34 +01:00 
			
		
		
		
	fixes for echo extension, CSS cleanup, default skin colors, etc...
This commit is contained in:
		@@ -196,7 +196,10 @@ class pivotTemplate extends BaseTemplate {
 | 
				
			|||||||
											<?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ));  ?>
 | 
																<?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ));  ?>
 | 
				
			||||||
										</ul>
 | 
															</ul>
 | 
				
			||||||
										<?php if ($wgUser->isLoggedIn()): ?>
 | 
															<?php if ($wgUser->isLoggedIn()): ?>
 | 
				
			||||||
											<div id="echo-notifications"></div>
 | 
																<div id="echo-notifications">
 | 
				
			||||||
 | 
																<div id="echo-notifications-alerts"></div>
 | 
				
			||||||
 | 
																<div id="echo-notifications-messages"></div>
 | 
				
			||||||
 | 
																</div>
 | 
				
			||||||
										<?php endif; ?>
 | 
															<?php endif; ?>
 | 
				
			||||||
									<?php endif;
 | 
														<?php endif;
 | 
				
			||||||
									$namespace = str_replace('_', ' ', $this->getSkin()->getTitle()->getNsText());
 | 
														$namespace = str_replace('_', ' ', $this->getSkin()->getTitle()->getNsText());
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,7 +11,9 @@ 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");
 | 
					  jQuery("#pt-notifications").prependTo("#echo-notifications-alerts");
 | 
				
			||||||
 | 
					  jQuery("#pt-notifications-message").prependTo("#echo-notifications-messages");
 | 
				
			||||||
 | 
					  jQuery("#pt-notifications-alert").prependTo("#echo-notifications-alerts");
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  // 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>')
 | 
				
			||||||
@@ -56,6 +58,7 @@ if ( jQuery( '#ca-addsection' ).length ) {
 | 
				
			|||||||
  jQuery('li#t-print a').prepend('<div id="drop-icon"><i class="fa fa-print fa-fw"></i></div>')
 | 
					  jQuery('li#t-print a').prepend('<div id="drop-icon"><i class="fa fa-print fa-fw"></i></div>')
 | 
				
			||||||
  jQuery('li#t-permalink a').prepend('<div id="drop-icon"><i class="fa fa-dot-circle-o fa-fw"></i></div>')
 | 
					  jQuery('li#t-permalink a').prepend('<div id="drop-icon"><i class="fa fa-dot-circle-o fa-fw"></i></div>')
 | 
				
			||||||
  jQuery('li#t-info a').prepend('<div id="drop-icon"><i class="fa fa-info fa-fw"></i></div>')
 | 
					  jQuery('li#t-info a').prepend('<div id="drop-icon"><i class="fa fa-info fa-fw"></i></div>')
 | 
				
			||||||
 | 
					  jQuery('li#t-cite a').prepend('<div id="drop-icon"><i class="fa fa-quote-left fa-fw"></i></div>')
 | 
				
			||||||
  jQuery('li#feedlinks a').prepend('<div id="drop-icon"><i class="fa fa-rss fa-fw"></i></div>')
 | 
					  jQuery('li#feedlinks a').prepend('<div id="drop-icon"><i class="fa fa-rss fa-fw"></i></div>')
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  jQuery('li#n-recentchanges a').prepend('<div id="drop-icon"><i class="fa fa-tasks fa-fw"></i></div>')
 | 
					  jQuery('li#n-recentchanges a').prepend('<div id="drop-icon"><i class="fa fa-tasks fa-fw"></i></div>')
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,8 @@ h4,h5,h6 {color: 2e2e2e;}
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#toc ul, .toc ul { font-size: 16px; }
 | 
					#toc ul, .toc ul { font-size: 16px; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#toc { margin: 1em 0; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@media only screen and (min-width: 40.0625em) {
 | 
					@media only screen and (min-width: 40.0625em) {
 | 
				
			||||||
body { line-height: 1.6em; font-size: 14px; }
 | 
					body { line-height: 1.6em; font-size: 14px; }
 | 
				
			||||||
p, ul, ol, dl { font-size: 14px; }
 | 
					p, ul, ol, dl { font-size: 14px; }
 | 
				
			||||||
@@ -14,6 +16,12 @@ p, ul, ol, dl { font-size: 14px; }
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
p, table { border: none; margin-bottom: 1em; max-width: 100%; }
 | 
					p, table { border: none; margin-bottom: 1em; max-width: 100%; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* make sure user tweaks to pre don't cause problems with orbit captions */
 | 
				
			||||||
 | 
					.orbit-caption pre {
 | 
				
			||||||
 | 
					    padding: 0;
 | 
				
			||||||
 | 
					    background: inherit;
 | 
				
			||||||
 | 
					    border: none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
a.label:hover,
 | 
					a.label:hover,
 | 
				
			||||||
a.label:focus {
 | 
					a.label:focus {
 | 
				
			||||||
@@ -788,20 +796,30 @@ body.mw-special-Userlogin h2.title {
 | 
				
			|||||||
  margin: .5em 1em;
 | 
					  margin: .5em 1em;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#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%);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#echo-notifications li {
 | 
				
			||||||
 | 
					    list-style: none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#echo-notifications-messages {
 | 
				
			||||||
 | 
					    float: right;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					#echo-notifications-alerts {
 | 
				
			||||||
 | 
					    float: right;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#echo-notifications #pt-notifications {
 | 
					#echo-notifications #pt-notifications {
 | 
				
			||||||
  position: relative;
 | 
					  position: relative;
 | 
				
			||||||
  list-style: none;
 | 
					  list-style: none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#echo-notifications #pt-notifications .mw-echo-notifications-badge {
 | 
					 | 
				
			||||||
  width: 30px;
 | 
					 | 
				
			||||||
  height: 35px;
 | 
					 | 
				
			||||||
  text-align: center;
 | 
					 | 
				
			||||||
  border-radius: 6px;
 | 
					 | 
				
			||||||
  margin: 0;
 | 
					 | 
				
			||||||
  padding:6px;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#echo-notifications #pt-notifications a.mw-echo-short-link .mw-badge {
 | 
					#echo-notifications #pt-notifications a.mw-echo-short-link .mw-badge {
 | 
				
			||||||
  margin:0;
 | 
					  margin:0;
 | 
				
			||||||
  padding:6px;
 | 
					  padding:6px;
 | 
				
			||||||
@@ -883,10 +901,14 @@ margin: 0;
 | 
				
			|||||||
	max-width: 100%;
 | 
						max-width: 100%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.tab-bar {
 | 
				
			||||||
 | 
					    background: #517398;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#p-cactions {
 | 
					#p-cactions {
 | 
				
			||||||
    padding-top: 1.5em;
 | 
					    padding-top: 1.5em;
 | 
				
			||||||
    padding-bottom: .5em;
 | 
					    padding-bottom: .5em;
 | 
				
			||||||
    background-color: #fff;
 | 
					    background-color: #f6f6f6;
 | 
				
			||||||
	border-left: 1px solid #ccc;		
 | 
						border-left: 1px solid #ccc;		
 | 
				
			||||||
    border-right: 1px solid #ccc;
 | 
					    border-right: 1px solid #ccc;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -931,9 +953,12 @@ ul.side-nav label {
 | 
				
			|||||||
    font-weight: bold;
 | 
					    font-weight: bold;
 | 
				
			||||||
    border: none;
 | 
					    border: none;
 | 
				
			||||||
    display: block;
 | 
					    display: block;
 | 
				
			||||||
 | 
						background: #517398;
 | 
				
			||||||
 | 
					    color: #fff;
 | 
				
			||||||
 | 
					    padding: .25em .5em;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
body {
 | 
					body {
 | 
				
			||||||
	background-color: #eee;
 | 
						background-color: #DCEAEA;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
li.name.logo {
 | 
					li.name.logo {
 | 
				
			||||||
    margin-bottom: 1em;
 | 
					    margin-bottom: 1em;
 | 
				
			||||||
@@ -944,9 +969,7 @@ li.name.logo {
 | 
				
			|||||||
@media only screen and (min-width: 642px) {
 | 
					@media only screen and (min-width: 642px) {
 | 
				
			||||||
	.tab-bar-section.middle { left: .8125rem; text-align: left; }
 | 
						.tab-bar-section.middle { left: .8125rem; text-align: left; }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.tab-bar {
 | 
					
 | 
				
			||||||
	background: #443266;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* TOC */
 | 
					/* TOC */
 | 
				
			||||||
#toc #toctitle, .toc #toctitle, #toc .toctitle, .toc .toctitle {
 | 
					#toc #toctitle, .toc #toctitle, #toc .toctitle, .toc .toctitle {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user