Merge pull request #14 from Metatavu/minor-visual-changes

Minor layout updates

app/assets/stylesheets/decidim.scss

@@ -64,11 +64,14 @@ $primary-rgb: 82,172,170;
             height: 500px;
         }
     }
+    .logo-bar {
+    background-color: $primary;
+    }
     @media screen and (max-width: 39.9375em){
         .logo-bar {
             border-top: 0px;
             position: absolute;
-            top: 34px;
+            top: 50px;
         }
     }
     .logobar {
@@ -104,12 +107,37 @@ $primary-rgb: 82,172,170;
 
     .hero-picture {
         background-position: top center;
-        background-size: contain;
+        background-size: cover;
         background-repeat: no-repeat;
         height: 500px;
         background-color: #007a86;
     }
-
+    @media screen and (max-width: 39.9375em){
+        .hero-picture {
+            height: 250px;
+        }
+    }
+    @media screen and (min-width: 39.9375em){
+        .hero-picture {
+            height: 350px;
+        }
+    }
+    @media screen and (min-width: 1053px){
+        .hero-picture {
+            height: 500px;
+        }
+    }
+    @media screen and (min-width: 1450px){
+        .hero-picture {
+            background-size: contain;
+        }
+    }
+    .custom-content-banner {
+        padding: 25px;
+        background-position: top center;
+        background-size: cover;
+        background-repeat: no-repeat;
+    }
 }
 
 

app/cells/decidim/content_blocks/highlighted_content_banner/show.erb

@@ -0,0 +1,29 @@
+<section class="extended">
+  <div class="row">
+    <div class="columns custom-content-banner"
+            style="background-image:url(<%= current_organization.highlighted_content_banner_image.url %>);">
+        <div class="row">
+          <div class="columns large-10">
+            <div class="highligted-content-banner__container">
+
+              <h1 class="text-highlight heading1 highligted-content-banner-heading">
+                <%= translated_attribute current_organization.highlighted_content_banner_title %>
+              </h1>
+              <span class="text-highlight">
+                <%= decidim_sanitize translated_attribute current_organization.highlighted_content_banner_short_description %>
+              </span>
+            </div>
+          </div>
+          <div class="columns large-2">
+            <%= link_to current_organization.highlighted_content_banner_action_url,
+                        class: "button expanded button--sc" do %>
+            <%= translated_attribute current_organization.highlighted_content_banner_action_title %>
+            <span class="button__info">
+              <%= translated_attribute current_organization.highlighted_content_banner_action_subtitle %>
+            </span>
+            <% end %>
+          </div>
+        </div>
+    </div>
+  </div>
+</section>  

app/views/layouts/decidim/_wrapper.html.erb

@@ -95,7 +95,7 @@ end
             <%= render partial: "layouts/decidim/admin_links" %>
           </div>
         </div>
-        <div class="title-bar logo-bar">
+        <div class="logo-bar">
           <div class="row column logobar">
             <div class="logo-wrapper">
               <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>

config/database.yml

@@ -24,12 +24,12 @@ default: &default
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   host: <%= ENV.fetch("DATABASE_HOST") { "localhost" } %>
   port: <%= ENV.fetch("DATABASE_PORT") { "5432" } %>
-  username: <%= ENV.fetch("DATABASE_USERNAME") { "decidimuser" } %>
-  password: <%= ENV.fetch("DATABASE_PASSWORD") { "thepassword" } %>
+  username: <%= ENV.fetch("DATABASE_USERNAME") { "testuser" } %>
+  password: <%= ENV.fetch("DATABASE_PASSWORD") { "password" } %>
 
 development:
   <<: *default
-  database: decidimmikkeli_development
+  database: decidim
 
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.