Skip to content

Commit

Permalink
Tweaked colors for moderate button and alert badge
Browse files Browse the repository at this point in the history
  • Loading branch information
brzaik committed Jul 8, 2012
1 parent fd2265c commit 253a2b2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
12 changes: 10 additions & 2 deletions app/assets/stylesheets/application/layout/topmenu.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ nav#TM {
border: solid 1px #2f84da;

.badge {
background-color: $concerto-blue-1;
//background-color: $concerto-blue-1;
color: $white;

&.alert {
background-color: $red;
}
}
}

Expand Down Expand Up @@ -72,8 +76,12 @@ nav#TM {

.badge {
background-color: #666;
color: $grayLight;
color: $grayLighter;
text-shadow: 0 0 0;

&.alert {
background-color: darken($red, 10%);
}
}

a#TM-logobutton {
Expand Down
2 changes: 1 addition & 1 deletion app/views/elements/_topmenu_contents.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<%= link_to t(:browse), feeds_path, :class => "btn #{ current_page?(feeds_path) || (controller.controller_name == 'submissions' && ['index', 'show'].include?(controller.action_name)) ? 'selected' : '' }" %>
<%= link_to t(:add), new_content_path, :class => "btn #{ current_page?(new_content_path) ? 'selected' : '' }" if can? :create, Content %>
<%= link_to '#', :class => "btn" do %>
<%= t(:moderate) %>&nbsp;<span class="badge">0</span>
<%= t(:moderate) %>&nbsp;<span class="badge alert">##</span>
<% end %>
</div>
<div class="TM-secbot">
Expand Down
3 changes: 2 additions & 1 deletion config/locales/views/submissions/en.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
en:
browse_submissions: "Browse Submissions"
browse_submissions: "Browse Submissions"
moderate: "Moderate"

0 comments on commit 253a2b2

Please sign in to comment.