Fixed nav bug; was a negative margin issue.

kylecotter · Jan 2, 2013 · 612a95a · 612a95a
1 parent a1cd7a7
commit 612a95a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 deletions.
diff --git a/Pre-compiled Themes.zip b/Pre-compiled Themes.zip
diff --git a/README.md b/README.md
@@ -54,6 +54,8 @@ Screenshots
 
 Changelog
 -------
+* v.2.0.4 - Fixed height bug with main nav.
+* v.2.0.3 - Third-party bug fix. (Zoo Flexible Admin)
 * v.2.0.2 - Added a series of pre-compiled themes.
 * v.2.0.1 - Fixed compatibility with certain third-party add-ons.* 
 * v2.0.0 - Rewritten styles, custom configuration via SASS, more compact styles. Full compatibility with popular third-party add-ons.

diff --git a/themes/cp_themes/sassy_cp/css/login.css b/themes/cp_themes/sassy_cp/css/login.css
@@ -2,7 +2,7 @@
 
 Theme: Sassy CP
 Description: An override for the ExpressionEngine Control Panel. It makes it prettier. And Sassy-ier.
-Version: 2.0.3
+Version: 2.0.2
 Author: Cotter Interactive
 Legal: Developed by Cotter Interactive. Licensed under Creative Commons Attribution 3.0.
 
@@ -451,6 +451,7 @@ Legal: Developed by Cotter Interactive. Licensed under Creative Commons Attribut
 #navigationTabs {
   margin-top: 0;
   padding: 10px 0;
+  margin-bottom: -10px;
 }
 #navigationTabs > li {
   margin: 0 5px 5px 5px;

diff --git a/themes/cp_themes/sassy_cp/css/override.css b/themes/cp_themes/sassy_cp/css/override.css
@@ -2,7 +2,7 @@
 
 Theme: Sassy CP
 Description: An override for the ExpressionEngine Control Panel. It makes it prettier. And Sassy-ier.
-Version: 2.0.3
+Version: 2.0.4
 Author: Cotter Interactive
 Legal: Developed by Cotter Interactive. Licensed under Creative Commons Attribution 3.0.
 
@@ -451,6 +451,7 @@ Legal: Developed by Cotter Interactive. Licensed under Creative Commons Attribut
 #navigationTabs {
   margin-top: 0;
   padding: 10px 0;
+  margin-bottom: -10px;
 }
 #navigationTabs > li {
   margin: 0 5px 5px 5px;

diff --git a/themes/cp_themes/sassy_cp/sass/_config.scss b/themes/cp_themes/sassy_cp/sass/_config.scss
@@ -9,7 +9,13 @@
 // for gradients are automatically generated. The default color is
 // a nice green. #80AA4F to be exact.
 
-$primaryColor : #0393C5;
+// Color Vars
+// $orange = #de8356;
+// $grey = #76787c;
+// $green = #80aa4f;
+// $blue = #0393c5;
+
+$primaryColor : #0393c5;
 
 // Navigation Colors
 $mainNavBg : #27343C;

diff --git a/themes/cp_themes/sassy_cp/sass/_nav.scss b/themes/cp_themes/sassy_cp/sass/_nav.scss
@@ -8,6 +8,7 @@
 	@extend .clearfix;
 	margin-top: 0;
 	padding: 10px 0;
+	margin-bottom: -10px;
 
 	// Styling of main top level nav
 	> li {

diff --git a/themes/cp_themes/sassy_cp/sass/override.scss b/themes/cp_themes/sassy_cp/sass/override.scss
@@ -2,7 +2,7 @@
 
 Theme: Sassy CP
 Description: An override for the ExpressionEngine Control Panel. It makes it prettier. And Sassy-ier.
-Version: 2.0.3
+Version: 2.0.4
 Author: Cotter Interactive
 Legal: Developed by Cotter Interactive. Licensed under Creative Commons Attribution 3.0.