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

unifies styles and html code

Browse Source
This commit is contained in:
decabeza
2017-05-24 13:03:25 +02:00
parent d28c45a926
commit 28e17b870c
8 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/legislation.scss
View File

@@ -58,7 +58,7 @@
// 03. Legislation cards // 03. Legislation cards
// ----------------- // -----------------
.legislation { .legislation {
margin: 0 0 5rem 0; margin: 0 0 $line-height 0;
background: white; background: white;
border: 1px solid; border: 1px solid;
border-color: #e5e6e9 #dfe0e4 #d0d1d5; border-color: #e5e6e9 #dfe0e4 #d0d1d5;

22
app/views/admin/legislation/draft_versions/_form.html.erb
View File

@@ -1,19 +1,17 @@
<%= form_for [:admin, @process, @draft_version], url: url, html: {data: {watch_changes: true}} do |f| %> <%= form_for [:admin, @process, @draft_version], url: url, html: {data: {watch_changes: true}} do |f| %>
<% if @draft_version.errors.any? %> <% if @draft_version.errors.any? %>
<div id="error_explanation" data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<div id="error_explanation" data-alert class="callout alert" data-closable> <strong>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> <%= @draft_version.errors.count %>
<span aria-hidden="true">&times;</span> <%= t("admin.legislation.draft_versions.errors.form.error", count: @draft_version.errors.count) %>
</button> </strong>
</div>
<strong> <% end %>
<%= @draft_version.errors.count %>
<%= t("admin.legislation.draft_versions.errors.form.error", count: @draft_version.errors.count) %>
</strong>
</div>
<% end %>
<div class="row"> <div class="row">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">

2
app/views/admin/legislation/draft_versions/new.html.erb
View File

@@ -2,7 +2,7 @@
Admin - <%= t("admin.menu.legislation") %> - <%= @process.title %> - <%= t("admin.legislation.draft_versions.index.title") %> - <%= t("admin.legislation.draft_versions.new.title") %> Admin - <%= t("admin.menu.legislation") %> - <%= @process.title %> - <%= t("admin.legislation.draft_versions.index.title") %> - <%= t("admin.legislation.draft_versions.new.title") %>
<% end %> <% end %>
<div class="legislation-admin legislation-draft-versions-new legislation-draft-versions-form row"> <div class="legislation-admin legislation-draft-versions-new legislation-draft-versions-form row">
<div class="small-12 column"> <div class="small-12 column">
<%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %> <%= link_to admin_legislation_process_draft_versions_path(@process), class: "back" do %>
<span class="icon-angle-left"></span> <span class="icon-angle-left"></span>

24
app/views/admin/legislation/questions/_form.html.erb
View File

@@ -1,20 +1,17 @@
<%= form_for [:admin, @process, @question], url: url, html: {data: {watch_changes: true}} do |f| %> <%= form_for [:admin, @process, @question], url: url, html: {data: {watch_changes: true}} do |f| %>
<% if @question.errors.any? %> <% if @question.errors.any? %>
<div id="error_explanation" data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>
</button>
<div id="error_explanation" data-alert class="callout alert" data-closable> <strong>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close> <%= @question.errors.count %>
<span aria-hidden="true">&times;</span> <%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
</button> </strong>
</div>
<strong> <% end %>
<%= @question.errors.count %>
<%= t("admin.legislation.questions.errors.form.error", count: @question.errors.count) %>
</strong>
</div>
<% end %>
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<%= f.label :title %> <%= f.label :title %>
@@ -35,7 +32,6 @@
<%= link_to_add_association t('.add_option'), f, :question_options %> <%= link_to_add_association t('.add_option'), f, :question_options %>
</div> </div>
<div class="row"> <div class="row">
<div class="actions small-12 medium-3 column legislation-process-save"> <div class="actions small-12 medium-3 column legislation-process-save">
<%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %> <%= f.submit(class: "button expanded", value: t("admin.legislation.questions.#{admin_submit_action(@question)}.submit_button")) %>

1
app/views/legislation/annotations/_form.html.erb
View File

@@ -34,4 +34,3 @@
</div> </div>
</div> </div>
</div> </div>

1
app/views/legislation/annotations/new.js.erb
View File

@@ -1,2 +1 @@
$("#comments-box").html("<%= j render('form') %>"); $("#comments-box").html("<%= j render('form') %>");

1
app/views/legislation/annotations/show.html.erb
View File

@@ -44,3 +44,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

1
app/views/legislation/draft_versions/show.html.erb
View File

@@ -76,5 +76,4 @@
</div> </div>
</div> </div>
</div> </div>