glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch metacode set styling complete

Browse source
This commit is contained in:
Connor Turland 2014-10-01 16:23:59 -04:00
parent a382e0c35d
commit 8ef56735bf
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/application.css
View file

@ -1706,11 +1706,11 @@ float: left;
} }
.ui-tabs-vertical .ui-tabs-nav li a { .ui-tabs-vertical .ui-tabs-nav li a {
display: block; display: block;
width: 92%; width: 100%;
padding: 4% !important; padding: 4px 0 !important;
} }
.ui-tabs-vertical .ui-tabs-panel { .ui-tabs-vertical .ui-tabs-panel {
padding: 5px !important; padding: 0 !important;
float: right; float: right;
width: 388px; width: 388px;
} }
@ -1722,12 +1722,13 @@ float: left;
line-height: 21px; line-height: 21px;
border: none; border: none;
background: none; background: none;
} padding: 0;
#metacodeSwitchTabs .setTitle {
} }
#metacodeSwitchTabs .setDesc { #metacodeSwitchTabs .setDesc {
margin-bottom: 5px; margin-bottom: 5px;
font-family: 'din-medium', helvetica, sans-serif;
color: #424242;
font-size: 14px;
} }
#switchMetacodes > p { #switchMetacodes > p {
margin: 16px 0 16px 0; margin: 16px 0 16px 0;
@ -1777,6 +1778,8 @@ float: left;
background: none; background: none;
font-size: 14px; font-size: 14px;
line-height: 14px; line-height: 14px;
font-family: 'din-regular', helvetica, sans-serif;
color: #424242;
} }
#metacodeSwitchTabs button.button { #metacodeSwitchTabs button.button {
width: auto !important; width: auto !important;

4
app/views/shared/_switchmetacodes.html.erb
View file

@ -30,8 +30,8 @@
<% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %> <% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %>
<% @list += '<li><img src="' + m.icon + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p><div class="clearfloat"></div></li>' %> <% @list += '<li><img src="' + m.icon + '" alt="' + m.name + '" /><p>' + m.name.downcase + '</p><div class="clearfloat"></div></li>' %>
<% end %> <% end %>
<p class="setDesc"><%= m.desc %></p>
<div class="metacodeSetList"> <div class="metacodeSetList">
<p class="setDesc"><%= m.desc %></p>
<ul> <ul>
<%= @list.html_safe %> <%= @list.html_safe %>
</ul> </ul>
@ -43,7 +43,7 @@
</div> </div>
<% end %> <% end %>
<div id="metacodeSwitchTabsCustom"> <div id="metacodeSwitchTabsCustom">
<p class="setTitle">Pick Your Own Metacodes</p> <p class="setDesc">Choose Your Metacodes</p>
<% @list = '' %> <% @list = '' %>
<% Metacode.order("name").all.each_with_index do |m, index| %> <% Metacode.order("name").all.each_with_index do |m, index| %>
<% if selectedSet == "custom" %> <% if selectedSet == "custom" %>