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

Merge pull request #610 from AyuntamientoMadrid/management_ie

Browse Source 
Adds styles for management IE
This commit is contained in:
Raimond Garcia
2015-10-14 18:48:30 +02:00
parent 1af0bbfd6c ba14126505
commit af3446195a
6 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/stylesheets/admin.scss
View File

@@ -27,6 +27,12 @@ body.admin {
.button {
margin-top: 0;
}
input[type="text"] {
height: 36px\9;
line-height: 36px\9;
margin-bottom: 24px\9;
}
}
.dashboard {
@@ -58,6 +64,10 @@ body.admin {
.admin-content {
margin-top: rem-calc(24);
.filters h2 {
margin-top: 0;
}
}
.is-featured {
@@ -79,6 +89,10 @@ body.admin {
margin-left: rem-calc(-20);
}
a {
color: white\9 !important;
}
ul {
list-style-type: none;
margin-left: 0;
@@ -89,6 +103,8 @@ body.admin {
font-size: rem-calc(24);
padding-right: rem-calc(24);
padding-top: rem-calc(4);
padding-left: 12px\9 !important;
padding-right: 12px\9 !important;
}
li {

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

@@ -450,7 +450,7 @@ header {
}
.top-bar {
background: none;
background: #112E51 !important;
color: white;
height: rem-calc(48);
max-width: 1170px !important;

6
app/assets/stylesheets/print.css
View File

@@ -9,11 +9,15 @@ p.proposal-info span:nth-child(3) {
display: none !important;
}
.top-links {
display: none !important;
}
.select-order {
border: 0;
font-size: 24px;
font-weight: bold;
margin-left: -12px;
margin-left: -6px;
}
p.proposal-info {

6
app/views/layouts/management.html.erb
View File

@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title><%= content_for?(:title) ? yield(:title) : "Admin" %></title>
<%= stylesheet_link_tag "application", media: "all" %>
<%= stylesheet_link_tag "print", media: "print" %>
@@ -17,11 +17,11 @@
<body class="admin">
<header class="<%= header_css %>">
<section class="top-links">
<div class="top-links">
<div class="row">
<%= render 'shared/locale_switcher' %>
</div>
</section>
</div>
<div class="contain-to-grid clear">
<nav class="top-bar" data-topbar role="navigation">

31
app/views/management/_account_info.html.erb
View File

@@ -5,25 +5,34 @@
<%= link_to(t("management.account_info.logout"), logout_management_users_path, method: :delete, class: 'right') %>
<% if managed_user.level_two_or_three_verified? %>
<p><%= t("management.account_info.identified_label") %></p>
<p>
<%= t("management.account_info.identified_label") %>
</p>
<% end %>
<% if managed_user.username.present? %>
<p><%= t("management.account_info.username_label") %>
<strong><%= managed_user.username %></strong></p>
<p>
<%= t("management.account_info.username_label") %>
<strong><%= managed_user.username %></strong>
</p>
<% end %>
<% if managed_user.email.present? %>
<p><%= t("management.account_info.email_label") %>
<strong><%= managed_user.email %></strong></p>
<p>
<%= t("management.account_info.email_label") %>
<strong><%= managed_user.email %></strong>
</p>
<% end %>
<p><%= t("management.account_info.document_type_label") %>
<strong><%= humanize_document_type(managed_user.document_type) %></strong>
<p>
<%= t("management.account_info.document_type_label") %>
<strong><%= humanize_document_type(managed_user.document_type) %></strong>
</p>
<p><%= t("management.account_info.document_number_label") %>
<strong><%= managed_user.document_number %></strong></p>
</span>
<p>
<%= t("management.account_info.document_number_label") %>
<strong><%= managed_user.document_number %></strong>
</p>
</div>
</section>
<% end %>

4
app/views/management/proposals/print.html.erb
View File

@@ -1,7 +1,7 @@
<section id="printme" role="main">
<section role="main">
<div class="row">
<div id="proposals" class="proposals-list small-12 column">
<a id="print_link" href="javascript:window.print(); void 0;" class="button warning radius right">
<a id="print_link" href="javascript:window.print();" class="button warning radius right">
<%= t('management.proposals.print.print_button') %>
</a>