summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/admin/_menu.html.erb2
-rw-r--r--app/views/layouts/admin.html.erb3
-rw-r--r--public/stylesheets/admin.css21
3 files changed, 1 insertions, 25 deletions
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index c87c5f7..4302987 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -6,4 +6,4 @@
6<%= link_to 'Assets', assets_path, selected?('assets') %> 6<%= link_to 'Assets', assets_path, selected?('assets') %>
7<%= link_to 'Events', events_path, selected?('events') %> 7<%= link_to 'Events', events_path, selected?('events') %>
8<%= link_to 'User', users_path, selected?('users') %> 8<%= link_to 'User', users_path, selected?('users') %>
9<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %> &gt;&nbsp; 9<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 79b1380..fb7d6da 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -25,9 +25,6 @@
25 <div id="main_navigation"> 25 <div id="main_navigation">
26 <%= render :partial => 'admin/menu' if current_user %> 26 <%= render :partial => 'admin/menu' if current_user %>
27 </div> 27 </div>
28 <div id="sub_navigation">
29 <%= yield :subnavigation %>
30 </div>
31 </div> 28 </div>
32 <div class="admin_content_spacer"></div> 29 <div class="admin_content_spacer"></div>
33 <% if flash[:notice].present? || flash[:error].present? %> 30 <% if flash[:notice].present? || flash[:error].present? %>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index fa36c18..38c9e5a 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -133,7 +133,6 @@ input[type=radio] {
133} 133}
134 134
135#main_navigation a, 135#main_navigation a,
136#sub_navigation a,
137#metadata a, 136#metadata a,
138#overview_toggle a { 137#overview_toggle a {
139 letter-spacing: 1px; 138 letter-spacing: 1px;
@@ -149,26 +148,6 @@ input[type=radio] {
149 background-color: #ff9600; 148 background-color: #ff9600;
150} 149}
151 150
152/* #sub_navigation covers 13 views' Show/Preview/Revisions/metadata
153 links (see `grep -rn "content_for :subnavigation" app/views/`),
154 including nodes#edit -- so #page_editor's own subnav links are
155 already covered here and are not part of the new scoped-underline
156 rule above. Proposed for full removal per the redesign notes; the
157 13-file list is the confirmation needed before scoping that work. */
158#sub_navigation a {
159 color: #969696;
160}
161
162#sub_navigation a:hover {
163 color: #ffffff;
164 background-color: #ff9600;
165}
166
167#sub_navigation a.selected {
168 color: #ffffff;
169 background-color: #ff9600;
170}
171
172.admin_content_spacer { 151.admin_content_spacer {
173 clear: both; 152 clear: both;
174 margin-bottom: 40px; 153 margin-bottom: 40px;