jenkins-bot has submitted this change and it was merged.
Change subject: Spacing tweaks and whatnot
......................................................................
Spacing tweaks and whatnot
Changed one $this->getSkin() (in the footer icons code) to $skin since
there's no need to call $this->getSkin() twice in the same function.
Change-Id: I9722739ab16d0ec630114d50a7e87ef56d62ec8a
---
M Tempo.php
M Tempo.skin.php
M resources/js/tempo.js
M resources/tempo.css
4 files changed, 131 insertions(+), 145 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Tempo.php b/Tempo.php
index 813add9..8ec314a 100644
--- a/Tempo.php
+++ b/Tempo.php
@@ -1,5 +1,4 @@
<?php
-
/**
* Tempo skin by Lojjik Braughler
*
@@ -16,10 +15,8 @@
*
* To install place the Tempo folder (the folder containing this file!) into
* skins/ and add this line to your wiki's LocalSettings.php:
- * require_once("$IP/skins/Tempo/Tempo.php");
- *
+ * require_once "$IP/skins/Tempo/Tempo.php";
*/
-
if ( !defined( 'MEDIAWIKI' ) ) {
exit;
@@ -58,7 +55,7 @@
// wtf?
-SkinFactory::getDefaultInstance()->register( 'tempo', 'Tempo', function(){
+SkinFactory::getDefaultInstance()->register( 'tempo', 'Tempo', function() {
$config = ConfigFactory::getDefaultInstance()->makeConfig( 'tempo' );
return new SkinTempo( $config );
} );
diff --git a/Tempo.skin.php b/Tempo.skin.php
index 19ec2a6..fae0a26 100644
--- a/Tempo.skin.php
+++ b/Tempo.skin.php
@@ -23,7 +23,6 @@
}
public function setupSkinUserCss( OutputPage $out ) {
-
parent::setupSkinUserCss( $out );
$cssModules = array( 'skins.tempo' );
@@ -31,7 +30,6 @@
}
public function getHeadNavigation() {
-
$menu = array();
$linkAttributes = array();
@@ -40,7 +38,7 @@
}
if ( $this->getUser()->isAnon() ) {
- $personalMenu = Linker::linkKnown(
SpecialPage::getTitleFor( 'UserLogin'), $this->msg( 'pt-login' )->plain() );
+ $personalMenu = Linker::linkKnown(
SpecialPage::getTitleFor( 'UserLogin' ), $this->msg( 'pt-login' )->plain() );
} else {
$personalMenu = Linker::linkKnown(
$this->getUser()->getUserPage(), $this->msg( 'tempo-myprofile' ) ) .
Html::openElement( 'ul'
) . $this->getPersonalToolsList() . Html::closeElement( 'ul' );
@@ -60,7 +58,6 @@
}
return $userlinks;
-
}
public function getTabs( $side = 'left' ) {
@@ -70,43 +67,41 @@
$actions = $content_navigation['actions'];
$views = $content_navigation['views'];
- unset($actions['watch']);
- unset($actions['unwatch']);
- unset($views['view']);
+ unset( $actions['watch'] );
+ unset( $actions['unwatch'] );
+ unset( $views['view'] );
// left side
-
if ( $side === 'left' ) {
return array_merge( $namespaces, $views );
}
// right side
-
return $actions;
}
public function getSearchForm() {
$searchTitle = SpecialPage::getTitleFor( 'Search' );
- $top_search = Html::openElement( 'form', array( 'name' =>
'search_site', 'action' => $searchTitle->getFullURL(), 'method' => 'GET' ) ) .
- Html::openElement( 'input', array( 'type' =>
'text', 'id' => 'searchInput', 'class' => 'search_box', 'name' => 'search' ) ) .
- Html::openElement( 'input', array( 'type' =>
'submit', 'id' => 'searchButton', 'value' => 'Search' ) ) .
- Html::closeElement( 'form' );
+ $top_search = Html::openElement( 'form', array( 'name' =>
'search_site', 'action' => $searchTitle->getFullURL(), 'method' => 'GET' ) ) .
+
Html::openElement( 'input', array( 'type' => 'text', 'id' => 'searchInput',
'class' => 'search_box', 'name' => 'search' ) ) .
+
Html::openElement( 'input', array( 'type' => 'submit', 'id' => 'searchButton',
'value' => 'Search' ) ) .
+ Html::closeElement( 'form' );
- return $top_search;
+ return $top_search;
}
+
public function getSidebarItems() {
$sidebar_html = '';
- foreach( $this->mSidebarSections as $sidebarItem ) {
+ foreach ( $this->mSidebarSections as $sidebarItem ) {
$sidebar_html .= Html::openElement( 'section' );
$sidebar_html .= Html::openElement( 'div', array(
'class' => 'top' ) );
- $sidebar_html .= Html::openElement( 'h3' ) .
$sidebarItem['title'] . Html::closeElement('h3');
+ $sidebar_html .= Html::openElement( 'h3' ) .
$sidebarItem['title'] . Html::closeElement( 'h3' );
$sidebar_html .= Html::closeElement( 'div' );
$sidebar_html .= $sidebarItem['content'];
$sidebar_html .= Html::closeElement( 'section' );
-
}
-
+
return $sidebar_html;
}
@@ -115,17 +110,17 @@
if ( $user->isAnon() ) {
return $this->msg( 'tempo-guest' );
- }
-
+ }
+
$realName = $user->getRealName();
if ( !empty( $realName ) ) {
- return $realName;
+ return $realName;
}
return $user->getName();
}
-
+
}
class TempoTemplate extends BaseTemplate {
@@ -157,20 +152,19 @@
<?php if ( is_array( $box['content'] ) ) { ?>
<ul>
<?php
-
foreach ( $box['content'] as $key => $item ) {
-
echo $this->makeListItem( $key, $item );
-
}
+
foreach ( $box['content'] as $key => $item ) {
+
echo $this->makeListItem( $key, $item );
+
}
?>
</ul>
<?php
-
} else {
-
echo $box['content'];
-
}
-
-
?>
-
</section>
+
} else {
+
echo $box['content'];
+
}
+
?>
+
</section>
<?php
-
}
+ }
?>
</div>
</div>
@@ -183,22 +177,24 @@
}
?>
- <div id="navtabs" class="noprint"><ul
class="tabsleft">
-
<?php foreach( $skin->getTabs( 'left' ) as $key => $item ) {
-
echo $this->makeListItem( $key, $item );
-
}
-
?>
-
-
</ul>
-
<ul class="tabsright">
-
<?php foreach( $skin->getTabs( 'right' ) as $key => $item ) {
-
echo $this->makeListItem( $key, $item );
-
}
-
?>
-
</ul>
+ <div id="navtabs" class="noprint">
+ <ul class="tabsleft">
+ <?php
+ foreach (
$skin->getTabs( 'left' ) as $key => $item ) {
+ echo
$this->makeListItem( $key, $item );
+ }
+ ?>
+ </ul>
+ <ul class="tabsright">
+ <?php
+ foreach (
$skin->getTabs( 'right' ) as $key => $item ) {
+ echo
$this->makeListItem( $key, $item );
+ }
+ ?>
+ </ul>
</div>
<div id="content">
- <h1><?php $this->html('title')
?></h1>
+ <h1><?php $this->html( 'title'
) ?></h1>
<article>
<?php $this->html(
'bodytext' ) ?>
</article>
@@ -213,20 +209,20 @@
foreach ( $links as $key ) { ?>
<li><?php $this->html( $key ) ?></li>
<?php
-
}
+
}
?>
</ul>
<?php
- }
+ }
?>
<ul>
<?php
foreach (
$this->getFooterIcons( 'icononly' ) as $blockName => $footerIcons ) { ?>
<li>
<?php
-
foreach ( $footerIcons as $icon ) {
-
echo $this->getSkin()->makeFooterIcon( $icon );
-
}
+
foreach ( $footerIcons as $icon ) {
+
echo $skin->makeFooterIcon( $icon );
+
}
?>
</li>
<?php
@@ -239,6 +235,5 @@
</body>
</html>
<?php
-
}
}
\ No newline at end of file
diff --git a/resources/js/tempo.js b/resources/js/tempo.js
index b0b8fbb..0c269e8 100644
--- a/resources/js/tempo.js
+++ b/resources/js/tempo.js
@@ -1,5 +1,5 @@
-$(document).ready(function(){
- $('#searchButton').on( 'click', function() {
- $('#searchButton').css( 'background-color', '#627756' );
- });
-});
+$( document ).ready( function() {
+ $( '#searchButton' ).on( 'click', function() {
+ $( '#searchButton' ).css( 'background-color', '#627756' );
+ } );
+} );
diff --git a/resources/tempo.css b/resources/tempo.css
index cb558da..9be7386 100644
--- a/resources/tempo.css
+++ b/resources/tempo.css
@@ -1,7 +1,7 @@
-* {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
+* {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
}
html {
@@ -16,33 +16,32 @@
font-family: proxima-nova, "Helvetica Neue", Helvetica, Arial,
sans-serif;
-webkit-font-smoothing: antialiased;
overflow-x: hidden;
-
}
-td select{
+td select {
margin-bottom: 10px;
}
-td label{
+td label {
margin-right: 5px;
}
-input[type="submit"]{
+input[type="submit"] {
line-height: inherit;
}
-input[type="radio"]{
+input[type="radio"] {
margin: 0 2px;
}
a {
- color:#505f4c;
- text-decoration:none;
- font-weight:normal;
+ color: #505f4c;
+ text-decoration: none;
+ font-weight: normal;
}
a:hover {
- text-decoration:underline;
+ text-decoration: underline;
}
ul {
@@ -71,14 +70,14 @@
}
:focus {
- outline:none;
+ outline: none;
}
#container {
min-height: 100vh;
height: 100%;
width: 100%;
- display:table;
+ display: table;
position: relative;
}
@@ -86,7 +85,6 @@
display: table-row;
height: 76px;
}
-
#logo {
width: 20%;
@@ -97,8 +95,7 @@
#logo img {
width: 66px;
- margin-left:109px;
-
+ margin-left: 109px;
}
#topSearch {
@@ -118,7 +115,6 @@
border-color: #aaa;
box-shadow: inset 0 3px 3px #ccc;
background-color: #f6f7f6;
-
}
#searchButton {
@@ -215,7 +211,7 @@
#hello {
display: inline-block;
- box-shadow:6px 0 8px -7px black;
+ box-shadow: 6px 0 8px -7px black;
}
#hello p {
@@ -228,7 +224,7 @@
float: right;
}
-#top > #topnav > .userlinks-wrapper{
+#top > #topnav > .userlinks-wrapper {
width: 450px;
height: 100%;
display: inline-block;
@@ -251,8 +247,8 @@
#top > #topnav > .userlinks-wrapper > #userlinks > ul > li {
float: left;
list-style-type: none;
- display:inline-block;
- font-size:small;
+ display: inline-block;
+ font-size: small;
min-width: 70px;
min-height: 76px;
vertical-align: middle;
@@ -263,7 +259,7 @@
}
#top > #topnav > .userlinks-wrapper > #userlinks > ul > li:hover {
- background-color:#505f4c;
+ background-color: #505f4c;
}
#top > #topnav > .userlinks-wrapper > #userlinks > ul > li:hover > a {
text-decoration:none;
@@ -297,7 +293,8 @@
border: 1px solid #b9cdb5;
}
-#top > #topnav > .userlinks-wrapper > #userlinks > ul > li > ul > li a, #top >
#topnav > .userlinks-wrapper > #userlinks > ul > li > ul > li p {
+#top > #topnav > .userlinks-wrapper > #userlinks > ul > li > ul > li a,
+#top > #topnav > .userlinks-wrapper > #userlinks > ul > li > ul > li p {
display: block;
padding: 0 20px 0 15px;
line-height: 26px;
@@ -324,7 +321,7 @@
position: relative;
width: 20%;
clear: left;
- display:table-cell;
+ display: table-cell;
height: auto;
}
@@ -334,35 +331,35 @@
}
#sidebar section {
- margin-bottom:10px;
- padding:10px;
+ margin-bottom: 10px;
+ padding: 10px;
background-color: #f6f5f4;
- border:1px solid #e5e5e5;
+ border: 1px solid #e5e5e5;
border-radius: 2px;
width: 215px
}
#sidebar section .top {
- border-bottom:1px solid #92a583;
- width:100%;
+ border-bottom: 1px solid #92a583;
+ width: 100%;
}
#sidebar section .top h3 {
font-weight: normal;
- display:inline;
- vertical-align:top;
+ display: inline;
+ vertical-align: top;
}
#sidebar section h3 {
- font-size:small;
- padding-bottom:3px;
+ font-size: small;
+ padding-bottom: 3px;
}
#sidebar ul {
margin: 0;
- font-size:10pt;
- margin-top:5px;
- padding:0;
+ font-size: 10pt;
+ margin-top: 5px;
+ padding: 0;
}
#sidebar ul li:before {
@@ -374,10 +371,10 @@
margin-right: 5px;
}
#sidebar ul li {
- border:none;
- padding-left:0;
- padding-top:10px;
- line-height:0.5em;
+ border: none;
+ padding-left: 0;
+ padding-top: 10px;
+ line-height: 0.5em;
list-style-type: none;
}
@@ -389,14 +386,13 @@
padding-top: 25px;
}
-
#main #navtabs {
- min-height:25px;
+ min-height: 25px;
vertical-align: bottom;
padding: 0;
min-width: 100%;
margin: 0;
- border-bottom:1px solid #e5e5e5;
+ border-bottom: 1px solid #e5e5e5;
}
#main #navtabs ul {
@@ -412,8 +408,8 @@
display: inline-block;
height: 100%;
margin-right: 10px;
- vertical-align:bottom;
- overflow:hidden;
+ vertical-align: bottom;
+ overflow: hidden;
background-color: #EFEFEF;
line-height: 4px;
border-left: 1px solid #e5e5e5;
@@ -430,7 +426,7 @@
min-height: 100%;
font-size: 10pt;
padding: 10px;
- display:block;
+ display: block;
text-transform: lowercase;
background-color: #fff;
border-bottom: 1px solid #e5e5e5;
@@ -446,8 +442,8 @@
max-width: 100%;
background-color: #fff;
border-radius:0px 2px 2px 2px;
- border-left:1px solid #e5e5e5;
- border-bottom:1px solid #e5e5e5;
+ border-left: 1px solid #e5e5e5;
+ border-bottom: 1px solid #e5e5e5;
padding: 10px;
line-height: 1.6;
font-size: 0.875em;
@@ -460,28 +456,27 @@
padding-right: 30px;
}
-
div.mw-createacct-benefits-container {
display: table-cell;
float: none !important;
}
+
#content article {
- margin-top:25px;
+ margin-top: 25px;
}
-
#content article p {
- text-indent:5px;
+ text-indent: 5px;
}
#header {
- width:100%;
- margin-bottom:5px;
+ width: 100%;
+ margin-bottom: 5px;
}
#main #content h1 {
- display:inline-block;
- vertical-align:top;
+ display: inline-block;
+ vertical-align: top;
font-size: 16pt;
width: 100%;
}
@@ -495,7 +490,7 @@
position: absolute;
bottom: 0;
width: 100%;
- float: left;
+ float: left;
border-radius: 0;
}
@@ -511,12 +506,12 @@
}
#bottom footer ul li:after {
- content:'||';
+ content: '||';
margin-left: 5px;
}
#bottom footer ul li:last-child:after {
- content:'';
+ content: '';
}
#bottom footer ul li a {
@@ -615,7 +610,7 @@
}
#main #content .mw-htmlform-submit:active {
- background-color: #009712;;
+ background-color: #009712;
}
a.text {
@@ -643,16 +638,16 @@
color: #7F0000 !important;
}
-td.mw-label{
+td.mw-label {
text-align: left;
width: 230px !important;
}
-.mw-htmlform-field-HTMLIntField{
+.mw-htmlform-field-HTMLIntField {
height: 30px;
}
-.mw-htmlform-nolabel td.mw-label{
+.mw-htmlform-nolabel td.mw-label {
width: 0 !important;
}
@@ -664,11 +659,11 @@
padding: 5px 10px;
}
-#main #content .mw-htmlform-submit:hover{
+#main #content .mw-htmlform-submit:hover {
background-color: #3a98fd;
}
-.editButtons input[type="submit"]{
+.editButtons input[type="submit"] {
color: white;
background-color: steelblue;
padding: 5px 10px;
@@ -678,38 +673,37 @@
border-radius: 5px;
}
-.editButtons input[type="submit"]:hover{
+.editButtons input[type="submit"]:hover {
background-color: #3a98fd;
}
#sitenotice {
- margin-right: 10px;
- margin-bottom: 10px;
- padding-left: 10px;
- padding-right:10px;
- text-align:center;
- background-color: #f6f6e4;
- border: 1px solid #e5e5e5;
-
+ margin-right: 10px;
+ margin-bottom: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
+ text-align: center;
+ background-color: #f6f6e4;
+ border: 1px solid #e5e5e5;
}
-@media screen and (max-width: 1157px){
- #topSearch{
+@media screen and (max-width: 1157px) {
+ #topSearch {
width: 30%;
}
- #searchInput{
+ #searchInput {
width: 75%;
}
}
-@media screen and (max-width: 940px){
- #top > #topnav > .userlinks-wrapper{
+@media screen and (max-width: 940px) {
+ #top > #topnav > .userlinks-wrapper {
width: 300px;
}
- #topSearch{
+ #topSearch {
width: 40%;
}
- #searchInput{
+ #searchInput {
width: 65%;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/227674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9722739ab16d0ec630114d50a7e87ef56d62ec8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Tempo
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
