amelia: fixes #29, form colors in modal

4 files changed, 83 insertions, 34 deletions

diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 33ab0854..2e932131 100644
--- a/amelia/bootstrap.css
+++ b/amelia/bootstrap.css
@@ -2222,30 +2222,30 @@ table .span24 {
 .dropdown-submenu:hover > a {
   text-decoration: none;
   color: #ffffff;
-  background-color: #e51925;
-  background-color: #dc1824;
-  background-image: -moz-linear-gradient(top, #e51925, #ce1621);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e51925), to(#ce1621));
-  background-image: -webkit-linear-gradient(top, #e51925, #ce1621);
-  background-image: -o-linear-gradient(top, #e51925, #ce1621);
-  background-image: linear-gradient(to bottom, #e51925, #ce1621);
+  background-color: #ad1d28;
+  background-color: #a41c26;
+  background-image: -moz-linear-gradient(top, #ad1d28, #971923);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#971923));
+  background-image: -webkit-linear-gradient(top, #ad1d28, #971923);
+  background-image: -o-linear-gradient(top, #ad1d28, #971923);
+  background-image: linear-gradient(to bottom, #ad1d28, #971923);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe51925', endColorstr='#ffce1621', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ff971923', GradientType=0);
 }
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: #ffffff;
   text-decoration: none;
   outline: 0;
-  background-color: #e51925;
-  background-color: #dc1824;
-  background-image: -moz-linear-gradient(top, #e51925, #ce1621);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e51925), to(#ce1621));
-  background-image: -webkit-linear-gradient(top, #e51925, #ce1621);
-  background-image: -o-linear-gradient(top, #e51925, #ce1621);
-  background-image: linear-gradient(to bottom, #e51925, #ce1621);
+  background-color: #ad1d28;
+  background-color: #a41c26;
+  background-image: -moz-linear-gradient(top, #ad1d28, #971923);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#971923));
+  background-image: -webkit-linear-gradient(top, #ad1d28, #971923);
+  background-image: -o-linear-gradient(top, #ad1d28, #971923);
+  background-image: linear-gradient(to bottom, #ad1d28, #971923);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe51925', endColorstr='#ffce1621', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ff971923', GradientType=0);
 }
 .dropdown-menu .disabled > a,
 .dropdown-menu .disabled > a:hover {
@@ -5154,7 +5154,7 @@ div.subnav-fixed {
   background-color: #48ca3b;
 }
 .table tbody tr.error td {
-  background-color: #e51925;
+  background-color: #ad1d28;
 }
 .table tbody tr.info td {
   background-color: #00bce1;
@@ -5374,10 +5374,33 @@ textarea,
   border-radius: 0;
 }
 .modal-header {
-  color: #ad1d28;
+  background-color: #ad1d28;
+  color: #ffffff;
 }
 .modal-body {
-  color: #003f4d;
+  color: #333333;
+}
+.modal-body h1,
+.modal-body h2,
+.modal-body h3,
+.modal-body h4,
+.modal-body h5,
+.modal-body h6,
+.modal-body legend {
+  color: #ad1d28;
+}
+.modal-body label,
+.modal-body .input-file {
+  color: #333333;
+}
+.modal-body .help-block,
+.modal-body .help-inline {
+  color: #aaaaaa;
+}
+.modal-body textarea,
+.modal-body input,
+.modal-body .uneditable-input {
+  border: 1px solid #aaaaaa;
 }
 .alert,
 .label,
@@ -5458,7 +5481,7 @@ pre {
   background-color: #df6e1e;
 }
 .progress .bar-error {
-  background-color: #e51925;
+  background-color: #ad1d28;
 }
 .progress-danger .bar {
   background-image: none;
@@ -5497,7 +5520,7 @@ pre {
   background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
 .thumbnail {
-  border: 0px solid transparent;
+  border: 0 solid transparent;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
index 73e1d0a6..ea93903f 100644
--- a/amelia/bootstrap.min.css
+++ b/amelia/bootstrap.min.css
@@ -441,8 +441,8 @@ table .span24{float:none;width:1884px;margin-left:0;}
 .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;}
 .dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
 .dropdown-menu a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;}
-.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#e51925;background-color:#dc1824;background-image:-moz-linear-gradient(top, #e51925, #ce1621);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e51925), to(#ce1621));background-image:-webkit-linear-gradient(top, #e51925, #ce1621);background-image:-o-linear-gradient(top, #e51925, #ce1621);background-image:linear-gradient(to bottom, #e51925, #ce1621);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe51925', endColorstr='#ffce1621', GradientType=0);}
-.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#e51925;background-color:#dc1824;background-image:-moz-linear-gradient(top, #e51925, #ce1621);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e51925), to(#ce1621));background-image:-webkit-linear-gradient(top, #e51925, #ce1621);background-image:-o-linear-gradient(top, #e51925, #ce1621);background-image:linear-gradient(to bottom, #e51925, #ce1621);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe51925', endColorstr='#ffce1621', GradientType=0);}
+.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#ad1d28;background-color:#a41c26;background-image:-moz-linear-gradient(top, #ad1d28, #971923);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#971923));background-image:-webkit-linear-gradient(top, #ad1d28, #971923);background-image:-o-linear-gradient(top, #ad1d28, #971923);background-image:linear-gradient(to bottom, #ad1d28, #971923);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ff971923', GradientType=0);}
+.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#ad1d28;background-color:#a41c26;background-image:-moz-linear-gradient(top, #ad1d28, #971923);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#971923));background-image:-webkit-linear-gradient(top, #ad1d28, #971923);background-image:-o-linear-gradient(top, #ad1d28, #971923);background-image:linear-gradient(to bottom, #ad1d28, #971923);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ff971923', GradientType=0);}
 .dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#aaaaaa;}
 .dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;}
 .open{*z-index:1000;}.open >.dropdown-menu{display:block;}
@@ -866,7 +866,7 @@ div.subnav-fixed{top:50px;}
 .table th,.table td,.table tbody+tbody{border-top:0px solid transparent;}
 .table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 .table tbody tr.success td{background-color:#48ca3b;}
-.table tbody tr.error td{background-color:#e51925;}
+.table tbody tr.error td{background-color:#ad1d28;}
 .table tbody tr.info td{background-color:#00bce1;}
 legend,label,.help-block,.input-file{color:rgba(255, 255, 255, 0.9);border:0px solid transparent;}
 input,textarea,.uneditable-input{border:0px solid transparent;padding:10px;}
@@ -904,8 +904,11 @@ input,textarea,.search-query,.uneditable-input,.input-append input,.input-append
 .nav-list li.active>a,.nav-list li:active>a,.nav-list li>a:hover,.nav-list li.active>a:hover,.nav-list li:active>a:hover{background-color:#8AD5DC;text-shadow:none;}
 .nav-list .divider{background-color:rgba(255, 255, 255, 0.3);border-bottom:none;}
 .modal{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
-.modal-header{color:#ad1d28;}
-.modal-body{color:#003f4d;}
+.modal-header{background-color:#ad1d28;color:#ffffff;}
+.modal-body{color:#333333;}.modal-body h1,.modal-body h2,.modal-body h3,.modal-body h4,.modal-body h5,.modal-body h6,.modal-body legend{color:#ad1d28;}
+.modal-body label,.modal-body .input-file{color:#333333;}
+.modal-body .help-block,.modal-body .help-inline{color:#aaaaaa;}
+.modal-body textarea,.modal-body input,.modal-body .uneditable-input{border:1px solid #aaaaaa;}
 .alert,.label,.progress,.well,pre,code{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;text-shadow:none;}
 .hero-unit{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
 code,pre{background-color:rgba(255, 255, 255, 0.3);padding:2px;}
@@ -918,14 +921,14 @@ code,pre{background-color:rgba(255, 255, 255, 0.3);padding:2px;}
 .alert-heading{color:rgba(255, 255, 255, 0.9);}
 .progress{background-image:none;background-color:#27666D;}.progress .bar{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-image:none;background-color:#debb27;}.progress .bar-success{background-color:#48ca3b;}
 .progress .bar-warning{background-color:#df6e1e;}
-.progress .bar-error{background-color:#e51925;}
+.progress .bar-error{background-color:#ad1d28;}
 .progress-danger .bar{background-image:none;background-color:#AD1D28;}
 .progress-danger.progress-striped .bar{background-color:#ad1d28;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .progress-success .bar{background-image:none;background-color:#48ca3b;}
 .progress-success.progress-striped .bar{background-color:#48ca3b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .progress-info .bar{background-image:none;background-color:#00bce1;}
 .progress-info.progress-striped .bar{background-color:#00bce1;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
-.thumbnail{border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.thumbnail{border:0 solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 blockquote{border-left-color:#1cafbd;}blockquote.pull-right{border-right-color:#1cafbd;}
 blockquote small{color:rgba(255, 255, 255, 0.6);}
 .pull-right{float:right;}
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
index 842c959e..692c1110 100755
--- a/amelia/bootswatch.less
+++ b/amelia/bootswatch.less
@@ -549,11 +549,34 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .modal-header {
-	color: @navbarBackground;
+	background-color: @navbarBackground;
+	color: @white;
 }
 
 .modal-body {
-	color: @bodyBackground;
+	
+	color: @grayDark;
+
+	h1, h2, h3, h4, h5, h6,
+	legend {
+		color: @red;
+	}
+
+	label,
+	.input-file {
+		color: @grayDark;
+	}
+
+	.help-block,
+	.help-inline {
+		color: @grayLight;
+	}
+
+	textarea,
+	input,
+	.uneditable-input {
+		border: 1px solid @grayLight;
+	}
 }
 
 // MISCELLANEOUS
@@ -657,7 +680,7 @@ code, pre {
 }
 
 .thumbnail {
-	border: 0px solid transparent;
+	border: 0 solid transparent;
 	.border-radius(0);
 	.box-shadow(none);
 }
diff --git a/amelia/variables.less b/amelia/variables.less
index 92b44a06..cf089641 100755
--- a/amelia/variables.less
+++ b/amelia/variables.less
@@ -25,7 +25,7 @@
 @blue:                  #00BCE1;
 @blueDark:              #1269B0;
 @green:                 #48CA3B;
-@red:                   #E51925;
+@red:                   #AD1D28;
 @yellow:                #DEBB27;
 @orange:                #DF6E1E;
 @pink:                  #FFBCB9;
@@ -159,8 +159,8 @@
 @navbarCollapseWidth:             979px;
 
 @navbarHeight:                    50px;
-@navbarBackground:                #AD1D28;
-@navbarBackgroundHighlight:       #AD1D28;
+@navbarBackground:                @red;
+@navbarBackgroundHighlight:       @red;
 @navbarBorder:                    darken(@navbarBackground, 12%);
 
 @navbarText:                      @white;