Llbraughler has submitted this change and it was merged.
Change subject: More stylesheet work
......................................................................
More stylesheet work
Change-Id: I6e49912680504c1e79eabc83ea12d083deae483f
---
M Tempo.php
M Tempo.skin.php
M resources/js/tempo.js
M resources/tempo.css
M templates/NotificationsMenu.tmpl.php
5 files changed, 68 insertions(+), 22 deletions(-)
Approvals:
Llbraughler: Verified; Looks good to me, approved
diff --git a/Tempo.php b/Tempo.php
index a496be9..a498f79 100755
--- a/Tempo.php
+++ b/Tempo.php
@@ -46,18 +46,10 @@
'skins/Tempo/resources/tempo.css' => array( 'media' => 'screen'
),
'skins/Tempo/resources/printable.css' => array( 'media' =>
'print' )
),
- 'position' => 'top'
-);
-
-// Main JS module for this skin
-$wgResourceModules['skins.tempo.js'] = array(
'scripts' => array(
- 'skins/Tempo/resources/js/tempo.js',
+ 'skins/Tempo/resources/js/tempo.js' => array( 'media' =>
'screen' )
),
- 'dependencies' => array(
- 'jquery.client',
- 'jquery.ui'
- )
+ 'position' => 'top'
);
$wgHooks['BeforePageDisplay'][] = function( OutputPage &$out, &$skin ) {
diff --git a/Tempo.skin.php b/Tempo.skin.php
index 3842e73..795e941 100755
--- a/Tempo.skin.php
+++ b/Tempo.skin.php
@@ -24,13 +24,10 @@
public function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
- $baseModules = array();
- $stylesOnly = array( 'skins.tempo' );
- $scriptsOnly = array( 'skins.tempo.js' );
+ $baseModules = array( 'skins.tempo' );
- $out->addModules( $baseModules );
- $out->addModuleStyles( $stylesOnly );
- $out->addModuleScripts( $scriptsOnly );
+ $out->addModuleStyles( $baseModules );
+ $out->addModuleScripts( $baseModules );
}
@@ -42,7 +39,7 @@
public function getNotifications() {
- return '<li>' . $this->msg( 'tempo-nonotifications' ) . '</li>';
+ return '<li><p>' . $this->msg( 'tempo-nonotifications' ) .
'</p></li>';
}
public function getHeadNavigation() {
@@ -107,7 +104,7 @@
$top_search = '
<form id="bubble_search" name="search_site" action="'
. $searchTitle->getFullURL() . '" method="get">
<input type="text" id="searchInput"
class="search_box" name="search" x-webkit-speech />
- <span id="arrow"></span><input type="submit"
id="searchButton" class="search_button" value="' . $this->msg( 'searchbutton' )
. '"/>
+ <input type="submit" id="searchButton"
class="search_button mw-ui-button" value="' . $this->msg( 'searchbutton' ) .
'"/>
</form>';
return $top_search;
diff --git a/resources/js/tempo.js b/resources/js/tempo.js
index 1b614f9..b0b8fbb 100755
--- a/resources/js/tempo.js
+++ b/resources/js/tempo.js
@@ -1,5 +1,5 @@
$(document).ready(function(){
- $('#searchBox').on( 'click', function() {
- $('#searchBox').attr( 'placeholder', '' );
+ $('#searchButton').on( 'click', function() {
+ $('#searchButton').css( 'background-color', '#627756' );
});
});
diff --git a/resources/tempo.css b/resources/tempo.css
index 5f8f605..f31334e 100755
--- a/resources/tempo.css
+++ b/resources/tempo.css
@@ -451,6 +451,26 @@
overflow-x: hidden;
}
+table{
+
+}
+
+td select{
+ margin-bottom: 10px;
+}
+
+td label{
+ margin-right: 5px;
+}
+
+input[type="submit"]{
+ line-height: inherit;
+}
+
+input[type="radio"]{
+ margin: 0 2px;
+}
+
a {
color:#505f4c;
text-decoration:none;
@@ -562,10 +582,11 @@
}
#searchButton {
+ padding: 0;
color: #fafafa;
background-color: #6d855e;
border: 0;
- height: 26px;
+ height: 27px;
line-height: 23px;
margin-left: 5px;
/*right: 5px;
@@ -704,7 +725,7 @@
border: 1px solid #b9cdb5;
}
-#top > #topnav > .userlinks-wrapper > #userlinks > ul > li > ul > li a {
+#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;
@@ -1033,6 +1054,42 @@
color: #7F0000 !important;
}
+td.mw-label{
+ text-align: left;
+ width: 230px !important;
+}
+
+.mw-htmlform-field-HTMLIntField{
+ height: 30px;
+}
+
+.mw-htmlform-nolabel td.mw-label{
+ width: 0 !important;
+}
+
+#main #content .mw-htmlform-submit{
+ background-color: steelblue;
+ padding: 5px 10px;
+}
+
+#main #content .mw-htmlform-submit:hover{
+ background-color: #3a98fd;
+}
+
+.editButtons input[type="submit"]{
+ color: white;
+ background-color: steelblue;
+ padding: 5px 10px;
+ border-style: none;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+}
+
+.editButtons input[type="submit"]:hover{
+ background-color: #3a98fd;
+}
+
@media screen and (max-width: 1157px){
#topSearch{
width: 30%;
diff --git a/templates/NotificationsMenu.tmpl.php
b/templates/NotificationsMenu.tmpl.php
old mode 100644
new mode 100755
--
To view, visit https://gerrit.wikimedia.org/r/185658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e49912680504c1e79eabc83ea12d083deae483f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Tempo
Gerrit-Branch: master
Gerrit-Owner: Llbraughler <[email protected]>
Gerrit-Reviewer: Llbraughler <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
