Merge pull request #820 from consul/design_filters

Design filters
This commit is contained in:
Raimond Garcia
2016-01-11 14:18:57 +01:00
6 changed files with 19 additions and 15 deletions

View File

@@ -220,6 +220,16 @@ a {
}
}
.sub-nav {
border-bottom: 1px solid $border;
dd.active {
border-bottom: 2px solid $brand;
color: $brand;
padding-bottom: $line-height/4;
}
}
// 02. Header
// - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -974,7 +984,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
height: 100%;
left: 28px;
position: absolute;
top: 0;
top: 84px;
width: 2px;
}
@@ -1802,17 +1812,6 @@ table {
.activity {
margin-bottom: $line-height*2;
margin-top: $line-height;
.sub-nav {
border-bottom: 1px solid $border;
dd.active {
border-bottom: 2px solid $brand;
color: $brand;
padding-bottom: $line-height/4;
}
}
table {
border: 0;

View File

@@ -1,7 +1,10 @@
<div class="row">
<div class="small-12 column">
<h1 class="left margin-top"><%= t("notifications.index.title") %></h1>
<% if @notifications.empty? %>
<div class="alert-box radius info margin-top">
<div class="alert-box radius info margin-top clear">
<%= t("notifications.index.empty_notifications") %>
</div>
<% else %>

View File

@@ -4,7 +4,7 @@
%>
<dl class="sub-nav">
<dt><%= t("#{i18n_namespace}.filter") %>: </dt>
<dt class="sr-only"><%= t("#{i18n_namespace}.filter") %>: </dt>
<% @valid_filters.each do |filter| %>
<% if @current_filter == filter %>

View File

@@ -1,5 +1,5 @@
<section role="main">
<div class="activity row">
<div class="activity row margin-top">
<div class="small-12 column">
<h2>

View File

@@ -315,6 +315,7 @@ en:
user_permission_verify_info: "* Only for users on Madrid City Census."
notifications:
index:
title: "Notifications"
mark_all_as_read: "Mark all as read"
empty_notifications: "You don't have new notifications."
comments_on:

View File

@@ -315,6 +315,7 @@ es:
user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid."
notifications:
index:
title: "Notificaciones"
mark_all_as_read: "Marcar todas como leídas"
empty_notifications: "No tienes notificaciones nuevas."
comments_on: