Bartosz Dziewoński has submitted this change and it was merged.
Change subject: Adjusted content text size and tab hover effects
......................................................................
Adjusted content text size and tab hover effects
Change-Id: Iadc37c179974593bae6c6fe3790a029bfb275c85
---
M skins/Apex.php
M skins/apex/screen-narrow.css
M skins/apex/screen.css
3 files changed, 83 insertions(+), 48 deletions(-)
Approvals:
Bartosz Dziewoński: Verified; Looks good to me, approved
diff --git a/skins/Apex.php b/skins/Apex.php
index 8969f05..8b7420c 100644
--- a/skins/Apex.php
+++ b/skins/Apex.php
@@ -154,45 +154,47 @@
// Output HTML Page
$this->html( 'headelement' );
?>
- <div id="content" class="mw-body">
- <a id="top"></a>
- <div id="mw-js-message" style="display:none;"<?php
$this->html( 'userlangattributes' ) ?>></div>
- <?php if ( $this->data['sitenotice'] ): ?>
- <div id="siteNotice"><?php $this->html( 'sitenotice' )
?></div>
- <?php endif; ?>
- <h1 id="firstHeading" class="firstHeading"><span
dir="auto"><?php $this->html( 'title' ) ?></span></h1>
- <div id="bodyContent">
- <?php if ( $this->data['isarticle'] ): ?>
- <div id="siteSub"><?php $this->msg( 'tagline' )
?></div>
+ <div class="apex-content-wrapper">
+ <div id="content" class="mw-body">
+ <a id="top"></a>
+ <div id="mw-js-message"
style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
+ <?php if ( $this->data['sitenotice'] ): ?>
+ <div id="siteNotice"><?php $this->html(
'sitenotice' ) ?></div>
<?php endif; ?>
- <div id="contentSub"<?php $this->html(
'userlangattributes' ) ?>><?php $this->html( 'subtitle' ) ?></div>
- <?php if ( $this->data['undelete'] ): ?>
- <div id="contentSub2"><?php $this->html(
'undelete' ) ?></div>
- <?php endif; ?>
- <?php if( $this->data['newtalk'] ): ?>
- <div class="usermessage"><?php $this->html(
'newtalk' ) ?></div>
- <?php endif; ?>
- <?php if ( $this->data['showjumplinks'] ): ?>
- <div id="jump-to-nav" class="mw-jump">
- <?php $this->msg( 'jumpto' ) ?>
- <a href="#mw-head"><?php $this->msg(
'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?>
- <a href="#p-search"><?php $this->msg(
'jumptosearch' ) ?></a>
+ <h1 id="firstHeading"
class="firstHeading"><span dir="auto"><?php $this->html( 'title' )
?></span></h1>
+ <div id="bodyContent">
+ <?php if ( $this->data['isarticle'] ):
?>
+ <div id="siteSub"><?php $this->msg(
'tagline' ) ?></div>
+ <?php endif; ?>
+ <div id="contentSub"<?php $this->html(
'userlangattributes' ) ?>><?php $this->html( 'subtitle' ) ?></div>
+ <?php if ( $this->data['undelete'] ): ?>
+ <div id="contentSub2"><?php
$this->html( 'undelete' ) ?></div>
+ <?php endif; ?>
+ <?php if( $this->data['newtalk'] ): ?>
+ <div class="usermessage"><?php
$this->html( 'newtalk' ) ?></div>
+ <?php endif; ?>
+ <?php if ( $this->data['showjumplinks']
): ?>
+ <div id="jump-to-nav" class="mw-jump">
+ <?php $this->msg( 'jumpto' ) ?>
+ <a href="#mw-head"><?php
$this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?>
+ <a href="#p-search"><?php
$this->msg( 'jumptosearch' ) ?></a>
+ </div>
+ <?php endif; ?>
+ <?php $this->html( 'bodycontent' ) ?>
+ <?php if ( $this->data['printfooter']
): ?>
+ <div class="printfooter">
+ <?php $this->html( 'printfooter' ); ?>
+ </div>
+ <?php endif; ?>
+ <?php if ( $this->data['catlinks'] ): ?>
+ <?php $this->html( 'catlinks' ); ?>
+ <?php endif; ?>
+ <?php if (
$this->data['dataAfterContent'] ): ?>
+ <?php $this->html( 'dataAfterContent'
); ?>
+ <?php endif; ?>
+ <div class="visualClear"></div>
+ <?php $this->html( 'debughtml' ); ?>
</div>
- <?php endif; ?>
- <?php $this->html( 'bodycontent' ) ?>
- <?php if ( $this->data['printfooter'] ): ?>
- <div class="printfooter">
- <?php $this->html( 'printfooter' ); ?>
- </div>
- <?php endif; ?>
- <?php if ( $this->data['catlinks'] ): ?>
- <?php $this->html( 'catlinks' ); ?>
- <?php endif; ?>
- <?php if ( $this->data['dataAfterContent'] ): ?>
- <?php $this->html( 'dataAfterContent' ); ?>
- <?php endif; ?>
- <div class="visualClear"></div>
- <?php $this->html( 'debughtml' ); ?>
</div>
</div>
<div id="mw-head" class="noprint">
diff --git a/skins/apex/screen-narrow.css b/skins/apex/screen-narrow.css
index 3cb8ff8..81cb5a2 100644
--- a/skins/apex/screen-narrow.css
+++ b/skins/apex/screen-narrow.css
@@ -45,4 +45,8 @@
#p-search {
margin-right: 1.5em;
+}
+
+div#mw-js-message {
+ right: 1.5em;
}
\ No newline at end of file
diff --git a/skins/apex/screen.css b/skins/apex/screen.css
index ead9503..f99755b 100644
--- a/skins/apex/screen.css
+++ b/skins/apex/screen.css
@@ -29,9 +29,14 @@
font-size: 1.5em;
}
+.apex-content-wrapper {
+ margin: 6.5em 3em 3em 3em;
+}
+
#content {
- margin: 7em 3em 3em 3em;
- line-height: 2em;
+ font-size: 0.8em;
+ line-height: 1.5em;
+ padding-top: 1em;
}
.emptyPortlet {
@@ -92,22 +97,36 @@
.apex-tabs li {
float: left;
+}
+
+.apex-tabs a {
+ display: block;
padding: 0.25em 0.75em;
}
-.apex-tabs .selected {
+.apex-tabs li.selected {
background-color: white;
border: solid 1px #d5eaed;
border-bottom: solid 1px #ffffff;
-webkit-border-radius: 0.25em 0.25em 0 0;
-moz-border-radius: 0.25em 0.25em 0 0;
border-radius: 0.25em 0.25em 0 0;
- padding-top: 0.5em;
margin-top: -0.33em;
}
-.apex-tabs .selected a {
+.apex-tabs li.selected a {
color: #333333;
+ padding-top: 0.5em;
+}
+
+.apex-tabs a:hover {
+ text-decoration: none;
+ background-color: #d5eaed;
+ background-color: rgba(213, 234, 237, 0.33);
+}
+
+.apex-tabs li.selected a:hover {
+ background-color: transparent;
}
.apex-menu {
@@ -261,6 +280,10 @@
background-image: url(images/icons/toc-hover.png);
}
+#content #toc {
+ font-size: 1.3em;
+}
+
#content #toc ul {
margin: -2px;
padding: 0.25em 0;
@@ -290,6 +313,7 @@
#toc li a {
padding: 0.25em 1.5em;
display: block;
+ white-space: nowrap;
}
#toc li li a {
@@ -421,15 +445,12 @@
opacity: 1;
}
-#ca-watch,
-#ca-unwatch {
- padding-left: 0.25em;
- padding-right: 0.25em;
-}
#ca-watch a,
#ca-unwatch a {
display: inline-block;
+ padding-right: 0;
padding-left: 26px;
+ padding-right: 0;
width: 0;
overflow: hidden;
background-image: url(images/icons/watch.png);
@@ -444,10 +465,12 @@
}
#ca-unwatch a:hover,
#ca-unwatch a:focus {
+ background-color: transparent;
background-position: -67px 50%;
}
#ca-watch a:hover,
#ca-watch a:focus {
+ background-color: transparent;
background-position: -19px 50%;
}
#ca-unwatch .loading,
@@ -506,7 +529,7 @@
margin: 0;
padding: 1em 2em;
right: 3em;
- top: 8.5em;
+ top: 1.5em;
width: 20em;
z-index: 10000;
border: solid 1px #d5eaed;
@@ -531,6 +554,12 @@
}
/* Animation for media-query changes */
+div#mw-js-message {
+ transition: right 250ms;
+ -moz-transition: right 250ms;
+ -webkit-transition: right 250ms;
+ -o-transition: right 250ms;
+}
#searchInput {
transition: width 250ms;
--
To view, visit https://gerrit.wikimedia.org/r/176524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iadc37c179974593bae6c6fe3790a029bfb275c85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Trevor Parscal <tpars...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
