Changeset 161

Timestamp:

02/04/10 20:27:43 (3 years ago)

Author:

rickybanister

Message:

removed top and bottom divs on blog subnavs, made all subnavs in blog plugin a-subnav slots, cleaned up and unified subnav styles between blog and media subnavs

Location:

plugins/apostrophePlugin/trunk

Files:

• modules/a/templates/_subnav.php (modified) (1 diff)
• modules/aMedia/templates/_browser.php (modified) (1 diff)
• web/css/a.css (modified) (9 diffs)

plugins/apostrophePlugin/trunk/modules/a/templates/_subnav.php

@@ -3 +3 @@
         
 <div id="a-subnav" class="subnav">
-        <div class="subnav-wrapper">
+        <div class="a-subnav-wrapper">
                 <?php // echo a_navcolumn(false) ?>
                 <?php include_component('aNavigation', 'tabs', array('root' => $page->slug, 'active' => $page->slug, 'name' => 'subnav', 'draggable' => true, 'drag_icon' => true)) # Top Level Navigation ?>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_browser.php

@@ -9 +9 @@
 <?php use_helper('Url') ?>
 
-<div id="a-subnav" class="a-media-subnav subnav">
-        <div class="subnav-wrapper">
+<div id="a-subnav" class="media">
+        <div class="a-subnav-wrapper">
                 
         <h3>Find in Media</h3>

plugins/apostrophePlugin/trunk/web/css/a.css

@@ -2662 +2662 @@
 }
 
-.a-media-subnav,
+#a-subnav.media,
 .a-media-library,
 .a-media-toolbar,
@@ -2671 +2671 @@
 }
 
-#a-subnav.a-media-subnav
-{
-
-}
-
-#a-subnav.a-media-subnav .a-search-form
-{
-}
-
-#a-subnav.a-media-subnav .a-search-form .a-search-field
+#a-subnav.media
+{
+
+}
+
+#a-subnav.media .a-search-form
+{
+}
+
+#a-subnav.media .a-search-form .a-search-field
 {
 width: 150px;
@@ -2781 +2781 @@
 }
 
-.a-media-subnav .a-media-filters
+#a-subnav.media .a-media-filters
 {
 color: #000;
@@ -2790 +2790 @@
 }
 
-.a-media-subnav .a-media-filters .a-media-filter-option
+#a-subnav.media .a-media-filters .a-media-filter-option,
+#a-subnav.blog .a-blog-filter .a-blog-filter-option
 {
 float: left;
@@ -2797 +2798 @@
 }
 
-.a-media-subnav .a-media-filters .a-media-filter-option a
+#a-subnav.media .a-media-filters .a-media-filter-option a,
+#a-subnav.blog .a-blog-filter .a-blog-filter-option a,
 {
 float: left;
@@ -2803 +2805 @@
 line-height: 20px;
 height: 20px;
-}
-
-.a-media-subnav .a-media-filters .a-media-filter-option .selected
+width: auto;
+}
+
+#a-subnav.media .a-media-filters .a-media-filter-option a.selected,
+#a-subnav.blog .a-blog-filter .a-blog-filter-option a.selected
 {
 padding-right: 20px;
 background: url(/apostrophePlugin/images/a-icon-close.png) top right no-repeat;
-text-decoration: underline;
-}
-
-.a-media-subnav .a-media-filters .a-media-filter-option a.selected:hover
+}
+
+#a-subnav.media .a-media-filters .a-media-filter-option a.selected:hover,
+#a-subnav.blog .a-blog-filter .a-blog-filter-option a.selected:hover
 {
 background-position: bottom right;
@@ -3290 +3294 @@
 
 
-
-
-
-/* 24. Shared Subnav
+#a-subnav.blog h4
+{
+        float: left;
+        width: 100%;
+        clear: both;
+        display: inline;
+        position: relative;
+        font-size: 14px;
+}
+
+#a-subnav.blog .a-blog-filter-options
+{
+        float: left;
+        width: 100%;
+        clear: both;
+        display: inline;
+        position: relative;
+        line-height: 20px;
+}
+
+#a-subnav.media .a-media-filter-options a,
+#a-subnav.blog .a-blog-filter-options a
+{
+        float: left;
+        clear: both;
+        display: inline;
+        width: auto;
+        padding: 0 5px;
+}
+
+
+/* 24.   Subnav
 -------------------------------------*/
 
@@ -3305 +3337 @@
 }
 
-#a-subnav .subnav-wrapper
+#a-subnav .a-subnav-wrapper
 {
         width: 180px;
@@ -3369 +3401 @@
 }
 
-
+#a-subnav hr
+{
+        float: left;
+        clear: both;
+        position: relative;
+        display: inline;
+        margin: 10px 0;
+        width: 100%;
+}