diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 650621624..8c279ff78 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -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;
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index cc9170e48..4f57ed5d9 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -1,7 +1,10 @@
+
+
<%= t("notifications.index.title") %>
+
<% if @notifications.empty? %>
-
+
<%= t("notifications.index.empty_notifications") %>
<% else %>
diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb
index 0bf9f773c..3607290af 100644
--- a/app/views/shared/_filter_subnav.html.erb
+++ b/app/views/shared/_filter_subnav.html.erb
@@ -4,7 +4,7 @@
%>
- - <%= t("#{i18n_namespace}.filter") %>:
+ - <%= t("#{i18n_namespace}.filter") %>:
<% @valid_filters.each do |filter| %>
<% if @current_filter == filter %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index afa133b98..1b82049f8 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,5 +1,5 @@
-
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c40575d6b..adb19b026 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 37be2e03a..c6fc3d736 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -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: