From 8ef56735bf72ef20b4cc682be7e814eccbb25046 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 1 Oct 2014 16:23:59 -0400 Subject: [PATCH] switch metacode set styling complete --- app/assets/stylesheets/application.css | 15 +++++++++------ app/views/shared/_switchmetacodes.html.erb | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c4fc66b5..7963398b 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1706,11 +1706,11 @@ float: left; } .ui-tabs-vertical .ui-tabs-nav li a { display: block; - width: 92%; - padding: 4% !important; + width: 100%; + padding: 4px 0 !important; } .ui-tabs-vertical .ui-tabs-panel { - padding: 5px !important; + padding: 0 !important; float: right; width: 388px; } @@ -1722,12 +1722,13 @@ float: left; line-height: 21px; border: none; background: none; -} -#metacodeSwitchTabs .setTitle { - + padding: 0; } #metacodeSwitchTabs .setDesc { margin-bottom: 5px; + font-family: 'din-medium', helvetica, sans-serif; + color: #424242; + font-size: 14px; } #switchMetacodes > p { margin: 16px 0 16px 0; @@ -1777,6 +1778,8 @@ float: left; background: none; font-size: 14px; line-height: 14px; + font-family: 'din-regular', helvetica, sans-serif; + color: #424242; } #metacodeSwitchTabs button.button { width: auto !important; diff --git a/app/views/shared/_switchmetacodes.html.erb b/app/views/shared/_switchmetacodes.html.erb index 238a83a3..42d1f59f 100644 --- a/app/views/shared/_switchmetacodes.html.erb +++ b/app/views/shared/_switchmetacodes.html.erb @@ -30,8 +30,8 @@ <% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %> <% @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

  • ' %> <% end %> +

    <%= m.desc %>

    -

    <%= m.desc %>

    @@ -43,7 +43,7 @@
    <% end %>
    -

    Pick Your Own Metacodes

    +

    Choose Your Metacodes

    <% @list = '' %> <% Metacode.order("name").all.each_with_index do |m, index| %> <% if selectedSet == "custom" %>