MSyed has submitted this change and it was merged.
Change subject: Add style
......................................................................
Add style
Change-Id: I0c521035ecf207b3a0ca0d0195535640cddbea57
---
A source/images/logo.png
M source/index.html.erb
M source/layouts/layout.erb
M source/privacy.html.erb
D source/stylesheets/master.css
A source/stylesheets/master.css.scss
6 files changed, 159 insertions(+), 30 deletions(-)
Approvals:
MSyed: Verified; Looks good to me, approved
diff --git a/source/images/logo.png b/source/images/logo.png
new file mode 100644
index 0000000..0d3e914
--- /dev/null
+++ b/source/images/logo.png
Binary files differ
diff --git a/source/index.html.erb b/source/index.html.erb
index 80e8c7c..afb54de 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -1,5 +1,11 @@
<div class="jumbotron">
- <h1>Wikimedia<br>Transparency<br>Report</h1>
+ <h1>
+ Wikimedia
+ <span class="blue">
+ <br>Transparency
+ <br>Report
+ </span>
+ </h1>
</div>
<div class="col-md-12">
@@ -9,30 +15,36 @@
</div>
<div class="col-md-4">
- <h3><small>Story</small><br>Hallogallo</h3>
- <small>July 2013</small>
- <hr/>
- <p>
- Maecenas vitae nibh leo. Vivamus laoreet a purus vulputate
ultricies. Suspendisse est sem, congue in leo eget, feugiat tincidunt felis.
Maecenas congue fringilla nulla id aliquet. Sed eu erat quis orci blandit
auctor ac sed arcu. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Donec est mauris, consequat sit amet convallis eget, varius vitae quam. Nullam
venenatis, risus a dignissim placerat, tortor justo cursus lectus, sed
facilisis est massa sed quam. Nam pretium, eros ac laoreet pretium, nisl felis
tincidunt ligula, sit amet aliquet erat enim adipiscing dolor. Curabitur a
purus nec libero vehicula dignissim in eu elit.
- </p>
+ <div class="story">
+ <h3><small>Story</small><br>Hallogallo</h3>
+ <small>July 2013</small>
+ <hr/>
+ <p>
+ Maecenas vitae nibh leo. Vivamus laoreet a purus
vulputate ultricies. Suspendisse est sem, congue in leo eget, feugiat tincidunt
felis. Maecenas congue fringilla nulla id aliquet. Sed eu erat quis orci
blandit auctor ac sed arcu. Lorem ipsum dolor sit amet, consectetur adipiscing
elit. Donec est mauris, consequat sit amet convallis eget, varius vitae quam.
Nullam venenatis, risus a dignissim placerat, tortor justo cursus lectus, sed
facilisis est massa sed quam. Nam pretium, eros ac laoreet pretium, nisl felis
tincidunt ligula, sit amet aliquet erat enim adipiscing dolor. Curabitur a
purus nec libero vehicula dignissim in eu elit.
+ </p>
+ </div>
</div>
<div class="col-md-4">
- <h3><small>Story</small><br>Sonderangebot</h3>
- <small>July 2013</small>
- <hr/>
- <p>
+ <div class="story">
+ <h3><small>Story</small><br>Sonderangebot</h3>
+ <small>July 2013</small>
+ <hr/>
+ <p>
Maecenas vitae nibh leo. Vivamus laoreet a purus vulputate
ultricies. Suspendisse est sem, congue in leo eget, feugiat tincidunt felis.
Maecenas congue fringilla nulla id aliquet. Sed eu erat quis orci blandit
auctor ac sed arcu. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Donec est mauris, consequat sit amet convallis eget, varius vitae quam. Nullam
venenatis, risus a dignissim placerat, tortor justo cursus lectus, sed
facilisis est massa sed quam. Nam pretium, eros ac laoreet pretium, nisl felis
tincidunt ligula, sit amet aliquet erat enim adipiscing dolor. Curabitur a
purus nec libero vehicula dignissim in eu elit.
- </p>
+ </p>
+ </div>
</div>
<div class="col-md-4">
- <h3><small>Story</small><br>Weissensee</h3>
- <small>July 2013</small>
- <hr/>
- <p>
+ <div class="story">
+ <h3><small>Story</small><br>Weissensee</h3>
+ <small>July 2013</small>
+ <hr/>
+ <p>
Maecenas vitae nibh leo. Vivamus laoreet a purus vulputate
ultricies. Suspendisse est sem, congue in leo eget, feugiat tincidunt felis.
Maecenas congue fringilla nulla id aliquet. Sed eu erat quis orci blandit
auctor ac sed arcu. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Donec est mauris, consequat sit amet convallis eget, varius vitae quam. Nullam
venenatis, risus a dignissim placerat, tortor justo cursus lectus, sed
facilisis est massa sed quam. Nam pretium, eros ac laoreet pretium, nisl felis
tincidunt ligula, sit amet aliquet erat enim adipiscing dolor. Curabitur a
purus nec libero vehicula dignissim in eu elit.
- </p>
+ </p>
+ </div>
</div>
<div class="clear"> </div>
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 82636ef..04c2b76 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -21,7 +21,10 @@
<span
class="icon-bar"></span>
<span
class="icon-bar"></span>
</button>
- <a class="navbar-brand"
href="/">Wikimedia Transparency Report</a>
+ <a class="navbar-brand"
href="/">
+ <img
src="/images/logo.png" />
+ Wikimedia Transparency
Report
+ </a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav
navbar-right">
@@ -36,8 +39,12 @@
<%= yield %>
<footer>
- <hr>
- <div class="col-md-5"><a href="/">Wikimedia
Transparency Report</a></div>
+ <div class="col-md-5">
+ <a href="/">
+ <img src="/images/logo.png">
+ Wikimedia Transparency Report
+ </a>
+ </div>
<div class="col-md-2">
<ul>
diff --git a/source/privacy.html.erb b/source/privacy.html.erb
index aa03c2a..26354e1 100644
--- a/source/privacy.html.erb
+++ b/source/privacy.html.erb
@@ -1,12 +1,17 @@
<div class="jumbotron">
<h1>
<small>Privacy</small><br>
- User Information<br>
- Requests
+ <span class="blue">
+ User Information<br>
+ Requests
+ </span>
</h1>
</div>
-<div class="col-md-8">
+<div class="col-md-9">
+ <p class="lead">
+ Sed dapibus diam quam. Phasellus lacus metusvenenatis eu ligula
volutpat, venenatis faucibus ante.
+ </p>
<h2>Quisque in accumsan</h2>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc
massa enim, pharetra a euismod in, aliquam id nisl. Vivamus elementum
ullamcorper odio, sed laoreet risus lacinia sit amet. Sed eget pharetra eros.
Nunc id luctus odio, et cursus justo. Vestibulum eu imperdiet arcu. Integer
semper libero a commodo posuere. Vestibulum ut elit purus. Sed vestibulum arcu
risus, ut aliquet justo aliquam eget. Nam eget enim vehicula, lacinia augue in,
luctus massa. Maecenas id nunc orci. Proin molestie libero erat, eget
consectetur nisi mollis vel. Class aptent taciti sociosqu ad litora torquent
per conubia nostra, per inceptos himenaeos. Fusce pellentesque metus quis
pellentesque gravida. Aliquam scelerisque augue sed lacus sodales, in
vestibulum tortor dictum. Mauris ut mi orci.
@@ -27,9 +32,9 @@
</div>
-<div class="col-md-4">
- <br><br><br>
- <div class="well">
+<div class="col-md-3">
+ <br><br><br><br><br>
+ <div class="story">
<h3><small>Story</small><br>Hallogallo</h3>
<small>July 2013</small>
<hr/>
diff --git a/source/stylesheets/master.css b/source/stylesheets/master.css
deleted file mode 100644
index 6dc83f2..0000000
--- a/source/stylesheets/master.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.clear {
- clear: both;
- margin: 100px 0;
-}
\ No newline at end of file
diff --git a/source/stylesheets/master.css.scss
b/source/stylesheets/master.css.scss
new file mode 100644
index 0000000..237c33e
--- /dev/null
+++ b/source/stylesheets/master.css.scss
@@ -0,0 +1,109 @@
+$blue: #313876;
+$gray: #999;
+$black: #000;
+
+.clear {
+ clear: both;
+}
+
+a {
+ color: $black;
+}
+
+.navbar-default {
+ background: transparent;
+ border: none;
+ border-radius: 0;
+ border-bottom: 1px solid $gray;
+
+ .navbar-nav > li > a {
+ color: $black;
+ border-bottom: 2px solid $blue;
+ margin-left: 10px;
+ font-size: 1.1em;
+ }
+
+ .navbar-brand {
+ color: $black;
+
+ > img {
+ width: 30px;
+ }
+ }
+}
+
+.container .jumbotron {
+ padding-left: 10px;
+ background: transparent;
+ font-family: serif;
+ border-bottom: 1px solid $gray;
+ color: $gray;
+ border-radius: 0;
+
+ h1 {
+ margin: 0;
+ font-size: 60px;
+
+ > small {
+ font: 20px sans-serif;
+ font-weight: 800;
+ text-transform: uppercase;
+ }
+ }
+}
+
+.lead {
+ font: 30px serif;
+}
+
+footer {
+ border-top: 1px solid $gray;
+ padding-top: 20px;
+ padding-bottom: 120px;
+
+ img {
+ width: 30px;
+ margin-right: 5px;
+ }
+
+ ul {
+ list-style: none;
+ padding: 0;
+
+ li {
+ margin-bottom: 10px;
+ }
+ }
+}
+
+.story {
+ border-top: 7px solid #d8d8d8;
+ background: #F0F2F4;
+ padding: 20px;
+
+ hr {
+ border-color: #ddd;
+ margin: 10px -20px;
+ }
+
+ h3 {
+ margin: 0;
+ font-family: serif;
+ color: $blue;
+
+ small {
+ font: 10px sans-serif;
+ text-transform: uppercase;
+ font-weight: 800;
+ color: $gray;
+ }
+ }
+}
+
+h2 {
+ font-family: serif;
+}
+
+.blue {
+ color: $blue;
+}
--
To view, visit https://gerrit.wikimedia.org/r/138320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c521035ecf207b3a0ca0d0195535640cddbea57
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/TransparencyReport
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: MSyed <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
