Merge pull request #197 from AyuntamientoMadrid/styling_admin

Styling admin

app/assets/fonts/icons.svg

@@ -14,7 +14,6 @@
 <glyph unicode="&#101;" d="M201 402c-29 0-56-5-82-15-25-9-45-23-60-40-15-17-22-35-22-54 0-16 5-31 15-46 10-14 24-27 42-37l28-16-10-24c6 4 12 7 18 11l12 9 15-3c15-3 30-4 44-4 29 0 57 5 82 15 25 10 45 23 60 40 15 17 23 35 23 55 0 19-8 37-23 54-15 17-35 31-60 40-25 10-53 15-82 15z m0 37c37 0 70-7 101-20 31-13 56-31 73-53 18-22 27-47 27-73 0-27-9-51-27-74-17-22-42-40-73-53-31-13-64-20-101-20-16 0-33 2-50 5-24-17-50-29-80-37-6-1-15-3-24-4l-1 0c-2 0-4 0-6 2-2 2-3 4-3 6 0 1 0 1 0 2 0 1 0 1 0 2 0 0 0 1 0 1l1 2c0 0 0 0 1 1 1 1 1 2 1 2 0 0 1 0 1 1 1 1 2 2 2 2 1 1 3 3 6 7 4 3 6 6 8 8 1 2 3 5 6 8 3 4 5 8 7 11 2 4 4 8 6 13-24 14-42 31-56 51-13 20-20 41-20 64 0 26 9 51 27 73 18 22 42 40 73 53 31 13 65 20 101 20z m235-334c2-5 4-9 6-13 2-4 4-7 7-11 3-3 5-6 6-8 2-2 4-5 8-8 3-4 5-6 6-8 1 0 1 0 2-1 0-1 1-1 1-1 0-1 1-1 1-2 0 0 1-1 1-1l1-2c0 0 0 0 0-1 1-2 1-2 0-2 0 0 0-1 0-2 0-3-2-5-4-6-1-2-4-3-6-2-9 1-18 2-24 4-30 8-56 20-80 37-17-3-34-5-50-5-52 0-97 13-135 38 11-1 19-1 25-1 31 0 60 4 88 13 29 8 54 20 76 36 24 18 42 38 55 61 12 23 19 47 19 73 0 14-2 29-7 43 25-14 44-30 59-51 14-20 21-42 21-66 0-22-7-44-20-64-14-20-32-36-56-50z"/>
 <glyph unicode="&#102;" d="M481 395c-13-18-28-34-46-47 0-3 0-7 0-12 0-25-3-50-11-74-7-25-18-49-33-71-14-23-32-43-52-61-21-17-45-31-74-41-29-11-60-16-92-16-52 0-99 14-142 42 7-1 14-2 22-2 43 0 81 14 115 40-20 0-38 6-54 18-16 12-27 27-33 46 7-1 13-2 18-2 8 0 16 1 24 4-21 4-39 15-53 31-14 17-21 37-21 59l0 1c13-7 27-11 42-11-13 8-23 19-30 32-8 14-11 29-11 44 0 17 4 33 12 47 23-28 51-51 84-68 33-17 69-27 107-29-2 8-3 15-3 22 0 25 9 47 27 65 18 18 40 27 66 27 26 0 49-10 67-29 21 4 40 11 59 22-7-22-21-39-41-51 18 2 35 7 53 14z"/>
 <glyph unicode="&#103;" d="M55 37l402 0 0 292-402 0z m110 347l0 82c0 3-1 5-3 7-2 2-4 2-7 2l-18 0c-3 0-5 0-6-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 1-1 3-2 6-2l18 0c3 0 5 1 7 2 2 2 3 4 3 7z m219 0l0 82c0 3-1 5-3 7-1 2-3 2-6 2l-18 0c-3 0-5 0-7-2-2-2-3-4-3-7l0-82c0-3 1-5 3-7 2-1 4-2 7-2l18 0c3 0 5 1 6 2 2 2 3 4 3 7z m110 18l0-365c0-10-4-19-11-26-7-7-16-11-26-11l-402 0c-10 0-19 4-26 11-7 7-11 16-11 26l0 365c0 10 4 19 11 26 7 7 16 11 26 11l36 0 0 27c0 13 5 24 14 33 9 9 20 13 32 13l18 0c13 0 24-4 33-13 9-9 13-20 13-33l0-27 110 0 0 27c0 13 4 24 13 33 9 9 20 13 33 13l18 0c12 0 23-4 32-13 9-9 14-20 14-33l0-27 36 0c10 0 19-4 26-11 7-7 11-16 11-26z"/>
-<glyph unicode="&#104;" d="M320 347c0-2-1-4-3-6-2-2-4-3-6-3-3 0-5 1-7 3-1 2-2 4-2 6 0 9-5 16-16 21-10 4-20 7-30 7-2 0-5 1-6 3-2 1-3 4-3 6 0 2 1 5 3 6 1 2 4 3 6 3 10 0 19-1 28-4 10-3 18-9 25-16 7-7 11-16 11-26z m46 0c0 14-4 27-10 39-7 12-15 21-26 29-10 7-22 13-35 17-13 5-26 7-39 7-13 0-26-2-39-7-13-4-25-10-35-17-11-8-19-17-26-29-6-12-10-25-10-39 0-19 7-36 20-51 2-2 5-5 8-9 4-5 7-8 9-10 25-29 38-57 40-85l66 0c2 28 15 56 40 85 2 2 5 5 9 10 3 4 6 7 8 9 13 15 20 32 20 51z m36 0c0-29-10-55-29-76-9-9-16-18-21-25-6-7-12-16-17-27-6-11-9-21-10-31 9-5 13-13 13-23 0-7-2-14-7-19 5-5 7-11 7-18 0-10-4-18-13-23 3-5 4-9 4-14 0-8-3-15-9-20-6-5-13-7-22-7-4-8-10-15-17-20-8-5-16-7-25-7-9 0-17 2-25 7-7 5-13 12-17 20-9 0-16 2-22 7-6 5-9 12-9 20 0 5 1 9 4 14-9 5-13 13-13 23 0 7 2 13 7 18-5 5-7 12-7 19 0 10 4 18 13 23-1 10-4 20-10 31-5 11-11 20-17 27-5 7-12 16-21 25-19 21-29 47-29 76 0 19 4 37 12 53 9 16 20 30 34 41 14 10 29 19 47 25 17 6 35 9 53 9 18 0 36-3 53-9 18-6 33-15 47-25 14-11 25-25 34-41 8-16 12-34 12-53z"/>
 <glyph unicode="&#105;" d="M453 425c-1 9-8 16-17 16l-360 0 0 0c-9 0-16-7-17-16l0 0 0-288 0 0c2-8 9-14 17-14l0 0 59 0 0-35c0-9 8-17 17-17 6 0 11 3 14 8l45 44 225 0c8 0 15 6 17 14l0 0 0 288z m-308-172c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c1 1 1 1 2 1 1 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1 0-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-10-6-22-19-25-31 2 1 4 1 7 1 13 0 23-10 23-24 0-14-12-26-27-26z m68 0c-15 0-29 12-29 34 0 25 13 47 34 61l0 0c0 1 1 1 2 1 0 0 1 0 2-1l0 0 14-9 0 0c1 0 1-1 1-3 0-1-1-2-2-3l0 0c0 0 0 0 0 0 0 0 0 0 0 0-11-6-22-19-25-31 1 1 4 1 7 1 12 0 22-10 22-24 0-14-12-26-26-26z m81-37l0 0c0 0-1-1-2-1 0 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 1 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 11 6 22 20 25 31-1 0-4-1-7-1-12 0-22 10-22 24 0 15 12 27 26 27 15 0 29-13 29-34 0-25-13-48-34-62z m68 0l0 0c-1 0-1-1-2-1-1 0-1 1-2 1l0 0-14 9 0 0c-1 1-1 2-1 3 0 1 0 3 2 3l0 0c0 0 0 0 0 0 0 0 0 0 0 0 10 6 22 20 25 31-2 0-4-1-7-1-13 0-23 10-23 24 0 15 12 27 27 27 15 0 29-13 29-34 0-25-13-48-34-62z"/>
 <glyph unicode="&#106;" d="M91 347c0-5-1-9-5-12-4-4-8-6-13-6-5 0-9 2-13 6-3 3-5 7-5 12 0 6 2 10 5 13 4 4 8 6 13 6 5 0 9-2 13-6 4-3 5-7 5-13z m46-146l0 183c0 5-2 9-5 13-4 3-8 5-13 5l-82 0c-5 0-10-2-13-5-4-4-6-8-6-13l0-183c0-5 2-9 6-13 3-3 8-5 13-5l82 0c5 0 9 2 13 5 3 4 5 8 5 13z m323 43c10-12 15-26 15-43 0-15-5-28-16-38-11-11-24-17-38-17l-80 0c1-2 2-5 3-7 0-1 2-4 3-6 1-2 2-4 3-5 3-7 6-12 7-16 2-4 4-10 6-17 2-7 3-15 3-22 0-4 0-8 0-11-1-3-1-7-2-13-1-6-2-10-3-14-2-4-4-8-7-13-3-5-7-9-12-12-4-3-10-5-17-7-7-2-15-3-23-3-5 0-10 2-13 5-4 4-7 9-10 15-3 5-4 10-5 15-1 4-3 10-4 17-2 8-3 14-4 17-1 4-2 8-5 14-2 6-5 10-9 14-6 6-16 18-29 34-9 12-19 24-28 35-10 11-18 16-22 17-5 0-9 2-12 5-4 4-6 8-6 13l0 183c0 5 2 9 6 13 3 3 8 5 13 5 6 0 21 5 45 13 15 5 26 9 34 11 9 3 20 5 35 8 15 3 29 5 41 5l37 0c25-1 44-8 56-22 11-14 16-31 14-52 8-7 13-16 16-27 3-12 3-23 0-33 8-12 13-25 12-40 0-6-1-13-4-21z"/>
 <glyph unicode="&#107;" d="M91 128c0 5-1 9-5 13-4 3-8 5-13 5-5 0-9-2-13-5-3-4-5-8-5-13 0-5 2-9 5-13 4-4 8-5 13-5 5 0 9 1 13 5 4 4 5 8 5 13z m46 146l0-183c0-5-2-9-5-12-4-4-8-6-13-6l-82 0c-5 0-10 2-13 6-4 3-6 7-6 12l0 183c0 5 2 10 6 13 3 4 8 6 13 6l82 0c5 0 9-2 13-6 3-3 5-8 5-13z m338 0c0-16-5-30-15-42 3-9 4-16 4-22 1-14-4-28-12-39 3-11 3-22 0-34-3-10-8-19-16-26 2-22-3-39-14-52-12-15-31-22-56-22l-37 0c-12 0-26 1-41 4-15 3-26 6-35 8-8 3-19 7-34 12-24 8-39 12-45 12-5 0-10 2-13 6-4 3-6 7-6 12l0 184c0 4 2 8 6 12 3 4 7 5 12 6 4 0 12 6 22 17 9 11 19 22 28 34 13 17 23 28 29 35 4 3 7 8 9 13 3 6 4 11 5 14 1 4 2 9 4 17 1 8 3 14 4 18 1 4 2 9 5 15 3 5 6 10 10 14 3 4 8 5 13 5 8 0 16-1 23-3 7-2 13-4 17-7 5-3 9-7 12-12 3-4 5-9 7-12 1-4 2-9 3-15 1-5 1-10 2-13 0-2 0-6 0-11 0-7-1-14-3-21-2-8-4-13-5-18-2-4-5-9-8-16-1-1-2-2-3-5-1-2-3-4-3-6-1-2-2-4-3-7l80 0c14 0 27-5 38-16 11-11 16-24 16-39z"/>
@@ -22,4 +21,8 @@
 <glyph unicode="&#109;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
 <glyph unicode="&#110;" d="M494 327c0-4-3-9-8-14l-103-101 24-143c0-1 0-3 0-5 0-4-1-8-3-10-2-3-4-5-8-5-4 0-8 2-12 4l-128 67-128-67c-4-2-8-4-12-4-4 0-7 2-9 5-2 2-3 6-3 10 0 1 0 3 1 5l24 143-104 101c-4 6-7 10-7 14 0 7 6 12 16 13l144 21 64 130c4 8 8 12 14 12 6 0 10-4 14-12l64-130 144-21c10-1 16-6 16-13z"/>
 <glyph unicode="&#112;" d="M256 448c-96 0-208-64-256-192 48-96 144-160 256-160 112 0 208 64 256 160-48 128-160 192-256 192z m0-320c-96 0-176 64-192 128 16 64 96 128 192 128 96 0 176-64 192-128-16-64-96-128-192-128z m0 224c-10 0-19-2-28-5 17-7 28-24 28-43 0-27-21-48-48-48-19 0-36 11-43 28-3-9-5-18-5-28 0-53 43-96 96-96 53 0 96 43 96 96 0 53-43 96-96 96z"/>
+<glyph unicode="&#111;" d="M410 203l-80 38-34 16c15 9 27 24 35 41 6 14 10 29 10 46 0 9-1 18-4 27-10 41-42 72-81 72-38 0-70-30-81-70-2-9-4-19-4-29 0-18 4-34 11-49 8-16 20-30 35-39l-32-15-83-38c-7-4-12-12-12-21l0-91c0-12 8-22 19-22l294 0c11 0 19 10 19 22l0 91c0 9-4 17-12 21z"/>
+<glyph unicode="&#113;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
+<glyph unicode="&#114;" d="M17 222c-14 4-20 13-16 29 3 14 12 20 27 16 0 0 50-12 50-12 0 0-26-41-26-41 0 0-35 8-35 8m455-6c4 4 10 6 16 6 7-1 12-3 16-8 11-11 11-22-1-33 0 0-128-115-128-115-5-4-10-6-16-6-5 0-9 2-14 5 0 0-146 112-146 112 0 0-28 8-28 8 0 0 26 40 26 40 0 0 18-4 18-4 4-1 7-2 8-4 0 0 135-104 135-104 0 0 114 103 114 103m-251 112c0 0-178-280-178-280-4-8-11-12-20-12-4 0-8 2-12 5-5 3-9 8-10 14-1 7 0 12 3 17 0 0 191 300 191 300 3 6 7 9 14 11 6 2 12 1 19-3 0 0 125-80 125-80 0 0 115 166 115 166 4 6 9 9 15 10 6 1 12-1 17-5 13-8 15-18 6-31 0 0-128-185-128-185-9-12-19-14-32-6 0 0-125 79-125 79"/>
+<glyph unicode="&#104;" d="M411 415l0 0 0 0c3 3 3 8 0 11l-10 10c-3 3-8 3-11 0l0 0-45-45c-3-3-3-7 0-10l11-11 0 0c2-3 7-3 10 0z m-162-2l0 0 14 0 0 0c4 0 8 3 8 7l0 0 0 64c0 5-3 8-8 8l0 0-14 0 0 0c-5 0-8-3-8-8l0-64 0 0c0-4 4-7 8-7z m220-106c0 4-3 7-7 8l0 0-64 0c-4 0-8-4-8-8l0-15c0-4 4-7 8-7l64 0 0 0c4 0 7 3 7 7z m-213 81c-60 0-109-49-109-109 0-23 8-45 20-63l0 0c17-25 27-59 27-96 2-2 4-4 7-4 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 3 0 5 2 7 5 0 38 12 73 29 99 11 17 18 37 18 59 0 60-49 109-109 109z m55-336c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-8-3-8-7l0-17c0-5 4-8 8-8 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 4 0 7 3 7 8l0 17c0 4-3 7-7 7z m0 49c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-7-4-8-8 0 0 0 0 0 0l0-17c0-4 4-8 8-8 0 0 0 0 1 1l0-1 108 0 0 1c0-1 1-1 1-1 4 0 7 4 7 8l0 17c0 4-3 8-7 8z m-197 208l0 0-64 0c-4 0-7-3-7-8l0-14c0-5 3-8 7-8l64 0 0 0c4 0 8 4 8 8l0 14c0 4-4 8-8 8z m-11 109l46-46 0 0c3-2 7-2 10 1l0 0 11 10c2 3 2 8 0 10l0 0-46 46c-2 3-7 3-10 0l-11-11c-2-3-2-7 0-10z"/>
 </font></defs></svg>

app/assets/stylesheets/admin.scss

@@ -3,6 +3,7 @@
 // 01. Global styles
 // 02. Sidebar
 // 03. List elements
+// 04. Stats
 //
 
 // 01. Global styles
@@ -16,6 +17,11 @@ body.admin {
     font-weight: bold;
   }
 
+  h3 {
+    font-size: rem-calc(14);
+    font-weight: normal;
+  }
+
   form {
     .button {
       margin-top: 0;
@@ -26,15 +32,6 @@ body.admin {
     margin-right: rem-calc(12);
   }
 
-  .button.create {
-    background: #EFD90C;
-    color: $text;
-
-    &:hover {
-      background: #BDAB09;
-    }
-  }
-
   .admin-content {
     margin-top: rem-calc(24);
   }
@@ -105,6 +102,7 @@ body.admin {
 .admin-list {
   list-style-type: none;
   margin: 0;
+  margin-bottom: rem-calc(48);
 
   form {
     clear: both;
@@ -143,11 +141,29 @@ body.admin {
 .delete {
   border-bottom: 1px dotted #CF2A0E;
   color: #F04124;
-  font-size: rem-calc(11);
-  margin-right: rem-calc(12);
+  font-size: rem-calc(12);
 
   &:hover, &:active, &:focus {
     border: 0;
     color: #cf2a0e;
   }
 }
+
+.level {
+  font-size: rem-calc(12);
+}
+
+.official {
+  background-color: #e7e7e7;
+  border-radius: rem-calc(3);
+  font-size: rem-calc(12);
+  font-weight: normal;
+  padding: rem-calc(6) rem-calc(12);
+}
+
+// 04. Stats
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.stats {
+  background: white;
+}

app/assets/stylesheets/debates.scss

@@ -366,10 +366,6 @@
         color: $text-medium;
     }
 
-    .bullet {
-      color: $border;
-    }
-
     p {
       font-size: rem-calc(14);
       line-height: $line-height;
@@ -431,6 +427,10 @@
   }
 }
 
+.bullet {
+  color: $border;
+}
+
 // 04. New
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 

app/assets/stylesheets/icons.scss

@@ -58,9 +58,6 @@
 .icon-calendar:before {
   content: "g";
 }
-.icon-lightbulb:before {
-  content: "h";
-}
 .icon-comment-quotes:before {
   content: "i";
 }
@@ -82,3 +79,15 @@
 .icon-eye:before {
   content: "p";
 }
+.icon-user:before {
+  content: "o";
+}
+.icon-settings:before {
+  content: "q";
+}
+.icon-stats:before {
+  content: "r";
+}
+.icon-initiatives:before {
+  content: "h";
+}

app/assets/stylesheets/participacion.scss

@@ -11,6 +11,7 @@
 // 09. Alerts
 // 10. User account
 // 11. Filters
+// 12. Official levels
 //
 
 // 01. Variables
@@ -618,3 +619,30 @@ form {
     }
   }
 }
+
+// 12. Officials levels
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+.level-0 {
+  background: $level-0;
+}
+
+.level-1 {
+  background: $level-1;
+}
+
+.level-2 {
+  background: $level-2;
+}
+
+.level-3 {
+  background: $level-3;
+}
+
+.level-4 {
+  background: $level-4;
+}
+
+.level-5 {
+  background: $level-5;
+}

app/assets/stylesheets/variables.scss

@@ -38,6 +38,13 @@ $votes-unlike-act:  #BD6A6A;
 
 $check:             #46DB91;
 
+$level-0:           #F08A24;
+$level-1:           #43AC6A;
+$level-2:           #43AC6A;
+$level-3:           #43AC6A;
+$level-4:           #43AC6A;
+$level-5:           #43AC6A;
+
 // 03. Forms
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 

app/views/admin/_menu.html.erb

@@ -34,21 +34,21 @@
 
     <li <%= 'class=active' if controller_name == 'officials' %>>
       <%= link_to admin_officials_path do %>
-        <i class="icon-chat-bubble-two"></i>
+        <i class="icon-user"></i>
         <%= t('admin.menu.officials') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'settings' %>>
       <%= link_to admin_settings_path do %>
-        <i class="icon-chat-bubble-two"></i>
+        <i class="icon-settings"></i>
         <%= t('admin.menu.settings') %>
       <% end %>
     </li>
 
     <li <%= 'class=active' if controller_name == 'stats' %>>
       <%= link_to stats_path do %>
-        <i class="icon-chat-bubble-two"></i>
+        <i class="icon-stats"></i>
         <%= t('admin.menu.stats') %>
       <% end %>
     </li>

app/views/admin/comments/index.html.erb

@@ -10,7 +10,7 @@
         <div class="small-12 medium-2 column">
           <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment),
                       method: :put, data: { confirm: t("admin.actions.confirm") },
-                      class: "button radius tiny success right" %>
+                      class: "button radius small success right" %>
         </div>
       </div>
     </li>

app/views/admin/officials/edit.html.erb

@@ -1,14 +1,15 @@
-<h1><%= t("admin.officials.edit.title") %></h1>
+<h2>
+  <%= t("admin.officials.edit.title") %>
+  <span class="official right"><strong><%= @user.name %></strong> (<%= @user.email %>)</span>
+</h2>
 
-<%= @user.name %> (<%= @user.email %>)
 <%= form_for @user, url: admin_official_path(@user)  do |f| %>
   <%= f.text_field :official_position %>
   <%= f.select :official_level, official_level_options %>
+  <%= link_to t("admin.officials.edit.back"), admin_officials_path, class: "button radius small secondary" %>
   <%= f.submit %>
 
   <% if @user.official? %>
-    <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'button tiny alert' %>
-  <% else %>
-    <%= link_to t("admin.officials.edit.cancel"), admin_officials_path, class: 'button tiny alert' %>
+    <%= link_to t("admin.officials.edit.destroy"), admin_official_path(@user), method: :delete, class: 'delete' %>
   <% end %>
-<% end %>
+<% end %>

app/views/admin/officials/index.html.erb

@@ -1,25 +1,32 @@
-<h1><%= t("admin.officials.index.title") %></h1>
+<h2><%= t("admin.officials.index.title") %></h2>
 
-<div>
 <%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %>
-  <%= text_field_tag :email, "", label: false, placeholder: t("admin.officials.index.search_email_placeholder") %>
-  <%= f.submit t("admin.officials.index.search") %>
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %>
+    </div>
+    <div class="form-inline small-12 medium-6 column">
+      <%= f.submit t("admin.officials.index.search"), class: "button radius success" %>
+    </div>
+  </div>
 <% end %>
-</div>
 
-<div>
-<%= page_entries_info @officials %>
-</div>
+<h3><%= page_entries_info @officials %></h3>
 
-<div>
+<ul class="admin-list">
 <% @officials.each do |official| %>
-  <%= link_to official.name, edit_admin_official_path(official) %>
-  <%= official.official_position %>
-  <%= t("admin.officials.level_#{official.official_level}") %>
-  <br/><br/>
-<% end %>
-</div>
+  <li>
+    <%= link_to official.name, edit_admin_official_path(official) %>
+    <span class="bullet">&nbsp;&bullet;&nbsp;</span>
+    <span class="level"><%= t("admin.officials.level_#{official.official_level}") %></span>
+    <span class="bullet">&nbsp;&bullet;&nbsp;</span>
+    <span class="label round level-<%= official.official_level %>">
+      <%= official.official_position %>
+    </span>
+
+    <%= link_to official.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(official), class: "button radius tiny right" %>
+  </li>
+<% end %>
+</ul>
 
-<div>
 <%= paginate @officials %>
-</div>

app/views/admin/officials/search.html.erb

@@ -1,21 +1,30 @@
-<h1><%= t("admin.officials.search.title") %></h1>
+<h2><%= t("admin.officials.search.title") %></h2>
 
-<div>
 <%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %>
-  <%= text_field_tag :email, "", label: false, placeholder: t("admin.officials.index.search_email_placeholder") %>
-  <%= f.submit t("admin.officials.search.search") %>
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %>
+    </div>
+    <div class="small-12 medium-6 column">
+      <%= f.submit t("admin.officials.search.search"), class: "button radius success" %>
+    </div>
+  </div>
 <% end %>
-</div>
 
-<div>
-<%= page_entries_info @users %>
-</div>
+<h3><%= page_entries_info @users %></h3>
 
-<div>
-<% @users.each do |user| %>
-  <%= link_to user.name, edit_admin_official_path(user) %>
-  <%= user.official_position %>
-  <%= t("admin.officials.level_#{user.official_level}") %>
-  <%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(user) %>
-<% end %>
-</div>
+<ul class="admin-list">
+  <% @users.each do |user| %>
+    <li>
+      <%= link_to user.name, edit_admin_official_path(user) %>
+      <span class="bullet">&nbsp;&bullet;&nbsp;</span>
+      <span class="label round level-<%= user.official_level %>">
+        <%= user.official_position %>
+      </span>
+      <span class="bullet">&nbsp;&bullet;&nbsp;</span>
+      <span class="level"><%= t("admin.officials.level_#{user.official_level}") %></span>
+
+    <%= link_to user.official? ? t("admin.officials.search.edit_official") : t("admin.officials.search.make_official"), edit_admin_official_path(user), class: "button radius tiny right" %>
+    </li>
+  <% end %>
+</ul>

app/views/admin/settings/index.html.erb

@@ -1,15 +1,14 @@
-<h1><%= t("admin.settings.index.title") %></h1>
+<h2><%= t("admin.settings.index.title") %></h2>
 
-<ul>
+<ul class="admin-list">
   <% @settings.each do |setting| %>
     <li>
       <strong><%= setting.key.classify %></strong>
 
       <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
         <%= f.text_field :value, label: false, id: dom_id(setting) %>
-        <%= f.submit(class: "button radius tiny") %>
+        <%= f.submit(class: "button radius tiny success") %>
       <% end %>
-
     </li>
   <% end %>
-</ul>
+</ul>

app/views/admin/tags/index.html.erb

@@ -16,7 +16,7 @@
     </div>
   </div>
 
-  <%= f.submit(class: "button radius create") %>
+  <%= f.submit(class: "button radius success") %>
 
 <% end %>
 
@@ -38,7 +38,7 @@
         <% end %>
 
         <%= f.submit(class: "button radius tiny success") %>
-        <br>
+
         <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "delete" %>
       <% end %>
     </li>

app/views/stats/show.html.erb

@@ -1,13 +1,24 @@
-<h1>Stats</h1>
+<div class="stats row-full">
+  <div class="row">
+    <div class="small-12 column">
+      <h2>Stats</h2>
 
-<h3>Visits</h3>
-<%= visits_chart_tag id: "visits" %>
+      <div class="small-12 medium-6 column">
+        <h3>Visits</h3>
+        <%= visits_chart_tag id: "visits" %>
+      </div>
 
-<h3>Combined</h3>
-<%= events_chart_tag @event_types, id: 'combined' %>
+      <div class="small-12 medium-6 column">
+        <h3>Combined</h3>
+        <%= events_chart_tag @event_types, id: 'combined' %>
+      </div>
 
-
-<% @event_types.each do |event_type| %>
-  <h3><%= event_type.titleize %></h3>
-  <%= events_chart_tag event_type %>
-<% end %>
+      <div class="small-12">
+        <% @event_types.each do |event_type| %>
+          <h3><%= event_type.titleize %></h3>
+          <%= events_chart_tag event_type %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

config/locales/admin.en.yml

@@ -72,7 +72,7 @@ en:
       edit:
         title: 'Officials: edit user'
         destroy: "Remove 'Official' condition"
-        cancel: "Cancel"
+        back: Back
       flash:
         official_updated: 'Official position saved!'
         official_destroyed: 'User is not an official anymore'

config/locales/admin.es.yml

@@ -72,7 +72,7 @@ es:
       edit:
         title: 'Cargos Públicos: Editar usuario'
         destroy: "Eliminar condición de 'Cargo Público'"
-        cancel: "Cancelar"
+        back: Volver
       flash:
         official_updated: 'Datos del cargo público guardados'
         official_destroyed: 'Datos guardados: el usuario ya no es cargo público'