Commit 3d8d73f5 authored by Thomas Park's avatar Thomas Park
Browse files

amelia: fixes #72, icon padding, btn padding, control-group

parent 5e18496e
...@@ -687,39 +687,39 @@ a.muted:focus { ...@@ -687,39 +687,39 @@ a.muted:focus {
} }
.text-warning { .text-warning {
color: #c09853; color: rgba(255, 255, 255, 0.9);
} }
a.text-warning:hover, a.text-warning:hover,
a.text-warning:focus { a.text-warning:focus {
color: #a47e3c; color: rgba(230, 230, 230, 0.9);
} }
.text-error { .text-error {
color: #b94a48; color: rgba(255, 255, 255, 0.9);
} }
a.text-error:hover, a.text-error:hover,
a.text-error:focus { a.text-error:focus {
color: #953b39; color: rgba(230, 230, 230, 0.9);
} }
.text-info { .text-info {
color: #3a87ad; color: rgba(255, 255, 255, 0.9);
} }
a.text-info:hover, a.text-info:hover,
a.text-info:focus { a.text-info:focus {
color: #2d6987; color: rgba(230, 230, 230, 0.9);
} }
.text-success { .text-success {
color: #468847; color: rgba(255, 255, 255, 0.9);
} }
a.text-success:hover, a.text-success:hover,
a.text-success:focus { a.text-success:focus {
color: #356635; color: rgba(230, 230, 230, 0.9);
} }
.text-left { .text-left {
...@@ -1459,7 +1459,7 @@ input[type="checkbox"][readonly] { ...@@ -1459,7 +1459,7 @@ input[type="checkbox"][readonly] {
.control-group.warning .control-label, .control-group.warning .control-label,
.control-group.warning .help-block, .control-group.warning .help-block,
.control-group.warning .help-inline { .control-group.warning .help-inline {
color: #c09853; color: rgba(255, 255, 255, 0.9);
} }
.control-group.warning .checkbox, .control-group.warning .checkbox,
...@@ -1467,13 +1467,13 @@ input[type="checkbox"][readonly] { ...@@ -1467,13 +1467,13 @@ input[type="checkbox"][readonly] {
.control-group.warning input, .control-group.warning input,
.control-group.warning select, .control-group.warning select,
.control-group.warning textarea { .control-group.warning textarea {
color: #c09853; color: rgba(255, 255, 255, 0.9);
} }
.control-group.warning input, .control-group.warning input,
.control-group.warning select, .control-group.warning select,
.control-group.warning textarea { .control-group.warning textarea {
border-color: #c09853; border-color: rgba(255, 255, 255, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
...@@ -1482,23 +1482,23 @@ input[type="checkbox"][readonly] { ...@@ -1482,23 +1482,23 @@ input[type="checkbox"][readonly] {
.control-group.warning input:focus, .control-group.warning input:focus,
.control-group.warning select:focus, .control-group.warning select:focus,
.control-group.warning textarea:focus { .control-group.warning textarea:focus {
border-color: #a47e3c; border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
} }
.control-group.warning .input-prepend .add-on, .control-group.warning .input-prepend .add-on,
.control-group.warning .input-append .add-on { .control-group.warning .input-append .add-on {
color: #c09853; color: rgba(255, 255, 255, 0.9);
background-color: #fcf8e3; background-color: #df6e1e;
border-color: #c09853; border-color: rgba(255, 255, 255, 0.9);
} }
.control-group.error .control-label, .control-group.error .control-label,
.control-group.error .help-block, .control-group.error .help-block,
.control-group.error .help-inline { .control-group.error .help-inline {
color: #b94a48; color: rgba(255, 255, 255, 0.9);
} }
.control-group.error .checkbox, .control-group.error .checkbox,
...@@ -1506,13 +1506,13 @@ input[type="checkbox"][readonly] { ...@@ -1506,13 +1506,13 @@ input[type="checkbox"][readonly] {
.control-group.error input, .control-group.error input,
.control-group.error select, .control-group.error select,
.control-group.error textarea { .control-group.error textarea {
color: #b94a48; color: rgba(255, 255, 255, 0.9);
} }
.control-group.error input, .control-group.error input,
.control-group.error select, .control-group.error select,
.control-group.error textarea { .control-group.error textarea {
border-color: #b94a48; border-color: rgba(255, 255, 255, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
...@@ -1521,23 +1521,23 @@ input[type="checkbox"][readonly] { ...@@ -1521,23 +1521,23 @@ input[type="checkbox"][readonly] {
.control-group.error input:focus, .control-group.error input:focus,
.control-group.error select:focus, .control-group.error select:focus,
.control-group.error textarea:focus { .control-group.error textarea:focus {
border-color: #953b39; border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
} }
.control-group.error .input-prepend .add-on, .control-group.error .input-prepend .add-on,
.control-group.error .input-append .add-on { .control-group.error .input-append .add-on {
color: #b94a48; color: rgba(255, 255, 255, 0.9);
background-color: #f2dede; background-color: #ad1d28;
border-color: #b94a48; border-color: rgba(255, 255, 255, 0.9);
} }
.control-group.success .control-label, .control-group.success .control-label,
.control-group.success .help-block, .control-group.success .help-block,
.control-group.success .help-inline { .control-group.success .help-inline {
color: #468847; color: rgba(255, 255, 255, 0.9);
} }
.control-group.success .checkbox, .control-group.success .checkbox,
...@@ -1545,13 +1545,13 @@ input[type="checkbox"][readonly] { ...@@ -1545,13 +1545,13 @@ input[type="checkbox"][readonly] {
.control-group.success input, .control-group.success input,
.control-group.success select, .control-group.success select,
.control-group.success textarea { .control-group.success textarea {
color: #468847; color: rgba(255, 255, 255, 0.9);
} }
.control-group.success input, .control-group.success input,
.control-group.success select, .control-group.success select,
.control-group.success textarea { .control-group.success textarea {
border-color: #468847; border-color: rgba(255, 255, 255, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
...@@ -1560,23 +1560,23 @@ input[type="checkbox"][readonly] { ...@@ -1560,23 +1560,23 @@ input[type="checkbox"][readonly] {
.control-group.success input:focus, .control-group.success input:focus,
.control-group.success select:focus, .control-group.success select:focus,
.control-group.success textarea:focus { .control-group.success textarea:focus {
border-color: #356635; border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
} }
.control-group.success .input-prepend .add-on, .control-group.success .input-prepend .add-on,
.control-group.success .input-append .add-on { .control-group.success .input-append .add-on {
color: #468847; color: rgba(255, 255, 255, 0.9);
background-color: #dff0d8; background-color: #48ca3b;
border-color: #468847; border-color: rgba(255, 255, 255, 0.9);
} }
.control-group.info .control-label, .control-group.info .control-label,
.control-group.info .help-block, .control-group.info .help-block,
.control-group.info .help-inline { .control-group.info .help-inline {
color: #3a87ad; color: rgba(255, 255, 255, 0.9);
} }
.control-group.info .checkbox, .control-group.info .checkbox,
...@@ -1584,13 +1584,13 @@ input[type="checkbox"][readonly] { ...@@ -1584,13 +1584,13 @@ input[type="checkbox"][readonly] {
.control-group.info input, .control-group.info input,
.control-group.info select, .control-group.info select,
.control-group.info textarea { .control-group.info textarea {
color: #3a87ad; color: rgba(255, 255, 255, 0.9);
} }
.control-group.info input, .control-group.info input,
.control-group.info select, .control-group.info select,
.control-group.info textarea { .control-group.info textarea {
border-color: #3a87ad; border-color: rgba(255, 255, 255, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
...@@ -1599,17 +1599,17 @@ input[type="checkbox"][readonly] { ...@@ -1599,17 +1599,17 @@ input[type="checkbox"][readonly] {
.control-group.info input:focus, .control-group.info input:focus,
.control-group.info select:focus, .control-group.info select:focus,
.control-group.info textarea:focus { .control-group.info textarea:focus {
border-color: #2d6987; border-color: rgba(230, 230, 230, 0.9);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(255, 255, 255, 0.9);
} }
.control-group.info .input-prepend .add-on, .control-group.info .input-prepend .add-on,
.control-group.info .input-append .add-on { .control-group.info .input-append .add-on {
color: #3a87ad; color: rgba(255, 255, 255, 0.9);
background-color: #d9edf7; background-color: #4d3a7d;
border-color: #3a87ad; border-color: rgba(255, 255, 255, 0.9);
} }
input:focus:invalid, input:focus:invalid,
...@@ -2244,35 +2244,35 @@ table th[class*="span"], ...@@ -2244,35 +2244,35 @@ table th[class*="span"],
} }
.table tbody tr.success > td { .table tbody tr.success > td {
background-color: #dff0d8; background-color: #48ca3b;
} }
.table tbody tr.error > td { .table tbody tr.error > td {
background-color: #f2dede; background-color: #ad1d28;
} }
.table tbody tr.warning > td { .table tbody tr.warning > td {
background-color: #fcf8e3; background-color: #df6e1e;
} }
.table tbody tr.info > td { .table tbody tr.info > td {
background-color: #d9edf7; background-color: #4d3a7d;
} }
.table-hover tbody tr.success:hover > td { .table-hover tbody tr.success:hover > td {
background-color: #d0e9c6; background-color: #3eb932;
} }
.table-hover tbody tr.error:hover > td { .table-hover tbody tr.error:hover > td {
background-color: #ebcccc; background-color: #971923;
} }
.table-hover tbody tr.warning:hover > td { .table-hover tbody tr.warning:hover > td {
background-color: #faf2cc; background-color: #c9631b;
} }
.table-hover tbody tr.info:hover > td { .table-hover tbody tr.info:hover > td {
background-color: #c4e3f3; background-color: #42326c;
} }
[class^="icon-"], [class^="icon-"],
...@@ -3870,8 +3870,8 @@ input[type="submit"].btn.btn-mini { ...@@ -3870,8 +3870,8 @@ input[type="submit"].btn.btn-mini {
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
margin-bottom: 20px; margin-bottom: 20px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #fcf8e3; background-color: #df6e1e;
border: 1px solid #fbeed5; border: 1px solid #d2491c;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;
...@@ -3879,7 +3879,7 @@ input[type="submit"].btn.btn-mini { ...@@ -3879,7 +3879,7 @@ input[type="submit"].btn.btn-mini {
.alert, .alert,
.alert h4 { .alert h4 {
color: #c09853; color: rgba(255, 255, 255, 0.9);
} }
.alert h4 { .alert h4 {
...@@ -3894,35 +3894,35 @@ input[type="submit"].btn.btn-mini { ...@@ -3894,35 +3894,35 @@ input[type="submit"].btn.btn-mini {
} }
.alert-success { .alert-success {
color: #468847; color: rgba(255, 255, 255, 0.9);
background-color: #dff0d8; background-color: #48ca3b;
border-color: #d6e9c6; border-color: #55b932;
} }
.alert-success h4 { .alert-success h4 {
color: #468847; color: rgba(255, 255, 255, 0.9);
} }
.alert-danger, .alert-danger,
.alert-error { .alert-error {
color: #b94a48; color: rgba(255, 255, 255, 0.9);
background-color: #f2dede; background-color: #ad1d28;
border-color: #eed3d7; border-color: #a01b3b;
} }
.alert-danger h4, .alert-danger h4,
.alert-error h4 { .alert-error h4 {
color: #b94a48; color: rgba(255, 255, 255, 0.9);
} }
.alert-info { .alert-info {
color: #3a87ad; color: rgba(255, 255, 255, 0.9);
background-color: #d9edf7; background-color: #4d3a7d;
border-color: #bce8f1; border-color: #352f65;
} }
.alert-info h4 { .alert-info h4 {
color: #3a87ad; color: rgba(255, 255, 255, 0.9);
} }
.alert-block { .alert-block {
...@@ -5665,12 +5665,12 @@ a.badge:focus { ...@@ -5665,12 +5665,12 @@ a.badge:focus {
.label-important, .label-important,
.badge-important { .badge-important {
background-color: #b94a48; background-color: rgba(255, 255, 255, 0.9);
} }
.label-important[href], .label-important[href],
.badge-important[href] { .badge-important[href] {
background-color: #953b39; background-color: rgba(230, 230, 230, 0.9);
} }
.label-warning, .label-warning,
...@@ -5685,22 +5685,22 @@ a.badge:focus { ...@@ -5685,22 +5685,22 @@ a.badge:focus {
.label-success, .label-success,
.badge-success { .badge-success {
background-color: #468847; background-color: rgba(255, 255, 255, 0.9);
} }
.label-success[href], .label-success[href],
.badge-success[href] { .badge-success[href] {
background-color: #356635; background-color: rgba(230, 230, 230, 0.9);
} }
.label-info, .label-info,
.badge-info { .badge-info {
background-color: #3a87ad; background-color: rgba(255, 255, 255, 0.9);
} }
.label-info[href], .label-info[href],
.badge-info[href] { .badge-info[href] {
background-color: #2d6987; background-color: rgba(230, 230, 230, 0.9);
} }
.label-inverse, .label-inverse,
...@@ -6297,6 +6297,10 @@ hr { ...@@ -6297,6 +6297,10 @@ hr {
.navbar .nav-collapse .nav-header { .navbar .nav-collapse .nav-header {
color: rgba(255, 255, 255, 0.5); color: rgba(255, 255, 255, 0.5);
} }
.navbar-inverse .nav-collapse .nav > li > a,
.navbar-inverse .nav-collapse .dropdown-menu a {
color: #ffffff !important;
}
.navbar-inverse .nav-collapse .nav li > a:hover, .navbar-inverse .nav-collapse .nav li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover { .navbar-inverse .nav-collapse .dropdown-menu a:hover {
background-color: #e5c953 !important; background-color: #e5c953 !important;
...@@ -6552,6 +6556,18 @@ div.subnav-fixed { ...@@ -6552,6 +6556,18 @@ div.subnav-fixed {
background-color: #b7b7b7 \9; background-color: #b7b7b7 \9;
} }
.btn-large {
padding: 20px 24px;
}
.btn-small {
padding: 8px 12px;
}
.btn-mini {
padding: 4px 8px;
}
.btn-group .btn:first-child { .btn-group .btn:first-child {
margin-left: 0; margin-left: 0;
-webkit-border-radius: 0; -webkit-border-radius: 0;
...@@ -6763,12 +6779,6 @@ div.subnav-fixed { ...@@ -6763,12 +6779,6 @@ div.subnav-fixed {
background-color: #6b1219 \9; background-color: #6b1219 \9;
} }
[class^="icon-"],
[class*=" icon-"] {
margin-top: 2px;
margin-right: 8px;