[MediaWiki-commits] [Gerrit] Don't repeat subtitle, and make very minor style improvement... - change (mediawiki...erudite)

2013-10-11 Thread Njw (Code Review) 
Njw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/89165


Change subject: Don't repeat subtitle, and make very minor style improvements 
in it
..

Don't repeat subtitle, and make very minor style improvements in it

Change-Id: I542d04e0b528b3135545c8bed5b3c561851ffe7e
---
M Erudite.skin.php
M assets/erudite.css
2 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/65/89165/1

diff --git a/Erudite.skin.php b/Erudite.skin.php
index 271f812..e45d58e 100644
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -86,7 +86,7 @@
?
div id=header role=banner
h1 id=siteTitlea href=?php echo 
htmlspecialchars( $this-data['nav_urls']['mainpage']['href'] ) ? 
title=?php $this-text( 'sitename' ); ? rel=home?php $this-text( 
'sitename' ); ?/a/h1
-   div id=siteSubtitle?php $this-msg( 'tagline' ) 
?/div
+   div id=tagline?php $this-msg( 'tagline' ) ?/div
/div
 
div id=access role=navigation
@@ -107,7 +107,7 @@
 
div id=mw-js-message/div
?php
-   foreach( array( 'newtalk', 'sitenotice', 'subtitle', 
'undelete' ) as $msg ) {
+   foreach( array( 'newtalk', 'sitenotice', 'undelete' ) 
as $msg ) {
if( $this-data[$msg] ) {
echo div id='$msg' 
class='message'p;
$this-html( $msg );
@@ -122,7 +122,7 @@
div id=content-container
h1 class=entry-title?php $this-html( 
'title' ); ?/h1
?php if ( $this-data['subtitle'] ) { ?
-   span class=entry-sub-title?php 
$this-html( 'subtitle' ) ?/span
+   div class=subtitle?php 
$this-html( 'subtitle' ) ?/div
?php } ?
 
div class=entry-meta
diff --git a/assets/erudite.css b/assets/erudite.css
index 2c793c2..afc99c9 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -162,7 +162,7 @@
text-decoration: none;
 }
 
-#siteSubtitle {
+#tagline {
font-size: 0.875em;
color: #ff;
 }
@@ -359,9 +359,8 @@
 #toc {
display: none;
 }
-span.entry-sub-title {
-   margin-left: 1em;
-   margin-bottom: 2em;
+.subtitle {
+   margin-bottom: 1em;
font-size: 0.875em;
font-style: italic;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/89165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I542d04e0b528b3135545c8bed5b3c561851ffe7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't repeat subtitle, and make very minor style improvement... - change (mediawiki...erudite)

2013-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Don't repeat subtitle, and make very minor style improvements 
in it
..


Don't repeat subtitle, and make very minor style improvements in it

Change-Id: I542d04e0b528b3135545c8bed5b3c561851ffe7e
---
M Erudite.skin.php
M assets/erudite.css
2 files changed, 6 insertions(+), 7 deletions(-)

Approvals:
  Njw: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Erudite.skin.php b/Erudite.skin.php
index 271f812..e45d58e 100644
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -86,7 +86,7 @@
?
div id=header role=banner
h1 id=siteTitlea href=?php echo 
htmlspecialchars( $this-data['nav_urls']['mainpage']['href'] ) ? 
title=?php $this-text( 'sitename' ); ? rel=home?php $this-text( 
'sitename' ); ?/a/h1
-   div id=siteSubtitle?php $this-msg( 'tagline' ) 
?/div
+   div id=tagline?php $this-msg( 'tagline' ) ?/div
/div
 
div id=access role=navigation
@@ -107,7 +107,7 @@
 
div id=mw-js-message/div
?php
-   foreach( array( 'newtalk', 'sitenotice', 'subtitle', 
'undelete' ) as $msg ) {
+   foreach( array( 'newtalk', 'sitenotice', 'undelete' ) 
as $msg ) {
if( $this-data[$msg] ) {
echo div id='$msg' 
class='message'p;
$this-html( $msg );
@@ -122,7 +122,7 @@
div id=content-container
h1 class=entry-title?php $this-html( 
'title' ); ?/h1
?php if ( $this-data['subtitle'] ) { ?
-   span class=entry-sub-title?php 
$this-html( 'subtitle' ) ?/span
+   div class=subtitle?php 
$this-html( 'subtitle' ) ?/div
?php } ?
 
div class=entry-meta
diff --git a/assets/erudite.css b/assets/erudite.css
index 2c793c2..afc99c9 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -162,7 +162,7 @@
text-decoration: none;
 }
 
-#siteSubtitle {
+#tagline {
font-size: 0.875em;
color: #ff;
 }
@@ -359,9 +359,8 @@
 #toc {
display: none;
 }
-span.entry-sub-title {
-   margin-left: 1em;
-   margin-bottom: 2em;
+.subtitle {
+   margin-bottom: 1em;
font-size: 0.875em;
font-style: italic;
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/89165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I542d04e0b528b3135545c8bed5b3c561851ffe7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: Njw nick.wh...@durham.ac.uk
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits