Merge pull request #43 from jem08002/master

Sherman Color Theme Changes
weblab · Jan 8, 2015 · fa28a3f · fa28a3f
2 parents 47840a9 + 878402f
commit fa28a3f
Show file tree

Hide file tree

Showing 15 changed files with 1,051 additions and 880 deletions.
diff --git a/css/sherman-black.css b/css/sherman-black.css
diff --git a/css/sherman-blue.css b/css/sherman-blue.css
diff --git a/css/sherman-grey.css b/css/sherman-grey.css
diff --git a/css/sherman-red.css b/css/sherman-red.css
diff --git a/css/sherman-variables-black.css b/css/sherman-variables-black.css
@@ -13,4 +13,6 @@
 /* Primary Colors (Bootstrap) */
 /* Buttons, define text, background and border color. */
 /* Sherman Only Variables */
-/*Search Form */
+/* Main Search Form */
+/* Body Search Form */
+/* Widget Search Form */
diff --git a/css/sherman-variables-blue.css b/css/sherman-variables-blue.css
@@ -13,4 +13,6 @@
 /* Primary Colors (Bootstrap) */
 /* Buttons, define text, background and border color. */
 /* Sherman Only Variables */
-/*Search Form */
+/* Main Search Form */
+/* Body Search Form */
+/* Widget Search Form */
diff --git a/css/sherman-variables-grey.css b/css/sherman-variables-grey.css
@@ -13,4 +13,6 @@
 /* Primary Colors (Bootstrap) */
 /* Buttons, define text, background and border color. */
 /* Sherman Only Variables */
-/*Search Form */
+/* Main Search Form */
+/* Body Search Form */
+/* Widget Search Form */
diff --git a/css/sherman-variables-red.css b/css/sherman-variables-red.css
@@ -13,4 +13,6 @@
 /* Primary Colors (Bootstrap) */
 /* Buttons, define text, background and border color. */
 /* Sherman Only Variables */
-/*Search Form */
+/* Main Search Form */
+/* Body Search Form */
+/* Footer Search Form */
diff --git a/sass/sherman-common.scss b/sass/sherman-common.scss
@@ -224,10 +224,9 @@ body {
 
 
 
-/* 	Widgets
+/* 	Widgets - With Color Variables
 ====================================
 */
-
 .widget {
 	margin:0 0 10px;
 
@@ -236,6 +235,13 @@ body {
 			font-weight:normal;
 		}
 	}
+	&.widget_search{
+		.btn.btn-default{
+			background-color: $body-search-bg-color;
+			color: $body-search-text-color;
+			border: 1px solid $body-search-bg-color;
+		}
+	}	
 	.uc-cal {
 		.uc-cal-event-month {
 			padding-bottom:0!important;
@@ -255,6 +261,25 @@ body {
 			}
 		}
 	}
+	&.widget_dpe_fp_widget{
+		.dpe-flexible-posts{
+			li{
+				.post{
+					padding:0px;
+				}
+				.page{
+					padding:0px;
+					padding-bottom:0px;
+				}
+				a{
+					.title{
+
+					}
+				}
+			}
+		}
+	}
+
 }
 
 /* 	Main Content
@@ -274,7 +299,7 @@ body {
 	}
 }
 
-#content {
+#primary {
 	.page {
 		padding-top:0px;
 		padding-bottom:4em;
@@ -444,7 +469,6 @@ body.blog .col-md-3 {
 /*
 
 This is where Andrew Left off trying to format the SASS. Dec2014.
-
 Someone will be assigned to finish. 
 
 */
@@ -500,76 +524,37 @@ Someone will be assigned to finish.
 
 
 
-
-
-
-
-#mega-footer, 
-#footer {
+/* 	Footer  - This needs work - Marked off is build of widget section. 
+====================================
+*/
+#mega-footer, #footer {
 	border-top:1px solid transparent;
 	border-top-color: $sh-mega-footer-border-color;
 }
 #mega-footer+#footer {
 	border-top:none;
-}  
-
-
-#mega-footer {
-	.col-sm-2 {
-		.widget_search {
-			padding-left:0px;
-			padding-right:0px;
-		}
-			form {
-				margin:1em 0;
-			}
-				.form-inline .form-control {
-					width:76%;
-
-					@media (max-width: 1200px) {
-						width:70%;			
-					}
-					@media (max-width: 991px) {
-						width:58%;			
-					}
-				} 
-				.navbar-form .form-control {
-					width:76%;
-
-					@media (max-width: 1200px) {
-						width:70%;			
-					}
-					@media (max-width: 991px) {
-						width:58%;			
-					}
-				}
-
-	}
-	.col-sm-3 {
-
-		.widget_search {
-			padding-left:0px;
-			padding-right:0px;
+}
+/* 	Footer Widgets - With Color Variables
+====================================
+*/
+#mega-footer{
+	.widget{
+		.widget-head{
+			h2{
+			 color:$sh-mega-footer-widget-heading;	 
 			}
-			form {
-				margin:1em 0;
+		}
+		&.widget_search{
+			.btn.btn-default{
+				background-color: $search-bg-color;
+				color: $search-text-color;
+				border: 1px solid $search-bg-color;
 			}
-				.form-inline .form-control {
-					width:81%;		
-
-					@media (max-width: 991px) {
-						width:75%;			
-					}
-				} 
-				.navbar-form .form-control {
-					width:76%;
-
-					@media (max-width: 991px) {
-						width:75%;			
-					}
-				}
-
+		}	
 	}
+}
+
+#mega-footer {
 	.btn {
 		@media (max-width: 767px) {
 			float:left;
@@ -590,10 +575,7 @@ Someone will be assigned to finish.
 		border-top-color:$sh-table-border;
 	}
 }
-
-#mega-footer .widget .widget-head h2 {
-	color:$sh-mega-footer-widget-heading;	 
-}
+
 
 #mega-footer li {
 	font-size:13px;
@@ -611,8 +593,9 @@ table .external .glyphicon-new-window {
 
 
 
-// Events Calendar Grid 
-
+/* 	Events Calendar Grid 
+====================================
+*/
 #vb {
 	#vb-timespan {
 		a {
@@ -630,8 +613,8 @@ table .external .glyphicon-new-window {
 	}
 }
 
-/*
-	 Profile Page
+/* 	Profile Page
+====================================
 */
 .page-template-page-user-profile-php {
 

diff --git a/sass/sherman-red.scss b/sass/sherman-red.scss
@@ -7,4 +7,4 @@
 // loads bootstrap, and cornerstone. 
 @import "../../cornerstone/style.scss";
 // Now... load styles that are particular to sherman. The gradient header, for instance. 
-@import "sherman-common.scss";
+@import "sherman-common.scss"; 
diff --git a/sass/sherman-variables-black.scss b/sass/sherman-variables-black.scss
@@ -11,7 +11,7 @@
 
 */
 
-$header-border:		#414141;
+$header-border:		#363636;
 
 $title_parent:			#eee;
 $title_parentHover: 	darken($title_parent, 15%);
@@ -100,7 +100,15 @@ $sh-mega-footer-border-color:  						#414141;
 $sh-header1-color:		#343434;
 $sh-header3-color:		#717073;
 
-/*Search Form */
+/* Main Search Form */
 $searchText: #fff;
 $searchPlacehoderText: rgba($searchText, .5);
-$searchBackground: rgba(255, 255, 255, .15);
+$searchBackground: rgba(255, 255, 255, .15);
+
+/* Body Search Form */
+$body-search-bg-color: 		rgba(0, 0, 0, .12);
+$body-search-text-color:	#363636;
+
+/* Widget Search Form */
+$search-bg-color: 		#878787;
+$search-text-color:		#ffffff;
diff --git a/sass/sherman-variables-blue.scss b/sass/sherman-variables-blue.scss
@@ -99,7 +99,15 @@ $sh-mega-footer-border-color: 		#233e75;
 $sh-header1-color:		#ac0000;
 $sh-header3-color:		#4C608A;
 
-/*Search Form */
+/* Main Search Form */
 $searchText: #fff;
 $searchPlacehoderText: rgba($searchText, .5);
-$searchBackground: rgba(255, 255, 255, .15);
+$searchBackground: rgba(255, 255, 255, .15);
+
+/* Body Search Form */
+$body-search-bg-color: 		rgba(0, 0, 0, .12);
+$body-search-text-color:	#081B39;
+
+/* Widget Search Form */
+$search-bg-color: 		#878787;
+$search-text-color:		#ffffff;
diff --git a/sass/sherman-variables-common.scss b/sass/sherman-variables-common.scss
@@ -1,3 +1,7 @@
+$uc-font-path: "../../../global/fonts";
+
+//$icon-font-path: "../../../global/bootstrap-sass-master/assets/fonts/bootstrap/"    !default;
+
 $contentPadding:				31px 0 4em;
 
 $headings-font-weight: 		bold;

diff --git a/sass/sherman-variables-grey.scss b/sass/sherman-variables-grey.scss
@@ -84,7 +84,7 @@ $sh-navbar-toggle-background-color-active: 		rgba(0,0,0, .6);
 
 $sh-icon-bar-background-color: 					rgba(255,255,255, .5);
 
-$sh-current-menu-ancestor-dropdown-toggle: 				white;
+$sh-current-menu-ancestor-dropdown-toggle: 				rgba(7,26,56, 1);
 $sh-navbar-collapse-dropdown-menu-background-color: 	#091733;
 
 $sh-nav-secondary-border-color: 	#fff;
@@ -98,7 +98,19 @@ $sh-mega-footer-border-color:  		#fff;
 $sh-header1-color:		#ac0000;
 $sh-header3-color:		#717073;
 
-/*Search Form */
+/* Main Search Form */
 $searchText: #212121;
 $searchPlacehoderText: rgba($searchText, .5);
 $searchBackground: rgba(255, 255, 255, .7);
+
+/* Body Search Form */
+$body-search-bg-color: 		rgba(0, 0, 0, .12);
+$body-search-text-color:	#363636;
+
+
+/* Widget Search Form */
+$search-bg-color: 		#878787;
+$search-text-color:		#ffffff;
+
+
+