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

updated to 2.2.1

parent 6b5f9a06
// Journal 2.2.1
// Variables // Variables
// Swatch: Journal
// Version: 2.1.1
// -------------------------------------------------- // --------------------------------------------------
// Global values // Global values
// -------------------------------------------------- // --------------------------------------------------
...@@ -57,6 +57,24 @@ ...@@ -57,6 +57,24 @@
@headingsFontWeight: bold; // instead of browser default, bold @headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: @black; // empty to use BS default, @textColor @headingsColor: @black; // 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 // Tables
// ------------------------- // -------------------------
@tableBackground: transparent; // overall background-color @tableBackground: transparent; // overall background-color
...@@ -93,9 +111,11 @@ ...@@ -93,9 +111,11 @@
// ------------------------- // -------------------------
@inputBackground: @white; @inputBackground: @white;
@inputBorder: #ccc; @inputBorder: #ccc;
@inputBorderRadius: 3px; @inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter; @inputDisabledBackground: @grayLighter;
@formActionsBackground: @grayLighter; @formActionsBackground: @grayLighter;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
...@@ -116,6 +136,7 @@ ...@@ -116,6 +136,7 @@
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
// Z-index master list // Z-index master list
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
...@@ -157,6 +178,7 @@ ...@@ -157,6 +178,7 @@
// Navbar // Navbar
// ------------------------- // -------------------------
@navbarCollapseWidth: 979px; @navbarCollapseWidth: 979px;
@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
@navbarHeight: 60px; @navbarHeight: 60px;
@navbarBackgroundHighlight: @bodyBackground; @navbarBackgroundHighlight: @bodyBackground;
......
/*! /*!
* Bootstrap v2.1.1 * Bootstrap v2.2.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -72,7 +72,8 @@ img { ...@@ -72,7 +72,8 @@ img {
border: 0; border: 0;
-ms-interpolation-mode: bicubic; -ms-interpolation-mode: bicubic;
} }
#map_canvas img { #map_canvas img,
.google-maps img {
max-width: none; max-width: none;
} }
button, button,
...@@ -94,11 +95,11 @@ input::-moz-focus-inner { ...@@ -94,11 +95,11 @@ input::-moz-focus-inner {
border: 0; border: 0;
} }
button, button,
input[type="button"], html input[type="button"],
input[type="reset"], input[type="reset"],
input[type="submit"] { input[type="submit"] {
cursor: pointer;
-webkit-appearance: button; -webkit-appearance: button;
cursor: pointer;
} }
input[type="search"] { input[type="search"] {
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
...@@ -136,7 +137,7 @@ textarea { ...@@ -136,7 +137,7 @@ textarea {
.input-block-level { .input-block-level {
display: block; display: block;
width: 100%; width: 100%;
min-height: 30px; min-height: 11.4em;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -288,7 +289,7 @@ a:hover { ...@@ -288,7 +289,7 @@ a:hover {
.row-fluid [class*="span"] { .row-fluid [class*="span"] {
display: block; display: block;
width: 100%; width: 100%;
min-height: 30px; min-height: 11.4em;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -299,6 +300,9 @@ a:hover { ...@@ -299,6 +300,9 @@ a:hover {
.row-fluid [class*="span"]:first-child { .row-fluid [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.row-fluid .controls-row [class*="span"] + [class*="span"] {
margin-left: 2.127659574468085%;
}
.row-fluid .span12 { .row-fluid .span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
...@@ -506,15 +510,27 @@ cite { ...@@ -506,15 +510,27 @@ cite {
.text-warning { .text-warning {
color: #c09853; color: #c09853;
} }
a.text-warning:hover {
color: #a47e3c;
}
.text-error { .text-error {
color: #b94a48; color: #b94a48;
} }
a.text-error:hover {
color: #953b39;
}
.text-info { .text-info {
color: #3a87ad; color: #3a87ad;
} }
a.text-info:hover {
color: #2d6987;
}
.text-success { .text-success {
color: #468847; color: #468847;
} }
a.text-success:hover {
color: #356635;
}
h1, h1,
h2, h2,
h3, h3,
...@@ -524,7 +540,7 @@ h6 { ...@@ -524,7 +540,7 @@ h6 {
margin: 0.7em 0; margin: 0.7em 0;
font-family: inherit; font-family: inherit;
font-weight: bold; font-weight: bold;
line-height: 1; line-height: 1.4em;
color: inherit; color: inherit;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
} }
...@@ -538,41 +554,40 @@ h6 small { ...@@ -538,41 +554,40 @@ h6 small {
line-height: 1; line-height: 1;
color: #999999; color: #999999;
} }
h1,
h2,
h3 {
line-height: 2.8em;
}
h1 { h1 {
font-size: 36px; font-size: 44px;
line-height: 40px;
} }
h2 { h2 {
font-size: 30px; font-size: 36px;
line-height: 40px;
} }
h3 { h3 {
font-size: 24px; font-size: 28px;
line-height: 40px;
} }
h4 { h4 {
font-size: 18px; font-size: 20px;
line-height: 20px;
} }
h5 { h5 {
font-size: 14px; font-size: 16px;
line-height: 20px;
} }
h6 { h6 {
font-size: 12px; font-size: 13.6px;
line-height: 20px;
} }
h1 small { h1 small {
font-size: 24px; font-size: 28px;
} }
h2 small { h2 small {
font-size: 18px; font-size: 20px;
} }
h3 small { h3 small {
font-size: 14px; font-size: 16px;
} }
h4 small { h4 small {
font-size: 14px; font-size: 16px;
} }
.page-header { .page-header {
padding-bottom: -0.30000000000000004em; padding-bottom: -0.30000000000000004em;
...@@ -641,7 +656,8 @@ hr { ...@@ -641,7 +656,8 @@ hr {
border-top: 1px solid #cdcdcd; border-top: 1px solid #cdcdcd;
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
} }
abbr[title] { abbr[title],
abbr[data-original-title] {
cursor: help; cursor: help;
border-bottom: 1px dotted #999999; border-bottom: 1px dotted #999999;
} }
...@@ -805,13 +821,14 @@ input[type="color"], ...@@ -805,13 +821,14 @@ input[type="color"],
display: inline-block; display: inline-block;
height: 1.4em; height: 1.4em;
padding: 4px 6px; padding: 4px 6px;
margin-bottom: 9px; margin-bottom: 0.7em;
font-size: 16px; font-size: 16px;
line-height: 1.4em; line-height: 1.4em;
color: #777777; color: #777777;
-webkit-border-radius: 3px; -webkit-border-radius: 4px;
-moz-border-radius: 3px; -moz-border-radius: 4px;
border-radius: 3px; border-radius: 4px;
vertical-align: middle;
} }
input, input,
textarea, textarea,
...@@ -868,9 +885,9 @@ input[type="color"]:focus, ...@@ -868,9 +885,9 @@ input[type="color"]:focus,
outline: thin dotted \9; outline: thin dotted \9;
/* IE6-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); -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, 0.075), 0 0 8px rgba(82, 168, 236, 0.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, 0.075), 0 0 8px rgba(82, 168, 236, 0.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="radio"],
input[type="checkbox"] { input[type="checkbox"] {
...@@ -895,13 +912,13 @@ input[type="checkbox"] { ...@@ -895,13 +912,13 @@ input[type="checkbox"] {
} }
select, select,
input[type="file"] { input[type="file"] {
height: 30px; height: 11.4em;
/* In IE7, the height of the select element cannot be changed by height, only font-size */ /* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px; *margin-top: 4px;
/* For IE7, add top margin to align select with labels */ /* For IE7, add top margin to align select with labels */
line-height: 30px; line-height: 11.4em;
} }
select { select {
width: 220px; width: 220px;
...@@ -952,13 +969,13 @@ textarea::-webkit-input-placeholder { ...@@ -952,13 +969,13 @@ textarea::-webkit-input-placeholder {
} }
.radio, .radio,
.checkbox { .checkbox {
min-height: 18px; min-height: 1.4em;
padding-left: 18px; padding-left: 20px;
} }
.radio input[type="radio"], .radio input[type="radio"],
.checkbox input[type="checkbox"] { .checkbox input[type="checkbox"] {
float: left; float: left;
margin-left: -18px; margin-left: -20px;
} }
.controls > .radio:first-child, .controls > .radio:first-child,
.controls > .checkbox:first-child { .controls > .checkbox:first-child {
...@@ -1072,9 +1089,14 @@ input.span1, textarea.span1, .uneditable-input.span1 { ...@@ -1072,9 +1089,14 @@ input.span1, textarea.span1, .uneditable-input.span1 {
.controls-row:after { .controls-row:after {
clear: both; clear: both;
} }
.controls-row [class*="span"] { .controls-row [class*="span"],
.row-fluid .controls-row [class*="span"] {
float: left; float: left;
} }
.controls-row .checkbox[class*="span"],
.controls-row .radio[class*="span"] {
padding-top: 5px;
}
input[disabled], input[disabled],
select[disabled], select[disabled],
textarea[disabled], textarea[disabled],
...@@ -1285,15 +1307,24 @@ select:focus:required:invalid:focus { ...@@ -1285,15 +1307,24 @@ select:focus:required:invalid:focus {
.input-append select, .input-append select,
.input-prepend select, .input-prepend select,
.input-append .uneditable-input, .input-append .uneditable-input,
.input-prepend .uneditable-input,
.input-append .dropdown-menu,
.input-prepend .dropdown-menu {
font-size: 16px;
}
.input-append input,
.input-prepend input,
.input-append select,
.input-prepend select,
.input-append .uneditable-input,
.input-prepend .uneditable-input { .input-prepend .uneditable-input {
position: relative; position: relative;
margin-bottom: 0; margin-bottom: 0;
*margin-left: 0; *margin-left: 0;
font-size: 16px;
vertical-align: top; vertical-align: top;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 3px 3px 0; border-radius: 0 4px 4px 0;
} }
.input-append input:focus, .input-append input:focus,
.input-prepend input:focus, .input-prepend input:focus,
...@@ -1338,26 +1369,34 @@ select:focus:required:invalid:focus { ...@@ -1338,26 +1369,34 @@ select:focus:required:invalid:focus {
} }
.input-prepend .add-on:first-child, .input-prepend .add-on:first-child,
.input-prepend .btn:first-child { .input-prepend .btn:first-child {
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 4px 0 0 4px;
border-radius: 3px 0 0 3px; border-radius: 4px 0 0 4px;
} }
.input-append input, .input-append input,
.input-append select, .input-append select,
.input-append .uneditable-input { .input-append .uneditable-input {
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 4px 0 0 4px;
border-radius: 3px 0 0 3px; 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 .add-on,
.input-append .btn { .input-append .btn,
.input-append .btn-group {
margin-left: -1px; margin-left: -1px;
} }
.input-append .add-on:last-child, .input-append .add-on:last-child,
.input-append .btn:last-child { .input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 3px 3px 0; border-radius: 0 4px 4px 0;
} }
.input-prepend.input-append input, .input-prepend.input-append input,
.input-prepend.input-append select, .input-prepend.input-append select,
...@@ -1366,19 +1405,29 @@ select:focus:required:invalid:focus { ...@@ -1366,19 +1405,29 @@ select:focus:required:invalid:focus {
-moz-border-radius: 0; -moz-border-radius: 0;
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 .add-on:first-child,
.input-prepend.input-append .btn:first-child { .input-prepend.input-append .btn:first-child {
margin-right: -1px; margin-right: -1px;
-webkit-border-radius: 3px 0 0 3px; -webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 3px 0 0 3px; -moz-border-radius: 4px 0 0 4px;
border-radius: 3px 0 0 3px; border-radius: 4px 0 0 4px;
} }
.input-prepend.input-append .add-on:last-child, .input-prepend.input-append .add-on:last-child,
.input-prepend.input-append .btn:last-child { .input-prepend.input-append .btn:last-child {
margin-left: -1px; margin-left: -1px;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 4px 4px 0;
border-radius: 0 3px 3px 0; border-radius: 0 4px 4px 0;
}
.input-prepend.input-append .btn-group:first-child {
margin-left: 0;
} }
input.search-query { input.search-query {
padding-right: 14px; padding-right: 14px;
...@@ -1633,7 +1682,7 @@ table { ...@@ -1633,7 +1682,7 @@ table {
.table-bordered colgroup + tbody tr:first-child td:last-child { .table-bordered colgroup + tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
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) td,
.table-striped tbody tr:nth-child(odd) th { .table-striped tbody tr:nth-child(odd) th {
...@@ -1643,132 +1692,86 @@ table { ...@@ -1643,132 +1692,86 @@ table {
.table-hover tbody tr:hover th { .table-hover tbody tr:hover th {
background-color: #ebf7eb; background-color: #ebf7eb;
} }
table [class*=span], table td[class*="span"],
.row-fluid table [class*=span] { table th[class*="span"],
.row-fluid table td[class*="span"],
.row-fluid table th[class*="span"] {
display: table-cell; display: table-cell;
float: none; float: none;
margin-left: 0; margin-left: 0;
} }
.table .span1 { .table td.span1,
.table th.span1 {
float: none; float: none;
width: 44px; width: 44px;
margin-left: 0; margin-left: 0;
} }
.table .span2 { .table td.span2,
.table th.span2 {
float: none; float: none;
width: 124px; width: 124px;
margin-left: 0; margin-left: 0;
} }
.table .span3 { .table td.span3,
.table th.span3 {
float: none; float: none;
width: 204px; width: 204px;
margin-left: 0; margin-left: 0;
} }
.table .span4 { .table td.span4,
.table th.span4 {