Merge pull request #4 from bcd04001/master

End of Day Friday (8/8/14)
weblab · Aug 11, 2014 · 00b5277 · 00b5277
2 parents 6c5db40 + c627ed2
commit 00b5277
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 7 deletions.
diff --git a/sass/variables.scss b/sass/variables.scss
@@ -37,6 +37,7 @@ $navbar-default-link-hover-color:          rgba(255,255,255, 1);
 $navbar-default-link-hover-bg:             transparent;
 $navbar-default-link-active-color:         #fff;
 $navbar-default-link-active-bg:            transparent;
+$nav-secondary-padding:					   8px;
 
 
 
@@ -88,7 +89,7 @@ $footers-link-hover: rgba(255,255,255,1);
 
 $footers-border-color:	#bd2429;
 $footers-border-width:	1px 0 0 0;
-
+$uc-footer-link-spacing: 1.5em;
 
 $megafooter-widget-color:			rgba(255,255,255, 0.6);
 $megafooter-widget-head-color:	#999999!important;

diff --git a/style.css b/style.css
@@ -6816,7 +6816,7 @@ button.close {
 /*	NAV
 --------------------------------------------------------------*/
 #nav-secondary {
-  padding: 5px;
+  padding: 8px;
   border: 1px solid transparent;
   border-color: #cccccc;
   border-radius: 0;
@@ -7855,7 +7855,7 @@ body.sticky #footers {
 
 #footer li {
   display: inline;
-  margin-right: 1em;
+  margin-right: 1.5em;
 }
 
 #footer li:last-child {
@@ -7886,6 +7886,7 @@ body {
 }
 #masthead #uc-site-parent a {
   color: #7c878e;
+  text-transform: uppercase;
 }
 #masthead #uc-site-parent a:hover {
   color: white;
@@ -7998,6 +7999,9 @@ body {
   border: 6px solid transparent;
   border-bottom-color: #e9e9e9;
 }
+#masthead #site-navigation .navbar-collapse .nav li.current-menu-parent a {
+  color: white;
+}
 #masthead #site-navigation .navbar-collapse .nav .dropdown-menu {
   padding: 0;
   margin: 0;
@@ -8031,6 +8035,30 @@ body {
   font-weight: normal;
 }
 
+#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
+  -moz-border-bottom-colors: none;
+  -moz-border-left-colors: none;
+  -moz-border-right-colors: none;
+  -moz-border-top-colors: none;
+  border-color: transparent transparent white;
+  border-image: none;
+  border-style: solid;
+  border-width: 6px;
+  bottom: -1px;
+  content: "";
+  display: block;
+  height: 0;
+  left: 50%;
+  margin-left: -6px;
+  position: absolute;
+  width: 0;
+}
+
+@media (max-width: 767px) {
+  #masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
+    display: none;
+  }
+}
 .uc-cal-event-month {
   padding-bottom: 0 !important;
   padding-top: 0.6em !important;
@@ -8053,6 +8081,7 @@ body {
 
 #main {
   border: 1px solid #eee;
+  border-top: none;
 }
 
 #content .page {
@@ -8105,7 +8134,7 @@ body {
   box-shadow: none;
 }
 
-.btn {
+.form-group .btn {
   border-left: none;
   color: #777777;
 }
@@ -8114,6 +8143,15 @@ body {
   font-size: 12px;
 }
 
+.widget {
+  margin: 0 0 10px;
+}
+
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
 #page-home {
   padding-top: 15px;
 }

diff --git a/style.scss b/style.scss
@@ -37,6 +37,7 @@ body {
 
 	#uc-site-parent a {
 		color:$title_parent;
+		text-transform: uppercase;
 		&:hover {
 			color:$title_parentHover;
 		}
@@ -82,6 +83,7 @@ body {
 				color:$title_txt;
 			}
 		}
+
 
 		.navbar-collapse {
 			padding:0;
@@ -103,7 +105,9 @@ body {
 					border-bottom-color:$dropdown-bg;
 				}
 
-
+				li.current-menu-parent a {
+					color:white;
+				}
 
 				.dropdown-menu {
 					padding:0;
@@ -159,6 +163,31 @@ body {
 	}
 }
 
+#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
+	-moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-top-colors: none;
+    border-color: transparent transparent white;
+    border-image: none;
+    border-style: solid;
+    border-width: 6px;
+    bottom: -1px;
+    content: "";
+    display: block;
+    height: 0;
+    left: 50%;
+    margin-left: -6px;
+    position: absolute;
+    width: 0;
+}
+
+	@media (max-width: 767px) {
+		#masthead #site-navigation .navbar-collapse .nav > li.active:after, #masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
+			display: none;
+		}
+	}
+
 .uc-cal-event-month {
 	padding-bottom:0!important;
 	padding-top:.6em!important;
@@ -182,6 +211,7 @@ body {
 
 #main {
 	border:1px solid #eee;
+	border-top:none;
 }
 
 #content {
@@ -242,7 +272,7 @@ body {
 		border-right:none;
 		box-shadow: none;
 	}
-	.btn {
+	.form-group .btn {
 		border-left:none;
 		color:#777777;
 	}
@@ -251,6 +281,18 @@ body {
 	font-size:12px;
 	}
 
+
+.widget {
+	margin:0 0 10px;
+}
+
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+
+		padding-left:5px;
+		padding-right:5px;
+	}
+
+
 #page-home {
 
 	padding-top:15px;
@@ -294,4 +336,4 @@ table .external .glyphicon-new-window {
 	font-size: 0.8em !important;
     margin-left: 0.4em !important;
     opacity: 0.7 !important;
-} 
+}