Merge pull request #1083 from consul/custom-styles

Custom styles

app/assets/stylesheets/application.scss

@@ -7,6 +7,7 @@
 @import "admin";
 @import "layout";
 @import "participation";
+@import "custom";
 @import "c3";
 @import "annotator.min";
 @import "annotator_overrides";

app/assets/stylesheets/custom.scss

@@ -0,0 +1,2 @@
+// Overrides and adds customized styles in this file
+//

app/views/comments/_comment.html.erb

@@ -10,14 +10,14 @@
         <% end %>
       <% else %>
         <% if comment.as_administrator? %>
-          <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar float-left") %>
+          <%= image_tag("avatar_admin.png", size: 32, class: "admin-avatar float-left") %>
         <% elsif comment.as_moderator? %>
-          <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar float-left") %>
+          <%= image_tag("avatar_moderator.png", size: 32, class: "moderator-avatar float-left") %>
         <% else %>
         <% if comment.user.hidden? || comment.user.erased? %>
             <span class="icon-deleted user-deleted"></span>
           <% elsif comment.user.organization? %>
-            <%= image_tag("collective_avatar.png", size: 32, class: "avatar float-left") %>
+            <%= image_tag("avatar_collective.png", size: 32, class: "avatar float-left") %>
           <% else %>
             <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "float-left") %>
           <% end %>

app/views/layouts/_admin_header.html.erb

@@ -18,7 +18,7 @@
       <div id="responsive-menu">
         <div class="top-bar-title">
           <%= link_to root_path, class: "hide-for-small-only" do %>
-            <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+            <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
             <%= Setting['org_name'] %>
             &nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
           <% end %>

app/views/layouts/_header.html.erb

@@ -15,7 +15,7 @@
       <div id="responsive-menu">
         <div class="top-bar-title">
           <%= link_to root_path, class: "hide-for-small-only", accesskey: "/" do %>
-            <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+            <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
             <% if opendata_page? %>
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
               <span class="logo-site"><%= t("layouts.header.open_data") %></span>

app/views/layouts/_test.html.erb

@@ -1,38 +0,0 @@
-<div class="row">
-  <div class="top-bar">
-
-    <%= link_to Setting['org_name'], root_path, class: "logo show-for-small-only" %>
-
-    <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
-      <span class="menu-icon dark" data-toggle></span>
-      <%= t("application.menu")%>
-    </span>
-
-    <div id="responsive-menu">
-      <div class="top-bar-title">
-        <%= link_to root_path, class: "hide-for-small-only" do %>
-          <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
-          <% if opendata_page? %>
-            <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
-            <span class="logo-site"><%= t("layouts.header.open_data") %></span>
-          <% else %>
-             <%= Setting['org_name'] %>
-          <% end %>
-        <% end %>
-      </div>
-
-      <div class="top-bar-right">
-        <ul class="menu">
-          <%= render "shared/admin_login_items" %>
-          <%= render "devise/menu/login_items" %>
-        </ul>
-
-        <div class="show-for-small-only">
-          <div class="subnavigation row">
-            <%= render "shared/subnavigation" %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

app/views/layouts/devise.html.erb

@@ -17,7 +17,7 @@
         <div class="small-12 medium-8 large-5 column small-centered margin-top">
           <h1>
             <%= link_to root_path do %>
-              <%= image_tag('header_logo_madrid.png', class: 'show-for-medium float-left', size: '96x96', alt: t("layouts.header.logo")) %>
+              <%= image_tag('logo_header.png', class: 'show-for-medium float-left', size: '96x96', alt: t("layouts.header.logo")) %>
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
             <% end %>
           </h1>

app/views/layouts/mailer.html.erb

@@ -14,7 +14,7 @@
           <tr>
             <td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
               <a href="#" target="_blank">
-                <%= image_tag('logo_email_gobierno_abierto.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %>
+                <%= image_tag('logo_email.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %>
               </a>
             </td>
           </tr>

app/views/layouts/management.html.erb

@@ -35,7 +35,7 @@
           <div id="responsive-menu">
             <div class="top-bar-title">
               <%= link_to management_root_path, class: "hide-for-small-only" do %>
-                <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+                <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
                 <%= Setting['org_name'] %>
                 &nbsp;|&nbsp;<%= t("management.dashboard.index.title") %>
               <% end %>