diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 069a97a8b..8168c0ec4 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 8532ba86c..70349fe9c 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -14,7 +14,6 @@ - @@ -22,4 +21,8 @@ + + + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index 37dde64ba..876fc7567 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index aeda5c384..8590e1587 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index f35811ecf..bf9d7dd22 100644 --- a/app/assets/stylesheets/admin.scss +++ b/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; +} diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index c8b40f0c3..387e2e453 100644 --- a/app/assets/stylesheets/debates.scss +++ b/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 // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 616c037cd..4d131e589 100644 --- a/app/assets/stylesheets/icons.scss +++ b/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"; +} diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index d6490f4ae..13ecb93c3 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/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; +} diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index ca40c4e53..301598bbe 100644 --- a/app/assets/stylesheets/variables.scss +++ b/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 // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index 585ca41a0..06cdac5ca 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -34,21 +34,21 @@
  • > <%= link_to admin_officials_path do %> - + <%= t('admin.menu.officials') %> <% end %>
  • > <%= link_to admin_settings_path do %> - + <%= t('admin.menu.settings') %> <% end %>
  • > <%= link_to stats_path do %> - + <%= t('admin.menu.stats') %> <% end %>
    • diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index 9c52d8834..c8c7faa8e 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -10,7 +10,7 @@
    <%= 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" %>
    diff --git a/app/views/admin/officials/edit.html.erb b/app/views/admin/officials/edit.html.erb index b986df2b5..f5748d77f 100644 --- a/app/views/admin/officials/edit.html.erb +++ b/app/views/admin/officials/edit.html.erb @@ -1,14 +1,15 @@ -

    <%= t("admin.officials.edit.title") %>

    +

    + <%= t("admin.officials.edit.title") %> + <%= @user.name %> (<%= @user.email %>) +

    -<%= @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 %> \ No newline at end of file +<% end %> diff --git a/app/views/admin/officials/index.html.erb b/app/views/admin/officials/index.html.erb index d0a98a963..bb2f006ab 100644 --- a/app/views/admin/officials/index.html.erb +++ b/app/views/admin/officials/index.html.erb @@ -1,25 +1,32 @@ -

    <%= t("admin.officials.index.title") %>

    +

    <%= t("admin.officials.index.title") %>

    -
    <%= 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") %> +
    +
    + <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %> +
    +
    + <%= f.submit t("admin.officials.index.search"), class: "button radius success" %> +
    +
    <% end %> -
    -
    -<%= page_entries_info @officials %> -
    +

    <%= page_entries_info @officials %>

    -
    +
      <% @officials.each do |official| %> - <%= link_to official.name, edit_admin_official_path(official) %> - <%= official.official_position %> - <%= t("admin.officials.level_#{official.official_level}") %> -

      -<% end %> -
    +
  • + <%= link_to official.name, edit_admin_official_path(official) %> +  •  + <%= t("admin.officials.level_#{official.official_level}") %> +  •  + + <%= official.official_position %> + + + <%= 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" %> +
    • +<% end %> + -
    <%= paginate @officials %> -
    \ No newline at end of file diff --git a/app/views/admin/officials/search.html.erb b/app/views/admin/officials/search.html.erb index 9549c7ad0..a7f60ca8a 100644 --- a/app/views/admin/officials/search.html.erb +++ b/app/views/admin/officials/search.html.erb @@ -1,21 +1,30 @@ -

    <%= t("admin.officials.search.title") %>

    +

    <%= t("admin.officials.search.title") %>

    -
    <%= 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") %> +
    +
    + <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %> +
    +
    + <%= f.submit t("admin.officials.search.search"), class: "button radius success" %> +
    +
    <% end %> -
    -
    -<%= page_entries_info @users %> -
    +

    <%= page_entries_info @users %>

    -
    -<% @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 %> -
    \ No newline at end of file +
      + <% @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), class: "button radius tiny right" %> +
      • + <% end %> +
    diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb index 321b307d0..c18c13b8a 100644 --- a/app/views/admin/settings/index.html.erb +++ b/app/views/admin/settings/index.html.erb @@ -1,15 +1,14 @@ -

    <%= t("admin.settings.index.title") %>

    +

    <%= t("admin.settings.index.title") %>

    -
      +
        <% @settings.each do |setting| %>
      • <%= setting.key.classify %> <%= 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 %> -
        • <% end %> -
      \ No newline at end of file +
    diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb index 06d9e2385..f6f14d5da 100644 --- a/app/views/admin/tags/index.html.erb +++ b/app/views/admin/tags/index.html.erb @@ -16,7 +16,7 @@ - <%= 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") %> -
    + <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "delete" %> <% end %> diff --git a/app/views/stats/show.html.erb b/app/views/stats/show.html.erb index 033d2714d..f5df82b98 100644 --- a/app/views/stats/show.html.erb +++ b/app/views/stats/show.html.erb @@ -1,13 +1,24 @@ -

    Stats

    +
    +
    +
    +

    Stats

    -

    Visits

    -<%= visits_chart_tag id: "visits" %> +
    +

    Visits

    + <%= visits_chart_tag id: "visits" %> +
    -

    Combined

    -<%= events_chart_tag @event_types, id: 'combined' %> +
    +

    Combined

    + <%= events_chart_tag @event_types, id: 'combined' %> +
    - -<% @event_types.each do |event_type| %> -

    <%= event_type.titleize %>

    - <%= events_chart_tag event_type %> -<% end %> +
    + <% @event_types.each do |event_type| %> +

    <%= event_type.titleize %>

    + <%= events_chart_tag event_type %> + <% end %> +
    +
    +
    +
    diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index e0ed572b5..7a3c6969b 100644 --- a/config/locales/admin.en.yml +++ b/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' diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 108c6f7bb..da29cff28 100644 --- a/config/locales/admin.es.yml +++ b/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'