spruce: fix label text on modal label (thanks andrew!)

3 files changed, 16 insertions, 6 deletions

diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css
index b78c94e0..bb91c3dd 100644
--- a/spruce/bootstrap.css
+++ b/spruce/bootstrap.css
@@ -4784,6 +4784,10 @@ legend {
   -moz-box-shadow: none;
   box-shadow: none;
 }
+.modal-body label,
+.modal-footer label {
+  color: #013435;
+}
 .modal-footer {
   -webkit-border-radius: 0 0 4px 4px;
   -moz-border-radius: 0 0 4px 4px;
diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css
index ed06a148..480d0899 100644
--- a/spruce/bootstrap.min.css
+++ b/spruce/bootstrap.min.css
@@ -727,7 +727,7 @@ code,pre{color:#026567;background-color:#f5f3dc;}
 .navbar .brand{font-size:26px;padding:18px 20px 12px;}
 .navbar .nav>li>a{font-size:20px;padding:22px 10px 11px;}
 .navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ebd90b;}
-.navbar .navbar-text{font-size:20px;padding-top:12px;}
+.navbar .navbar-text{font-size:20px;padding:11px 10px 0;}
 .navbar .navbar-search{margin-top:12px;}
 .navbar .navbar-search .search-query{border-color:transparent;padding:6px 9px 2px 9px;background-color:rgba(255, 255, 255, 0.4);}
 .navbar .nav>.open>a{color:#ebd90b;}
@@ -736,7 +736,7 @@ code,pre{color:#026567;background-color:#f5f3dc;}
 .navbar .btn-navbar{margin-top:14px;}
 .navbar .nav-collapse.in .nav li>a{color:#f5f3dc;}.navbar .nav-collapse.in .nav li>a:hover{color:#ebd90b;background-color:#01584c;}
 .navbar .navbar-form,.navbar .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
-div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{color:#f5f3dc;border-color:transparent;background-color:transparent;}
+div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{padding:13px 12px 9px;border-color:transparent;background-color:transparent;color:#f5f3dc;}
 div.subnav .nav>li+li>a{border-color:transparent;}
 div.subnav .nav>li.active>a,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;border-color:transparent;color:#ebd90b;}
 div.subnav .dropdown.open>.dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;}
@@ -793,8 +793,8 @@ input,textarea,select{color:#013435;}
 .uneditable-input{color:#555555;}
 legend{border-bottom:2px solid #ffffff;}
 .form-actions{border-top:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.modal-header{background-color:#015b4e;}
-.modal-body,.modal-footer{background-color:#f5f3dc;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.modal-header{padding:12px 15px 6px;background-color:#015b4e;}
+.modal-body,.modal-footer{background-color:#f5f3dc;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.modal-body label,.modal-footer label{color:#013435;}
 .modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
 .alert{text-shadow:none;border:none;}
 .label{color:#f5f3dc;opacity:1;text-shadow:none;}
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index a3dee52e..1a47e073 100755
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -86,7 +86,7 @@ code, pre {
 
 	.navbar-text {
 		font-size: 20px;
-		padding-top: 12px;
+		padding: 11px 10px 0;
 	}
 
 	.navbar-search {
@@ -141,9 +141,10 @@ div.subnav {
 	font-size: 18px;
 
 	.nav > li > a {
-		color: @linkColor;
+		padding: 13px 12px 9px;
 		border-color: transparent;
 		background-color: transparent;
+		color: @linkColor;
 	}
 
 	.nav > li + li > a {
@@ -451,6 +452,7 @@ legend {
 // --------------------------------------------------
 
 .modal-header {
+	padding: 12px 15px 6px;
 	background-color: @green;
 }
 
@@ -459,6 +461,10 @@ legend {
 	background-color: @linkColor;
 	border: none;
 	.box-shadow(none);
+
+	label {
+		color: @textColor;
+	}
 }
 
 .modal-footer {