Skip to content

Commit

Permalink
Style improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
rowanhogan committed Sep 8, 2016
1 parent fb7fac4 commit 92853f4
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 32 deletions.
16 changes: 9 additions & 7 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
</head>
<body>
<header id="page-header" class="page-header">
<a id="home-link" class="home-link" href="/?Main_Page">Main page</a>
<button id="toc-toggle" class="toc-toggle">Table of contents</button>
<div class="page-header-container">
<a id="home-link" class="home-link" href="/?Main_Page">Main page</a>
<button id="toc-toggle" class="toc-toggle">Table of contents</button>

<form class="search-form" type="POST">
<input type='search' placeholder="Search...">
<button type="submit">Search</button>
</form>
<form class="search-form" type="POST">
<input type='search' placeholder="Search...">
<button type="submit">Search</button>
</form>

<button id="menu-toggle" class="menu-toggle">Menu</button>
<button id="menu-toggle" class="menu-toggle">Menu</button>
</div>
</header>

<div id="menu">
Expand Down
8 changes: 7 additions & 1 deletion app/styles/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ body {
left: 0;
right: 0;
padding: 0;
padding: 0 $header-height;
z-index: 100;
background: white;
border-bottom: thin solid #ddd;
Expand All @@ -20,6 +19,13 @@ body {
transform: translateY(-100%);
}

.page-header-container {
position: relative;
max-width: 1000px;
margin: auto;
padding: 0 $header-height;
}

button, a {
width: $header-height;
height: $header-height;
Expand Down
6 changes: 5 additions & 1 deletion app/styles/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,15 @@ div.columns dd dd {
}

.navbox {
border: 1px solid #aaa;
border: 0;
width: 100%;
max-width: 100%;
margin: auto;
clear: both;
font-size: 88%;
text-align: center;
padding: 1px;
overflow: auto;
}

.navbox-inner,
Expand Down Expand Up @@ -1881,6 +1883,8 @@ a.external {
background-repeat: no-repeat;
background-position: center right;
padding-right: 13px;
word-break: break-word;
word-wrap: break-word;
}

.content .return-link,
Expand Down
44 changes: 21 additions & 23 deletions app/styles/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,22 @@
max-width: 100%;
}

.tfa-recent {
margin-top: 30px;
}

.potd-recent, .tfa-recent {
text-align: center !important;

ul {
display: block;
}
}

#content {
font-size: 1em;
max-width: 800px;
margin: auto;

.mw-headline {
margin: 0;
Expand Down Expand Up @@ -158,7 +172,7 @@
}

#mp-itn, #mp-otd, #mp-dyk {
padding: 2em $padding;
padding: 2em;

// @media (min-width: 900px) {
// float: left;
Expand Down Expand Up @@ -206,7 +220,7 @@
#mp-itn,
#mp-otd {
box-sizing: border-box;
width: 50vw;
width: 50%;

ul {
max-width: 50vw;
Expand All @@ -227,7 +241,7 @@
display: none;
}


#mp-itn .itn-img, #mp-dyk .dyk-img,
#mp-itn-img, #mp-otd-img, #mp-dyk-img, #mp-tfl-img {
float: none !important;
margin: auto !important;
Expand Down Expand Up @@ -263,17 +277,11 @@
// }
// }

#mp-right {
border-bottom: thin solid #ddd !important;
}

#mp-dyk, #mp-itn {
border-right: thin solid #ddd;
}

#mp-otd > p {
margin-top: 0;
line-height: 1.5em;
text-align: center;
}


Expand Down Expand Up @@ -311,19 +319,9 @@
clear: both;
}

#content #mp-tfp-h2 {
position: absolute;
left: 0;
right: 0;
color: white !important;
text-align: left;
text-shadow: 0 1px 30px rgba(black, .5);

.mw-headline {
font-size: 16px;
padding: 2em;
text-align: center;
}
#content #mp-tfp-h2 .mw-headline {
padding: 2em 0;
text-align: center;
}

#mp-bottom {
Expand Down

0 comments on commit 92853f4

Please sign in to comment.