From f8ca87568f2040cd81c16e5db70bfd8cd6cbb247 Mon Sep 17 00:00:00 2001
From: utvk <utvk@users.noreply.github.com>
Date: Sat, 26 Dec 2015 23:36:49 +0100
Subject: Adjustments after update to responsive theme

---
 assets/images/homepage-background-small.jpg | Bin 24469 -> 33702 bytes
 assets/images/homepage-background.jpg       | Bin 64195 -> 33702 bytes
 assets/stylesheets/responsive/custom.scss   |  47 ++++++++++++++++++++++++++--
 lib/views/general/_before_body_end.html.erb |  13 ++++----
 lib/views/general/_before_head_end.html.erb |   2 +-
 lib/views/general/_orglink.html.erb         |   3 +-
 6 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/assets/images/homepage-background-small.jpg b/assets/images/homepage-background-small.jpg
index c503d25..8b1d392 100644
Binary files a/assets/images/homepage-background-small.jpg and b/assets/images/homepage-background-small.jpg differ
diff --git a/assets/images/homepage-background.jpg b/assets/images/homepage-background.jpg
index 426485d..8b1d392 100644
Binary files a/assets/images/homepage-background.jpg and b/assets/images/homepage-background.jpg differ
diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss
index 12bf0b7..e187210 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/assets/stylesheets/responsive/custom.scss
@@ -9,9 +9,12 @@ $color_violet: #a94ca6;
 $color_purple: #5c377f;
 $color_white: #ffffff;
 
-$color_neutral_light: $color_sand;
+$color_banner_bg: #487890;
+$color_page_bg: #F8F8F8;
+
+$color_neutral_light: $color_page_bg;
 $color_neutral_dark: $color_black;
-$color_primary: $color_violet;
+$color_primary: $color_banner_bg;
 $color_secondary: $color_orange;
 
 $body-bg: $color_neutral_light;
@@ -20,6 +23,7 @@ $body-font-color: $color_neutral_dark;
 $link-color: darken($color_blue, 20%);
 $action-color: $color_green;
 $font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
+//$font-family: "Arial", sans-serif;
 $form_input-bg: $color_white;
 
 $button-bg: $action-color;
@@ -346,6 +350,7 @@ a.link_button_green_large {
   @include respond-min($main_menu-mobile_menu_cutoff) {
     background-color: transparent;
   }
+  left: 344px;
 }
 
 /* Dropdown list for switching locale */
@@ -884,3 +889,41 @@ dt {
     color: $color_white;
   }
 }
+
+/* Reset the logo, as we dont like image logos */
+.site-title__logo {
+  background-image: unset;
+  overflow-hidden: unset;
+  margin: unset;
+  padding-top: 10px;
+  margin-right: 40px;
+  width: unset;
+  text-indent: unset;
+  background-size: unset;
+  
+  font-size: 2em;
+  font-weight: 400;
+  color: #fff!important;
+  height: 50px;
+}
+
+h1 {
+  font-size: 2.2em;
+}
+
+h2 {
+  font-size: 1.8em;
+}
+
+.request_listing .head, .body_listing .head, .user_listing .head {
+  font-size: 1.5em;
+}
+
+.homepage-hero {
+  background-repeat: repeat;
+}
+
+.footer {
+  padding: 5em 0 8em;
+  background-image: url(/assets/homepage-background.jpg);  
+}
\ No newline at end of file
diff --git a/lib/views/general/_before_body_end.html.erb b/lib/views/general/_before_body_end.html.erb
index 355c0b7..12b0a0f 100644
--- a/lib/views/general/_before_body_end.html.erb
+++ b/lib/views/general/_before_body_end.html.erb
@@ -1,12 +1,13 @@
 <script>
   jQuery('#user_locale_switcher').find('.locale-list-trigger').each(function() {
-    jQuery(this).click(function(){
+  jQuery(this).click(function(){
+      console.log('yoyo');
       jQuery(this).parent().toggleClass('active');
     });
   });
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
+
+  // Should only add in production
+/* var _paq = _paq || [];
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
@@ -15,7 +16,7 @@
     _paq.push(['setSiteId', 1]);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
+  })();*/
 </script>
-<noscript><p><img src="//piwik.nuug.no/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+<!--<noscript><p><img src="//piwik.nuug.no/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> -->
 <!-- End Piwik Code -->
diff --git a/lib/views/general/_before_head_end.html.erb b/lib/views/general/_before_head_end.html.erb
index 7f33fa9..39380d1 100644
--- a/lib/views/general/_before_head_end.html.erb
+++ b/lib/views/general/_before_head_end.html.erb
@@ -1 +1 @@
-<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+<!--<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700&subset=latin,latin-ext' rel='stylesheet' type='text/css'> -->
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
index b22d123..66002c0 100644
--- a/lib/views/general/_orglink.html.erb
+++ b/lib/views/general/_orglink.html.erb
@@ -1 +1,2 @@
-<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %>
+<%# Put the link to your organisation here, or leave blank %>
+<%= link_to image_tag('logo.png'), frontpage_path, :id=>'logo' %>
-- 
cgit v1.2.3