consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2776 from consul/ui-custom

Browse Source 
UI custom
This commit is contained in:
Alberto
2018-07-23 11:39:19 +02:00
committed by GitHub
parent 81b102f002 b5caefc0d4
commit c63fd5ada1
7 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/logo_header.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

23
app/assets/stylesheets/layout.scss
View File

@@ -34,6 +34,12 @@
background-color: $brand;
}
html,
body {
height: 100%;
margin: 0;
}
body {
font-size: $base-font-size;
}
@@ -542,6 +548,20 @@ header {
}
}
}
.top-bar-title {
line-height: $line-height;
a img {
height: rem-calc(48);
margin: 0;
width: auto;
@include breakpoint(medium up) {
height: auto;
}
}
}
}
.menu-icon {
@@ -780,8 +800,7 @@ footer {
}
.footer {
background: $border;
border-top: 6px solid $brand;
background: #f1f1f1;
margin-top: $line-height * 2;
padding-top: $line-height;
}

67
app/views/layouts/_header.html.erb
View File

@@ -10,60 +10,41 @@
</div>
<div class="row">
<div class="title-bar" data-responsive-toggle="responsive_menu" data-hide-for="medium">
<button class="menu-icon" type="button" data-toggle="responsive_menu"></button>
<div class="title-bar-title"><%= t("application.menu")%></div>
</div>
<div class="top-bar">
<ul class="menu show-for-small-only">
<li class="menu-text">
<%= link_to root_path, accesskey: "0" do %>
<%= image_tag(image_path_for("logo_header.png"),
class: "float-left",
size: "48x48",
alt: t("layouts.header.logo")) %>
<%= setting["org_name"] %>
<% end %>
</li>
</ul>
</div>
<div class="top-bar" id="responsive_menu">
<div class="top-bar-left">
<ul class="menu">
<li class="menu-text">
<%= link_to root_path, class: "hide-for-small-only", accesskey: "0" do %>
<%= image_tag(image_path_for("logo_header.png"),
class: "hide-for-small-only float-left",
size: "80x80",
alt: t("layouts.header.logo")) %>
<%= setting["org_name"] %>
<% end %>
</li>
</ul>
<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 class="top-bar-title">
<%= link_to root_path, accesskey: "0" do %>
<%= image_tag(image_path_for('logo_header.png'), class: 'float-left', alt: t("layouts.header.logo")) %>
<% end %>
</div>
<div class="top-bar-right">
<ul class="dropdown menu" data-dropdown-menu>
<%= render "shared/admin_login_items" %>
<%= render "layouts/notification_item" %>
<%= render "devise/menu/login_items" %>
</ul>
</div>
<div id="responsive-menu">
<div class="top-bar-right">
<ul class="menu" data-responsive-menu="medium-dropdown">
<%= render "shared/admin_login_items" %>
<%= render "layouts/notification_item" %>
<%= render "devise/menu/login_items" %>
</ul>
<div class="show-for-small-only">
<div class="subnavigation row">
<%= render "shared/subnavigation" %>
<div class="small-12 column">
<%= render "shared/top_links" %>
<div class="show-for-small-only">
<div class="subnavigation row">
<%= render "shared/subnavigation" %>
<div class="small-12 column">
<%= render "shared/top_links" %>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="subnavigation expanded">
<div id="navigation_bar" class="subnavigation expanded">
<div class="row">
<div class="hide-for-small-only">
<%= render "shared/subnavigation" %>

10
config/locales/en/seeds.yml
View File

@@ -1,11 +1,11 @@
en:
seeds:
settings:
official_level_1_name: Public workers
official_level_2_name: Municipal Organization
official_level_3_name: General Directors
official_level_4_name: Councillors
official_level_5_name: Mayor
official_level_1_name: Official position 1
official_level_2_name: Official position 2
official_level_3_name: Official position 3
official_level_4_name: Official position 4
official_level_5_name: Official position 5
geozones:
north_district: North District
west_district: West District

4
config/locales/es/budgets.yml
View File

@@ -126,10 +126,10 @@ es:
milestone_publication_date: "Publicado el %{publication_date}"
milestone_status_changed: El proyecto ha cambiado al estado
author: Autor
project_unfeasible_html: 'Este proyecto de inversión <strong>ha sido marcado como inviable</strong> y no pasará a la fase de votación.'
project_unfeasible_html: 'Este proyecto de gasto <strong>ha sido marcado como inviable</strong> y no pasará a la fase de votación.'
project_selected_html: 'Este proyecto de gasto <strong>ha sido seleccionado</strong> para la fase de votación.'
project_winner: 'Proyecto de gasto ganador'
project_not_selected_html: 'Este proyecto de inversión <strong>no ha sido seleccionado</strong> para la fase de votación.'
project_not_selected_html: 'Este proyecto de gasto <strong>no ha sido seleccionado</strong> para la fase de votación.'
wrong_price_format: Solo puede incluir caracteres numéricos
investment:
add: Votar

10
config/locales/es/seeds.yml
View File

@@ -1,11 +1,11 @@
es:
seeds:
settings:
official_level_1_name: Empleados públicos
official_level_2_name: Organización Municipal
official_level_3_name: Directores generales
official_level_4_name: Concejales
official_level_5_name: Alcaldesa
official_level_1_name: Cargo oficial 1
official_level_2_name: Cargo oficial 2
official_level_3_name: Cargo oficial 3
official_level_4_name: Cargo oficial 4
official_level_5_name: Cargo oficial 5
geozones:
north_district: Distrito Norte
west_district: Distrito Oeste

12
db/seeds.rb
View File

@@ -7,11 +7,11 @@ end
# Names for the moderation console, as a hint for moderators
# to know better how to assign users with official positions
Setting["official_level_1_name"] = "Empleados públicos"
Setting["official_level_2_name"] = "Organización Municipal"
Setting["official_level_3_name"] = "Directores generales"
Setting["official_level_4_name"] = "Concejales"
Setting["official_level_5_name"] = "Alcaldesa"
Setting["official_level_1_name"] = "Cargo oficial 1"
Setting["official_level_2_name"] = "Cargo oficial 2"
Setting["official_level_3_name"] = "Cargo oficial 3"
Setting["official_level_4_name"] = "Cargo oficial 4"
Setting["official_level_5_name"] = "Cargo oficial 5"
# Max percentage of allowed anonymous votes on a debate
Setting["max_ratio_anon_votes_on_debates"] = 50
@@ -26,7 +26,7 @@ Setting["max_votes_for_proposal_edit"] = 1000
Setting['comments_body_max_length'] = 1000
# Prefix for the Proposal codes
Setting["proposal_code_prefix"] = 'MAD'
Setting["proposal_code_prefix"] = 'CONSUL'
# Number of votes needed for proposal success
Setting["votes_for_proposal_success"] = 53726