Commit 22ba9049 authored by Thomas Park's avatar Thomas Park
Browse files

updated to 2.2.1

parent 6b5f9a06
// Spruce 2.2.1
// Variables
// Swatch: Spruce
// Version: 2.1.1
// --------------------------------------------------
// Global values
// --------------------------------------------------
......@@ -57,6 +57,24 @@
@headingsFontWeight: 700; // instead of browser default, bold
@headingsColor: #F5F3DC; // empty to use BS default, @textColor
// Component sizing
// -------------------------
// Based on 14px font-size and 20px line-height
@fontSizeLarge: @baseFontSize * 1.25; // ~18px
@fontSizeSmall: @baseFontSize * 0.85; // ~12px
@fontSizeMini: @baseFontSize * 0.75; // ~11px
@paddingLarge: 11px 19px; // 44px
@paddingSmall: 2px 10px; // 26px
@paddingMini: 1px 6px; // 24px
@baseBorderRadius: 4px;
@borderRadiusLarge: 6px;
@borderRadiusSmall: 3px;
// Tables
// -------------------------
@tableBackground: #C3C7AE; // overall background-color
......@@ -93,9 +111,11 @@
// -------------------------
@inputBackground: @white;
@inputBorder: #ccc;
@inputBorderRadius: 3px;
@inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter;
@formActionsBackground: transparent;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns
// -------------------------
......@@ -116,6 +136,7 @@
// COMPONENT VARIABLES
// --------------------------------------------------
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
......@@ -157,6 +178,7 @@
// Navbar
// -------------------------
@navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 50px;
@navbarBackgroundHighlight: @navbarBackground;
......
......@@ -2,7 +2,7 @@
@import url(https://fonts.googleapis.com/css?family=Noticia+Text);
/*!
* Bootstrap v2.1.1
* Bootstrap v2.2.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
......@@ -75,7 +75,8 @@ img {
border: 0;
-ms-interpolation-mode: bicubic;
}
#map_canvas img {
#map_canvas img,
.google-maps img {
max-width: none;
}
button,
......@@ -97,11 +98,11 @@ input::-moz-focus-inner {
border: 0;
}
button,
input[type="button"],
html input[type="button"],
input[type="reset"],
input[type="submit"] {
cursor: pointer;
-webkit-appearance: button;
cursor: pointer;
}
input[type="search"] {
-webkit-box-sizing: content-box;
......@@ -302,6 +303,9 @@ a:hover {
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.127659574468085%;
}
.row-fluid .span12 {
width: 100%;
*width: 99.94680851063829%;
......@@ -509,15 +513,27 @@ cite {
.text-warning {
color: #c09853;
}
a.text-warning:hover {
color: #a47e3c;
}
.text-error {
color: #b94a48;
}
a.text-error:hover {
color: #953b39;
}
.text-info {
color: #3a87ad;
}
a.text-info:hover {
color: #2d6987;
}
.text-success {
color: #468847;
}
a.text-success:hover {
color: #356635;
}
h1,
h2,
h3,
......@@ -527,7 +543,7 @@ h6 {
margin: 10px 0;
font-family: 'Oswald', sans-serif;
font-weight: bold;
line-height: 1;
line-height: 20px;
color: #e36b23;
text-rendering: optimizelegibility;
}
......@@ -541,41 +557,40 @@ h6 small {
line-height: 1;
color: #999999;
}
h1 {
font-size: 36px;
h1,
h2,
h3 {
line-height: 40px;
}
h1 {
font-size: 41.25px;
}
h2 {
font-size: 30px;
line-height: 40px;
font-size: 33.75px;
}
h3 {
font-size: 24px;
line-height: 40px;
font-size: 26.25px;
}
h4 {
font-size: 18px;
line-height: 20px;
font-size: 18.75px;
}
h5 {
font-size: 14px;
line-height: 20px;
font-size: 15px;
}
h6 {
font-size: 12px;
line-height: 20px;
font-size: 12.75px;
}
h1 small {
font-size: 24px;
font-size: 26.25px;
}
h2 small {
font-size: 18px;
font-size: 18.75px;
}
h3 small {
font-size: 14px;
font-size: 15px;
}
h4 small {
font-size: 14px;
font-size: 15px;
}
.page-header {
padding-bottom: 9px;
......@@ -644,7 +659,8 @@ hr {
border-top: 1px solid transparent;
border-bottom: 1px solid #ffffff;
}
abbr[title] {
abbr[title],
abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted #999999;
}
......@@ -808,13 +824,14 @@ input[type="color"],
display: inline-block;
height: 20px;
padding: 4px 6px;
margin-bottom: 9px;
margin-bottom: 10px;
font-size: 15px;
line-height: 20px;
color: #555555;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
vertical-align: middle;
}
input,
textarea,
......@@ -871,9 +888,9 @@ input[type="color"]:focus,
outline: thin dotted \9;
/* IE6-9 */
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
}
input[type="radio"],
input[type="checkbox"] {
......@@ -955,13 +972,13 @@ textarea::-webkit-input-placeholder {
}
.radio,
.checkbox {
min-height: 18px;
padding-left: 18px;
min-height: 20px;
padding-left: 20px;
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
float: left;
margin-left: -18px;
margin-left: -20px;
}
.controls > .radio:first-child,
.controls > .checkbox:first-child {
......@@ -1075,9 +1092,14 @@ input.span1, textarea.span1, .uneditable-input.span1 {
.controls-row:after {
clear: both;
}
.controls-row [class*="span"] {
.controls-row [class*="span"],
.row-fluid .controls-row [class*="span"] {
float: left;
}
.controls-row .checkbox[class*="span"],
.controls-row .radio[class*="span"] {
padding-top: 5px;
}
input[disabled],
select[disabled],
textarea[disabled],
......@@ -1288,15 +1310,24 @@ select:focus:required:invalid:focus {
.input-append select,
.input-prepend select,
.input-append .uneditable-input,
.input-prepend .uneditable-input,
.input-append .dropdown-menu,
.input-prepend .dropdown-menu {
font-size: 15px;
}
.input-append input,
.input-prepend input,
.input-append select,
.input-prepend select,
.input-append .uneditable-input,
.input-prepend .uneditable-input {
position: relative;
margin-bottom: 0;
*margin-left: 0;
font-size: 15px;
vertical-align: top;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.input-append input:focus,
.input-prepend input:focus,
......@@ -1341,26 +1372,34 @@ select:focus:required:invalid:focus {
}
.input-prepend .add-on:first-child,
.input-prepend .btn:first-child {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.input-append input,
.input-append select,
.input-append .uneditable-input {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.input-append input + .btn-group .btn,
.input-append select + .btn-group .btn,
.input-append .uneditable-input + .btn-group .btn {
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.input-append .add-on,
.input-append .btn {
.input-append .btn,
.input-append .btn-group {
margin-left: -1px;
}
.input-append .add-on:last-child,
.input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.input-prepend.input-append input,
.input-prepend.input-append select,
......@@ -1369,19 +1408,29 @@ select:focus:required:invalid:focus {
-moz-border-radius: 0;
border-radius: 0;
}
.input-prepend.input-append input + .btn-group .btn,
.input-prepend.input-append select + .btn-group .btn,
.input-prepend.input-append .uneditable-input + .btn-group .btn {
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.input-prepend.input-append .add-on:first-child,
.input-prepend.input-append .btn:first-child {
margin-right: -1px;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.input-prepend.input-append .add-on:last-child,
.input-prepend.input-append .btn:last-child {
margin-left: -1px;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.input-prepend.input-append .btn-group:first-child {
margin-left: 0;
}
input.search-query {
padding-right: 14px;
......@@ -1636,7 +1685,7 @@ table {
.table-bordered colgroup + tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
-moz-border-radius-topleft: 4px;
-moz-border-radius-topright: 4px;
}
.table-striped tbody tr:nth-child(odd) td,
.table-striped tbody tr:nth-child(odd) th {
......@@ -1646,132 +1695,86 @@ table {
.table-hover tbody tr:hover th {
background-color: #505e6e;
}
table [class*=span],
.row-fluid table [class*=span] {
table td[class*="span"],
table th[class*="span"],
.row-fluid table td[class*="span"],
.row-fluid table th[class*="span"] {
display: table-cell;
float: none;
margin-left: 0;
}
.table .span1 {
.table td.span1,
.table th.span1 {
float: none;
width: 44px;
margin-left: 0;
}
.table .span2 {
.table td.span2,
.table th.span2 {
float: none;
width: 124px;
margin-left: 0;
}
.table .span3 {
.table td.span3,
.table th.span3 {
float: none;
width: 204px;
margin-left: 0;
}
.table .span4 {
.table td.span4,
.table th.span4 {
float: none;
width: 284px;
margin-left: 0;
}
.table .span5 {
.table td.span5,
.table th.span5 {
float: none;
width: 364px;
margin-left: 0;
}
.table .span6 {
.table td.span6,
.table th.span6 {
float: none;
width: 444px;
margin-left: 0;
}
.table .span7 {
.table td.span7,
.table th.span7 {
float: none;
width: 524px;
margin-left: 0;
}
.table .span8 {
.table td.span8,
.table th.span8 {
float: none;
width: 604px;
margin-left: 0;
}
.table .span9 {
.table td.span9,
.table th.span9 {
float: none;
width: 684px;
margin-left: 0;
}
.table .span10 {
.table td.span10,
.table th.span10 {
float: none;
width: 764px;
margin-left: 0;
}
.table .span11 {
.table td.span11,
.table th.span11 {
float: none;
width: 844px;
margin-left: 0;
}
.table .span12 {
.table td.span12,
.table th.span12 {
float: none;
width: 924px;
margin-left: 0;
}
.table .span13 {
float: none;
width: 1004px;
margin-left: 0;
}
.table .span14 {
float: none;
width: 1084px;
margin-left: 0;
}
.table .span15 {
float: none;
width: 1164px;
margin-left: 0;
}
.table .span16 {
float: none;
width: 1244px;
margin-left: 0;
}
.table .span17 {
float: none;
width: 1324px;
margin-left: 0;
}
.table .span18 {
float: none;
width: 1404px;
margin-left: 0;
}
.table .span19 {
float: none;
width: 1484px;
margin-left: 0;
}
.table .span20 {
float: none;
width: 1564px;
margin-left: 0;
}
.table .span21 {
float: none;
width: 1644px;
margin-left: 0;
}
.table .span22 {
float: none;
width: 1724px;
margin-left: 0;
}
.table .span23 {
float: none;
width: 1804px;
margin-left: 0;
}
.table .span24 {
float: none;
width: 1884px;
margin-left: 0;
}
.table tbody tr.success td {
background-color: #dff0d8;
}
......@@ -1811,8 +1814,6 @@ table [class*=span],
}
/* White icons with optional class, or on hover/active states of certain elements */
.icon-white,
.nav-tabs > .active > a > [class^="icon-"],
.nav-tabs > .active > a > [class*=" icon-"],
.nav-pills > .active > a > [class^="icon-"],
.nav-pills > .active > a > [class*=" icon-"],
.nav-list > .active > a > [class^="icon-"],
......@@ -1822,7 +1823,9 @@ table [class*=span],
.dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
.dropdown-menu > .active > a > [class*=" icon-"] {
.dropdown-menu > .active > a > [class*=" icon-"],
.dropdown-submenu:hover > a > [class^="icon-"],
.dropdown-submenu:hover > a > [class*=" icon-"] {
background-image: url("../img/glyphicons-halflings-white.png");
}
.icon-glass {
......@@ -2311,7 +2314,7 @@ table [class*=span],
background-color: transparent;
border-bottom: 1px solid #45515f;
}
.dropdown-menu a {
.dropdown-menu li > a {
display: block;
padding: 3px 20px;
clear: both;
......@@ -2325,7 +2328,6 @@ table [class*=span],
.dropdown-submenu:hover > a {
text-decoration: none;
color: #ffffff;
background-color: #e36b23;
background-color: #dc6620;
background-image: -moz-linear-gradient(top, #e36b23, #d25f1b);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e36b23), to(#d25f1b));
......@@ -2337,10 +2339,9 @@ table [class*=span],
}
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
color: #ffffff;
color: #ece9d7;
text-decoration: none;
outline: 0;
background-color: #e36b23;
background-color: #dc6620;
background-image: -moz-linear-gradient(top, #e36b23, #d25f1b);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e36b23), to(#d25f1b));
......@@ -2357,6 +2358,7 @@ table [class*=span],
.dropdown-menu .disabled > a:hover {
text-decoration: none;
background-color: transparent;
background-image: none;
cursor: default;
}
.open {
......@@ -2396,6 +2398,15 @@ table [class*=span],
.dropdown-submenu:hover > .dropdown-menu {
display: block;
}
.dropup .dropdown-submenu > .dropdown-menu {
top: auto;
bottom: 0;
margin-top: 0;
margin-bottom: -2px;
-webkit-border-radius: 5px 5px 5px 0;
-moz-border-radius: 5px 5px 5px 0;
border-radius: 5px 5px 5px 0;
}
.dropdown-submenu > a:after {
display: block;
content: " ";
......@@ -2412,6 +2423,16 @@ table [class*=span],
.dropdown-submenu:hover > a:after {
border-left-color: #ffffff;
}
.dropdown-submenu.pull-left {
float: none;
}
.dropdown-submenu.pull-left > .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
}