aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Whiteland <dave@mysociety.org>2012-05-01 01:34:26 +0100
committerDave Whiteland <dave@mysociety.org>2012-05-01 01:34:26 +0100
commitb008344fc98da5524ebefdcefb62aa1db3a9c9ed (patch)
tree45158161c1e08dca5a81a84d51ec2e49097eca20
parent5570f09cdbfe34aa9e64c307a8ba2d8409ea4150 (diff)
FixMyBarangay presentation changes
-rw-r--r--templates/web/fixmybarangay/footer.html4
-rw-r--r--templates/web/fixmybarangay/index.html6
-rw-r--r--web/cobrands/fixmybarangay/_colours.scss2
-rw-r--r--web/cobrands/fixmybarangay/base.scss24
-rw-r--r--web/cobrands/fixmybarangay/images/ie_front_logo.gifbin0 -> 3473 bytes
-rw-r--r--web/cobrands/fixmybarangay/images/ie_logo.pngbin0 -> 3559 bytes
-rw-r--r--web/cobrands/fixmybarangay/images/sprite.pngbin0 -> 125210 bytes
-rw-r--r--web/cobrands/fixmybarangay/layout.scss1
8 files changed, 28 insertions, 9 deletions
diff --git a/templates/web/fixmybarangay/footer.html b/templates/web/fixmybarangay/footer.html
index b548c02df..658d654c4 100644
--- a/templates/web/fixmybarangay/footer.html
+++ b/templates/web/fixmybarangay/footer.html
@@ -7,8 +7,8 @@
<div id="main-nav" role="navigation">
<ul id="mysoc-menu">
<li><a id="mysoc-logo" href="http://www.mysociety.org/">mySociety</a></li>[%
- %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[%
- %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li>
+ %]<!--<li><a href="http://mysociety.org/donate/">Donate</a></li>[%
+ %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li>-->
</ul>
<ul id="main-menu">
diff --git a/templates/web/fixmybarangay/index.html b/templates/web/fixmybarangay/index.html
index fd240f218..3a215fd0f 100644
--- a/templates/web/fixmybarangay/index.html
+++ b/templates/web/fixmybarangay/index.html
@@ -26,12 +26,12 @@ Modernizr.load({
<div id="front-main">
<div id="front-main-container">
<h1>View local problems</h1>
- <h2>(like potholes or street lighting)</h2>
+ <h2>(potholes or street lighting)</h2>
<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
<p>
- <a href="/around?latitude=10.322;longitude=123.907" class="green-btn" style="color:#fff">Bgy. Luz</a>
- <a href="/around?latitude=10.295;longitude=123.888" class="green-btn" style="color:#fff">Bgy. Basak San Nicolas</a>
+ <a href="/around?latitude=10.322;longitude=123.907" class="yellow-btn">Bgy. Luz</a>
+ <a href="/around?latitude=10.295;longitude=123.888" class="yellow-btn">Bgy. Basak San Nicolas</a>
</p>
</form>
</div>
diff --git a/web/cobrands/fixmybarangay/_colours.scss b/web/cobrands/fixmybarangay/_colours.scss
index 2d188a9c5..b8229dc59 100644
--- a/web/cobrands/fixmybarangay/_colours.scss
+++ b/web/cobrands/fixmybarangay/_colours.scss
@@ -1,6 +1,6 @@
/* COLOURS */
-$primary: #ffffff;
+$primary: #ffff99;
$primary_b: #000000;
$primary_text: #222222;
diff --git a/web/cobrands/fixmybarangay/base.scss b/web/cobrands/fixmybarangay/base.scss
index 2273024e0..4bf65deb1 100644
--- a/web/cobrands/fixmybarangay/base.scss
+++ b/web/cobrands/fixmybarangay/base.scss
@@ -5,8 +5,26 @@
@import "../fixmystreet/_base";
-#site-logo {
- background: none;
- text-indent: 0;
+#site-logo{
+ width: 225px !important;
+ background: url('/cobrands/fixmybarangay/images/sprite.png') -3px -3px no-repeat;
+}
+.ie6 #site-logo {
+ background: url('/cobrands/fixmybarangay/images/ie_logo.gif') 0 -5px no-repeat;
+}
+
+body.frontpage {
+ #site-logo{
+ width: 370px !important;
+ }
+}
+
+.ie6 body.frontpage #site-logo {
+ background:url(/cobrands/fixmybarangay/images/ie_front_logo.gif) 0 0 no-repeat;
}
+.yellow-btn,
+button.yellow-btn,
+input.yellow-btn{
+ @include button-reset(#FFD000, #cc9000, #aa7000, #300, #FFD000, #cc9000, #aa7000, #300);
+} \ No newline at end of file
diff --git a/web/cobrands/fixmybarangay/images/ie_front_logo.gif b/web/cobrands/fixmybarangay/images/ie_front_logo.gif
new file mode 100644
index 000000000..2eeda87ef
--- /dev/null
+++ b/web/cobrands/fixmybarangay/images/ie_front_logo.gif
Binary files differ
diff --git a/web/cobrands/fixmybarangay/images/ie_logo.png b/web/cobrands/fixmybarangay/images/ie_logo.png
new file mode 100644
index 000000000..df73a7785
--- /dev/null
+++ b/web/cobrands/fixmybarangay/images/ie_logo.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/images/sprite.png b/web/cobrands/fixmybarangay/images/sprite.png
new file mode 100644
index 000000000..fad72a23a
--- /dev/null
+++ b/web/cobrands/fixmybarangay/images/sprite.png
Binary files differ
diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss
index 027a5c48b..88ed1027a 100644
--- a/web/cobrands/fixmybarangay/layout.scss
+++ b/web/cobrands/fixmybarangay/layout.scss
@@ -8,6 +8,7 @@ body {
#front-main {
color: $primary_text;
background: $primary;
+
}
.nav-wrapper {