_notice.scss in magic_stylez-0.0.0.48

- old
+ new

@@ -36,14 +36,14 @@
 }
 
 @mixin calculate_notice_top( $that-header-height: 50px ) {
     padding-top: $important-notice-height + $that-header-height;
     .application_notice { top: $application-notice-top + $important-notice-height + $that-header-height; }
-    &.fixed-sub-nav {
-        padding-top: $important-notice-height + $that-header-height + $subnav-height;
-        .application_notice { top: $application-notice-top + $important-notice-height + $that-header-height + $subnav-height; }
-    }
+    // &.fixed-sub-nav {
+    //     padding-top: $important-notice-height + $that-header-height + $subnav-height;
+    //     .application_notice { top: $application-notice-top + $important-notice-height + $that-header-height + $subnav-height; }
+    // }
 }
 
 
 body, #body, #container, .main-content, .main_content {
     
@@ -57,34 +57,15 @@
         
         padding-top: $important-notice-height;
         
         .application_notice { top: $application-notice-top + $important-notice-height; }
         
-        &.fixed-nav-xs { @include calculate_notice_top( $navbar-height-xs ); 
-            // padding-top: $important-notice-height + $navbar-height-xs;
-            // .application_notice { top: $application-notice-top + $important-notice-height + $navbar-height-xs; }
-            // &.fixed-sub-nav {
-            //     padding-top: $important-notice-height + $navbar-height-xs;
-            //     .application_notice { top: $application-notice-top + $important-notice-height + $navbar-height-xs; }
-            // }
-        }
-    	&.fixed-nav-sm { @include calculate_notice_top( $navbar-height-sm );
-    	    // padding-top: $important-notice-height + $navbar-height-sm; 
-    	    // .application_notice { top: $application-notice-top + $important-notice-height + $navbar-height-sm; }
-    	}
-    	&.fixed-nav    { @include calculate_notice_top( $navbar-height );
-    	    // padding-top: $important-notice-height + $navbar-height; 
-    	    // .application_notice { top: $application-notice-top + $important-notice-height + $navbar-height; }
-    	}
-    	&.fixed-nav-lg { @include calculate_notice_top( $navbar-height-lg );
-    	    // padding-top: $important-notice-height + $navbar-height-lg;
-    	    // .application_notice { top: $application-notice-top + $important-notice-height + $navbar-height-lg; }
-    	}
-    	&.fixed-nav-xl { @include calculate_notice_top( $navbar-height-xl );
-    	    // padding-top: $important-notice-height + $navbar-height-xl; 
-    	    // .application_notice { top: $application-notice-top + $important-notice-height + $navbar-height-xl; }
-    	}
+        &.fixed-nav-xs { @include calculate_notice_top( $navbar-height-xs ); }
+    	&.fixed-nav-sm { @include calculate_notice_top( $navbar-height-sm ); }
+    	&.fixed-nav    { @include calculate_notice_top( $navbar-height ); }
+    	&.fixed-nav-lg { @include calculate_notice_top( $navbar-height-lg ); }
+    	&.fixed-nav-xl { @include calculate_notice_top( $navbar-height-xl ); }
     	
     	.fixed-top, .navbar-fixed-top { top: $important-notice-height; }
         
     }
 	
@@ -96,9 +77,21 @@
     
     body, #body, #container, .main-content, .main_content {
         &.with_important_notice {
             
             #nav-aside { top: $important-notice-height; }
+            
+            &.fixed-nav-xs.fixed-sub-nav { @include calculate_notice_top( $navbar-height-xs + $subnav-height );  }
+        	&.fixed-nav-sm.fixed-sub-nav { @include calculate_notice_top( $navbar-height-sm + $subnav-height );  }
+        	&.fixed-nav.fixed-sub-nav { @include calculate_notice_top( $navbar-height + $subnav-height );  }
+        	&.fixed-nav-lg.fixed-sub-nav { @include calculate_notice_top( $navbar-height-lg + $subnav-height );  }
+        	&.fixed-nav-xl.fixed-sub-nav { @include calculate_notice_top( $navbar-height-xl + $subnav-height );  }
+            
+            &.fixed-nav-xs .nav.navbar-nav.navbar-sub-nav { top: $important-notice-height + $navbar-height-xs; }
+        	&.fixed-nav-sm .nav.navbar-nav.navbar-sub-nav { top: $important-notice-height + $navbar-height-sm; }
+        	&.fixed-nav    .nav.navbar-nav.navbar-sub-nav { top: $important-notice-height + $navbar-height; }
+        	&.fixed-nav-lg .nav.navbar-nav.navbar-sub-nav { top: $important-notice-height + $navbar-height-lg; }
+        	&.fixed-nav-xl .nav.navbar-nav.navbar-sub-nav { top: $important-notice-height + $navbar-height-xl; }
             
         }
     }
     
 }