Njw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/62648
Change subject: Make width flexible above 960px
......................................................................
Make width flexible above 960px
Width of content was previously fixed at 960px. 960px is now the
minimum width, but if there is space the content will expand to
fill 90% of the browser window.
Note that the entry-meta position has also changed to be properly
floated, as this is easier to manage and fits in better.
Change-Id: I1b9d01a832d5191768edc1764cded4a4b57fe2b5
---
M Erudite.skin.php
M assets/erudite.css
M assets/wiki-style.css
3 files changed, 19 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite
refs/changes/48/62648/1
diff --git a/Erudite.skin.php b/Erudite.skin.php
index 15b6145..3befc41 100755
--- a/Erudite.skin.php
+++ b/Erudite.skin.php
@@ -113,15 +113,6 @@
<?php if ($this->data['subtitle']) { ?>
<span class="entry-sub-title"><?php
$this->html('subtitle') ?></span><br/><br/>
<?php } ?>
- <div id="bodyContent" class="entry-content">
-
- <!-- INSERT WIKI STUFF HERE -->
- <?php $this->html('bodytext') ?>
- <?php $this->html('dataAfterContent'); ?>
-
-
- <br/><br/>
- </div>
<!-- META -->
<div class="entry-meta">
<?php
@@ -132,6 +123,13 @@
?>
</div>
<!-- END META -->
+ <div id="bodyContent" class="entry-content">
+
+ <!-- INSERT WIKI STUFF HERE -->
+ <?php $this->html('bodytext') ?>
+ <?php $this->html('dataAfterContent'); ?>
+
+ </div>
</div><!-- .post -->
<div id="nav-below" class="navigation">
diff --git a/assets/erudite.css b/assets/erudite.css
index 3a70a0d..31f99a3 100755
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -19,8 +19,8 @@
body.baseline {background-image:url(images/body-bg.png);
background-repeat:repeat; background-position:left 20px;}
/* Layout. Based on the idea of 960.gs. Sorta. Loosely. */
-#container, #header, #footer-wrap-inner {width:96em; margin:0 auto;
position:relative;}
-#content {width:54em; padding-left:6em; padding-top:2.4em; overflow:hidden;}
+#container, #header, #footer-wrap-inner {min-width:96em; width:90%; margin:0
auto; position:relative;}
+#content {padding:2.4em 6em 0em 6em;}
body.single #content, body.page #content {overflow:visible;}
.sidebar {width:24em; clear:both;}
#footer {clear:both;}
@@ -55,7 +55,7 @@
/* Menu */
.skip-link {display:none;}
-#access {width:96em; margin:0 auto;}
+#access {min-width:96em; width:90%; margin:0 auto;}
#menu {margin:2.4em 0 -1em; overflow:hidden; padding:1.2em 6em; border-top:1px
solid #666; background:#333; background:rgba(50,50,50,.7);}
#menu a {color:#fff;}
#menu li {display:block; float:left; margin-right:2em; font-size:1.6em;}
@@ -74,10 +74,10 @@
#menu-toggle div:hover {background:#666;}
/* Navigation */
-#nav-below {clear:both; width:54em; height:2.7em; position:absolute; left:6em;
bottom:0.1em; z-index:5;}
+#nav-below {clear:both; z-index:5;}
.hiding #nav-below {bottom:-3.5em;}
.paged #nav-below {}
-#nav-below div {background:#666; height:100%; max-width:49.9%;
overflow:hidden;}
+#nav-below div {background:#666; height:100%; overflow:hidden;}
.nav-previous {float:left;}
.nav-next {float:right;}
#nav-below a {color:#fff; padding:0 1em; line-height:2; height:100%;
font-size:1.2em; display:block;}
@@ -91,7 +91,7 @@
/* Footer */
#footer-wrap {background:#333; clear:both; color:#fff; padding:2.4em 0;}
.js .hiding #footer-wrap {display:none;}
-.footer {width:24em; float:left; margin-left:6em;}
+.footer {min-width:24em; width:25%; float:left; margin-left:5%;}
.footer h3, .footer h2 {border-bottom:1px solid #666; font-size:2.1em;
line-height:1.143; margin:1.143em 0 .19em;}
.footer ul li {margin:0 0 3.6em;}
.footer ul li li, .footer ul div {font-size:1.4em; margin:0;}
@@ -190,7 +190,7 @@
.home-post hr, .home-post .hr {display:none;}
/* entry meta */
-.entry-meta {position:absolute; top:5.1em; padding-left:2em; width:22em;
right:-36em; border-left:1px solid #aaa;}
+.entry-meta {float:right; padding-left:15px; margin-bottom:10px;
margin-left:15px; border-left:1px solid #aaa;}
.entry-meta span {display:block; font-size:1.1em; line-height:1.455;
padding:.364em 0;}
.entry-meta a {font-style:italic;}
.entry-meta .meta-sep {display:none;}
diff --git a/assets/wiki-style.css b/assets/wiki-style.css
index 9f8ff90..9ad04ba 100755
--- a/assets/wiki-style.css
+++ b/assets/wiki-style.css
@@ -101,16 +101,6 @@
margin-left: 10pt;
}
-#content {
- width: 70em;
- padding-left: 6em;
- padding-top: 2.4em;
- padding-bottom: 0px;
- margin-bottom: 0px;
- overflow: visible;
- clear: both;
-}
-
div.entry-content li {
margin-left: 30px;
}
@@ -272,18 +262,6 @@
}
/* Category Links */
-#nav-below {
- width: 80em;
- height: auto;
- position: relative;
- bottom: 0em;
- left: 0em;
-}
-
-#nav-below div {
- max-width: 80em;
-}
-
#mw-normal-catlinks > a {
padding-left: 0.5em;
}
@@ -306,7 +284,8 @@
margin: 0 auto;
margin-top: -20px;
position: relative;
- width: 960px;
+ min-width: 96em;
+ width: 90%;
color: #fff;
background-color: #666666;
font-size: 13pt;
@@ -351,7 +330,7 @@
div.system-sidebar-body {
padding: 6px;
- text-indent: 0pt;Ê
+ text-indent: 0pt;
word-spacing: 0pt;
font-size: 10pt;
}
@@ -493,8 +472,6 @@
float: right;
}
-/* make meta area narrower */
-.entry-meta {
- right: -20em;
- width: 10em;
+div#bodyContent {
+ padding-bottom: 20px;
}
--
To view, visit https://gerrit.wikimedia.org/r/62648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b9d01a832d5191768edc1764cded4a4b57fe2b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Njw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
