Commit 5bf9e74d authored by Thomas Park's avatar Thomas Park
Browse files

Swatch update for Bootstrap 2.0.1

parent e468fb4c
This diff is collapsed.
This diff is collapsed.
......@@ -55,32 +55,40 @@
@zindexModalBackdrop: 1040;
@zindexModal: 1050;
// Sprite icons path
@iconSpritePath: "../img/glyphicons-halflings.png";
@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
// Input placeholder text color
@placeholderText: @grayLight;
// Hr border color
@hrBorder: @grayLighter;
// Navbar
@navbarHeight: 40px;
@navbarBackground: @linkColor;
@navbarBackgroundHighlight: lighten(@linkColor, 10%);
@navbarLinkBackgroundHover: transparent;
@navbarText: @grayLighter;
@navbarLinkColor: @grayLighter;
@navbarLinkColorHover: @white;
// Form states and alerts
@warningText: #908A62;
@warningBackground: #EDEBE1;
@warningText: darken(@linkColor, 20%);
@warningBackground: lighten(@linkColor, 20%);
@warningBorder: darken(spin(@warningBackground, -10), 3%);
@errorText: #C45559;
@errorText: darken(#C45559, 5%);
@errorBackground: #EDDBE3;
@errorBorder: darken(spin(@errorBackground, -10), 3%);
@successText: #565C4C;
@successText: darken(@green, 5%);
@successBackground: #CDB;
@successBorder: darken(spin(@successBackground, -10), 5%);
@infoText: #908A62;
@infoText: darken(#908A62, 5%);
@infoBackground: #EDEBE1;
@infoBorder: darken(spin(@infoBackground, -10), 7%);
......
@import url('http://fonts.googleapis.com/css?family=Droid+Sans:400,700');
/*!
* Bootstrap v2.0.0
* Bootstrap v2.0.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......@@ -34,7 +34,7 @@ html {
-ms-text-size-adjust: 100%;
}
a:focus {
outline: thin dotted;
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
......@@ -95,6 +95,16 @@ textarea {
overflow: auto;
vertical-align: top;
}
.clearfix {
*zoom: 1;
}
.clearfix:before, .clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both;
}
body {
margin: 0;
font-family: 'Droid Sans', sans-serif;
......@@ -213,40 +223,40 @@ a:hover {
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid .span1 {
.row-fluid > .span1 {
width: 6.382978723%;
}
.row-fluid .span2 {
.row-fluid > .span2 {
width: 14.89361702%;
}
.row-fluid .span3 {
.row-fluid > .span3 {
width: 23.404255317%;
}
.row-fluid .span4 {
.row-fluid > .span4 {
width: 31.914893614%;
}
.row-fluid .span5 {
.row-fluid > .span5 {
width: 40.425531911%;
}
.row-fluid .span6 {
.row-fluid > .span6 {
width: 48.93617020799999%;
}
.row-fluid .span7 {
.row-fluid > .span7 {
width: 57.446808505%;
}
.row-fluid .span8 {
.row-fluid > .span8 {
width: 65.95744680199999%;
}
.row-fluid .span9 {
.row-fluid > .span9 {
width: 74.468085099%;
}
.row-fluid .span10 {
.row-fluid > .span10 {
width: 82.97872339599999%;
}
.row-fluid .span11 {
.row-fluid > .span11 {
width: 91.489361693%;
}
.row-fluid .span12 {
.row-fluid > .span12 {
width: 99.99999998999999%;
}
.container {
......@@ -375,7 +385,7 @@ ol {
li {
line-height: 18px;
}
ul.unstyled {
ul.unstyled, ol.unstyled {
margin-left: 0;
list-style: none;
}
......@@ -394,7 +404,7 @@ dd {
hr {
margin: 18px 0;
border: 0;
border-top: 1px solid #e5e5e5;
border-top: 1px solid #282828;
border-bottom: 1px solid #ffffff;
}
strong {
......@@ -489,13 +499,20 @@ pre {
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
}
pre.prettyprint {
margin-bottom: 18px;
}
pre code {
padding: 0;
color: inherit;
background-color: transparent;
border: 0;
}
.pre-scrollable {
max-height: 340px;
overflow-y: scroll;
}
form {
margin: 0 0 18px;
......@@ -516,16 +533,25 @@ legend {
border: 0;
border-bottom: 1px solid #eee;
}
legend small {
font-size: 13.5px;
color: #adafae;
}
label,
input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
line-height: 18px;
}
input,
button,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
label {
display: block;
margin-bottom: 5px;
......@@ -564,13 +590,19 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
/* IE7 */
line-height: normal;
border: 0;
cursor: pointer;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
border: 0 \9;
/* IE9 and down */
}
input[type="image"] {
border: 0;
}
input[type="file"] {
width: auto;
padding: initial;
line-height: initial;
border: initial;
......@@ -593,6 +625,9 @@ select, input[type="file"] {
line-height: 28px;
}
input[type="file"] {
line-height: 18px \9;
}
select {
width: 220px;
background-color: #ffffff;
......@@ -623,15 +658,13 @@ input[type="hidden"] {
}
.radio.inline, .checkbox.inline {
display: inline-block;
padding-top: 5px;
margin-bottom: 0;
vertical-align: middle;
}
.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
margin-left: 10px;
}
.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
padding-top: 0;
}
input, textarea {
-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);
......@@ -649,14 +682,17 @@ input:focus, textarea:focus {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
outline: 0;
outline: thin dotted \9;
/* IE6-8 */
/* IE6-9 */
}
input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus,
select:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
outline: thin dotted;
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
......@@ -818,6 +854,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
color: #adafae;
}
.help-block {
display: block;
margin-top: 5px;
margin-bottom: 0;
color: #adafae;
......@@ -899,6 +936,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
border-radius: 3px 0 0 3px;
}
.input-append .uneditable-input {
border-left-color: #eee;
border-right-color: #ccc;
}
.input-append .add-on {
......@@ -940,6 +978,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
display: inline-block;
margin-bottom: 0;
}
.form-search .hide, .form-inline .hide, .form-horizontal .hide {
display: none;
}
.form-search label,
.form-inline label,
.form-search .input-append,
......@@ -954,10 +995,17 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
.form-inline .input-prepend .add-on {
vertical-align: middle;
}
.form-search .radio,
.form-inline .radio,
.form-search .checkbox,
.form-inline .checkbox {
margin-bottom: 0;
vertical-align: middle;
}
.control-group {
margin-bottom: 9px;
}
.form-horizontal legend + .control-group {
legend + .control-group {
margin-top: 18px;
-webkit-margin-top-collapse: separate;
}
......@@ -972,7 +1020,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
.form-horizontal .control-group:after {
clear: both;
}
.form-horizontal .control-group > label {
.form-horizontal .control-label {
float: left;
width: 140px;
padding-top: 5px;
......@@ -997,14 +1045,14 @@ table {
padding: 8px;
line-height: 18px;
text-align: left;
vertical-align: top;
border-top: 1px solid #ddd;
}
.table th {
font-weight: bold;
vertical-align: bottom;
}
.table td {
vertical-align: top;
.table thead th {
vertical-align: bottom;
}
.table thead:first-child tr th, .table thead:first-child tr td {
border-top: 0;
......@@ -1055,6 +1103,9 @@ table {
.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
background-color: #f9f9f9;
}
.table tbody tr:hover td, .table tbody tr:hover th {
background-color: #f5f5f5;
}
table .span1 {
float: none;
width: 44px;
......@@ -1115,21 +1166,22 @@ table .span12 {
width: 924px;
margin-left: 0;
}
[class^="icon-"] {
[class^="icon-"], [class*=" icon-"] {
display: inline-block;
width: 14px;
height: 14px;
line-height: 14px;
vertical-align: text-top;
background-image: url(../img/glyphicons-halflings.png);
background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
*margin-right: .3em;
}
[class^="icon-"]:last-child {
[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
*margin-left: 0;
}
.icon-white {
background-image: url(../img/glyphicons-halflings-white.png);
background-image: url("../img/glyphicons-halflings-white.png");
}
.icon-glass {
background-position: 0 0;
......@@ -1530,7 +1582,6 @@ table .span12 {
float: left;
display: none;
min-width: 160px;
max-width: 220px;
_width: 160px;
padding: 4px 0;
margin: 0;
......@@ -1659,20 +1710,25 @@ table .span12 {
.btn {
display: inline-block;
padding: 4px 10px 4px;
margin-bottom: 0;
font-size: 13px;
line-height: 18px;
color: #282828;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
background-color: #fafafa;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
background-repeat: no-repeat;
vertical-align: middle;
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(top, #ffffff, #e6e6e6);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #ccc;
border-bottom-color: #bbb;
-webkit-border-radius: 4px;
......@@ -1682,8 +1738,19 @@ table .span12 {
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
cursor: pointer;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
*margin-left: .3em;
}
.btn:hover,
.btn:active,
.btn.active,
.btn.disabled,
.btn[disabled] {
background-color: #e6e6e6;
}
.btn:active, .btn.active {
background-color: #cccccc \9;
}
.btn:first-child {
*margin-left: 0;
}
......@@ -1699,7 +1766,7 @@ table .span12 {
transition: background-position 0.1s linear;
}
.btn:focus {
outline: thin dotted;
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
......@@ -1710,7 +1777,6 @@ table .span12 {
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
color: rgba(0, 0, 0, 0.5);
outline: 0;
}
.btn.disabled, .btn[disabled] {
......@@ -1731,7 +1797,7 @@ table .span12 {
-moz-border-radius: 5px;
border-radius: 5px;
}
.btn-large .icon {
.btn-large [class^="icon-"] {
margin-top: 1px;
}
.btn-small {
......@@ -1739,9 +1805,14 @@ table .span12 {
font-size: 11px;
line-height: 16px;
}
.btn-small .icon {
.btn-small [class^="icon-"] {
margin-top: -1px;
}
.btn-mini {
padding: 2px 6px;
font-size: 11px;
line-height: 14px;
}
.btn-primary,
.btn-primary:hover,
.btn-warning,
......@@ -1751,7 +1822,9 @@ table .span12 {
.btn-success,
.btn-success:hover,
.btn-info,
.btn-info:hover {
.btn-info:hover,
.btn-inverse,
.btn-inverse:hover {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #ffffff;
}
......@@ -1759,7 +1832,8 @@ table .span12 {
.btn-warning.active,
.btn-danger.active,
.btn-success.active,
.btn-info.active {
.btn-info.active,
.btn-dark.active {
color: rgba(255, 255, 255, 0.75);
}
.btn-primary {
......@@ -1882,6 +1956,30 @@ table .span12 {
.btn-info:active, .btn-info.active {
background-color: #24748c \9;
}
.btn-inverse {
background-color: #393939;
background-image: -moz-linear-gradient(top, #454545, #262626);
background-image: -ms-linear-gradient(top, #454545, #262626);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));
background-image: -webkit-linear-gradient(top, #454545, #262626);
background-image: -o-linear-gradient(top, #454545, #262626);
background-image: linear-gradient(top, #454545, #262626);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
border-color: #262626 #262626 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-inverse:hover,
.btn-inverse:active,
.btn-inverse.active,
.btn-inverse.disabled,
.btn-inverse[disabled] {
background-color: #262626;
}
.btn-inverse:active, .btn-inverse.active {
background-color: #0c0c0c \9;
}
button.btn, input[type="submit"].btn {
*padding-top: 2px;
*padding-bottom: 2px;
......@@ -2014,7 +2112,8 @@ button.btn.small, input[type="submit"].btn.small {
.btn-primary .caret,
.btn-danger .caret,
.btn-info .caret,
.btn-success .caret {
.btn-success .caret,
.btn-inverse .caret {
border-top-color: #ffffff;
opacity: 0.75;
filter: alpha(opacity=75);
......@@ -2087,27 +2186,31 @@ button.btn.small, input[type="submit"].btn.small {
text-decoration: none;
background-color: #eeeeee;
}
.nav .nav-header {
display: block;
padding: 3px 15px;
font-size: 11px;
font-weight: bold;
line-height: 18px;
color: #adafae;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
text-transform: uppercase;
}
.nav li + .nav-header {
margin-top: 9px;
}
.nav-list {
padding-left: 14px;
padding-right: 14px;
margin-bottom: 0;
}
.nav-list > li > a, .nav-list .nav-header {
display: block;
padding: 3px 15px;
margin-left: -15px;
margin-right: -15px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.nav-list .nav-header {
font-size: 11px;
font-weight: bold;
line-height: 18px;
color: #adafae;
text-transform: uppercase;
}
.nav-list > li + .nav-header {
margin-top: 9px;
.nav-list > li > a {
padding: 3px 15px;
}
.nav-list .active > a, .nav-list .active > a:hover {
color: #ffffff;
......@@ -2257,6 +2360,9 @@ button.btn.small, input[type="submit"].btn.small {
.tabbable:after {
clear: both;
}
.tab-content {
overflow: hidden;
}
.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
border-bottom: 0;
}
......@@ -2452,6 +2558,13 @@ button.btn.small, input[type="submit"].btn.small {
.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
margin-top: 3px;
}
.navbar-form .input-append, .navbar-form .input-prepend {
margin-top: 6px;
white-space: nowrap;
}
.navbar-form .input-append input, .navbar-form .input-prepend input {
margin-top: 0;
}
.navbar-search {
position: relative;
float: left;
......@@ -2545,7 +2658,6 @@ button.btn.small, input[type="submit"].btn.small {
color: #ffffff;
text-decoration: none;
background-color: #020202;
background-color: rgba(0, 0, 0, 0.5);
}
.navbar .divider-vertical {
height: 40px;
......@@ -2632,7 +2744,7 @@ button.btn.small, input[type="submit"].btn.small {
box-shadow: inset 0 1px 0 #ffffff;
}
.breadcrumb li {
display: inline;
display: inline-block;
text-shadow: 0 1px 0 #ffffff;
}
.breadcrumb .divider {
......@@ -2811,6 +2923,9 @@ button.btn.small, input[type="submit"].btn.small {
.modal-body {
padding: 15px;
}
.modal-body .modal-form {
margin-bottom: 0;
}
.modal-footer {
padding: 14px 15px 15px;
margin-bottom: 0;
......@@ -3046,27 +3161,43 @@ a.thumbnail:hover {
padding: 9px;
}
.label {
padding: 1px 3px 2px;
font-size: 9.75px;
padding: 2px 4px 3px;
font-size: 11.049999999999999px;
font-weight: bold;