Commit 43a4a1fd authored by Thomas Park's avatar Thomas Park
Browse files

update for bootstrap 2.0.2

parent 342cce47
This diff is collapsed.
This diff is collapsed.
// Bootswatch.less
// Swatch: Amelia
// Version: 2.0.2
// -----------------------------------------------------
// TYPOGRAPHY
......@@ -8,32 +9,27 @@
@import url('http://fonts.googleapis.com/css?family=Lobster');
@import url('http://fonts.googleapis.com/css?family=Cabin:400,700');
h1, h2, h3, h4, h5, h6,
h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
.navbar .brand, legend {
font-family: @headingsFontFamily;
}
h6 {
color: @textColor;
font-weight: normal;
}
input, button, select, textarea,
.navbar-search .search-query,
h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
font-family: @baseFontFamily;
color: @textColor;
}
.muted {
color: rgba(256, 256, 256, 0.5);
}
.navbar .brand, h1, h2, h3, h4, h5, legend {
font-family: 'Lobster', cursive;
}
// SCAFFOLDING
// -----------------------------------------------------
body {
background-color: #4397A2;
#gradient > .radial(lighten(#0F8790, 7%), #0F8790);
}
......@@ -47,10 +43,10 @@ hr {
footer.footer {
border-top: 1px solid rgba(256, 256, 256, 0.3);
}
footer.footer p {
color: @textColor;
p {
color: @textColor;
}
}
// NAVBAR
......@@ -71,17 +67,6 @@ footer.footer p {
padding-top: 17px;
padding-bottom: 14px;
text-shadow: none;
color: @textColor;
}
.nav > li.active > a {
color: @white;
background-color: lighten(@navbarBackground, 10%);
}
.nav > li > a:hover,
.nav > li.active > a:hover {
background-color: lighten(@navbarBackground, 10%);
}
.navbar-search {
......@@ -90,7 +75,6 @@ footer.footer p {
.navbar-search .search-query {
border: 2px solid lighten(@navbarBackground, 10%);
background-color: transparent;
.border-radius(0);
.box-shadow(none);
......@@ -105,13 +89,6 @@ footer.footer p {
}
}
.navbar .nav > li.dropdown.open > .dropdown-menu a:hover,
div.subnav .nav > li.dropdown.open > .dropdown-menu a:hover,
.dropdown-menu > li > a:hover,
.nav .dropdown.open > .dropdown-menu > li > a:hover {
background-color: rgba(0, 57, 59, 0.9);
}
div.subnav {
background-color: rgba(42, 99, 105, 0.9);
background-image: none;
......@@ -148,20 +125,20 @@ div.subnav {
background-color: rgba(256, 256, 256, 0.4);
color: @textColor;
}
}
div.subnav .nav > li:first-child > a:hover {
border-left-color: rgba(256, 256, 256, 0.4);
border-left-width: 1px;
.nav > li:first-child > a:hover {
border-left-color: rgba(256, 256, 256, 0.4);
border-left-width: 1px;
}
}
div.subnav-fixed {
top: 50px;
}
.navbar .nav-collapse.collapse {
.navbar .nav-collapse.in {
li > a {
.nav li > a {
color: @textColor;
.border-radius(0);
}
......@@ -185,8 +162,8 @@ div.subnav-fixed {
.buttonBackgroundCustom(@color) {
background-image: none;
background-color: @color;
border-color: transparent;
&:hover, &:active, &.active, &.disabled, &[disabled] {
background-color: darken(@color, 5%);
......@@ -208,10 +185,10 @@ div.subnav-fixed {
.btn {
padding: 12px 16px;
.border-radius(0);
border: 0px solid transparent;
background-image: none;
text-shadow: none;
.box-shadow(none);
.buttonBackgroundCustom(@grayLighter);
.buttonBackgroundCustom(@btnBackground)
}
.btn-group .btn:first-child {
......@@ -240,34 +217,28 @@ div.subnav-fixed {
.box-shadow(none);
}
.btn-warning .caret {
opacity: 0.75;
border-top-color: @white;
}
.btn-primary {
.buttonBackgroundCustom(#AD1D28);
.buttonBackgroundCustom(@btnPrimaryBackground);
}
.btn-warning {
.buttonBackgroundCustom(@orange);
.btn-info {
.buttonBackgroundCustom(@btnInfoBackground);
}
.btn-danger {
.buttonBackgroundCustom(darken(@yellow, 3%));
.btn-success {
.buttonBackgroundCustom(@btnSuccessBackground);
}
.btn-success {
.buttonBackgroundCustom(@green);
.btn-warning {
.buttonBackgroundCustom(@btnWarningBackground);
}
.btn-info {
.buttonBackgroundCustom(@purple);
.btn-danger {
.buttonBackgroundCustom(@btnDangerBackground);
}
.btn-inverse {
.buttonBackgroundCustom(#27666D);
.buttonBackgroundCustom(@btnInverseBackground);
}
.btn-small {
......@@ -290,10 +261,6 @@ div.subnav-fixed {
// TABLES
// -----------------------------------------------------
.table {
background-color: lighten(#147E88, 10%);
}
.table th, .table td,
.table tbody + tbody {
border-top: 0px solid transparent;
......@@ -301,38 +268,8 @@ div.subnav-fixed {
.table-bordered {
.border-radius(0);
border: 1px solid lighten(#147E88, 12%);
th, td {
border-top: 1px solid lighten(#147E88, 12%);
}
th + th,
td + td,
th + td,
td + th {
border-left: 1px solid lighten(#147E88, 12%);
}
}
.table-striped {
tbody {
tr:nth-child(odd) td,
tr:nth-child(odd) th {
background-color: lighten(#147E88, 15%);
}
}
}
.table {
tbody tr:hover td,
tbody tr:hover th {
background-color: rgba(256, 256, 256, 0.4);
}
}
// FORMS
// -----------------------------------------------------
......@@ -346,6 +283,10 @@ input, textarea, .uneditable-input {
padding: 10px;
}
.uneditable-input {
padding-bottom: 30px;
}
select {
border: 0px solid transparent;
}
......@@ -385,10 +326,11 @@ input, textarea, .search-query, .uneditable-input,
.input-prepend .add-on, .input-append .add-on {
height: 25px;
padding-top: 9px;
text-shadow: none;
background-color: @grayLighter;
border-color: transparent;
.border-radius(0);
background-color: @grayLighter;
color: @gray;
text-shadow: none;
}
// NAVIGATION
......@@ -534,8 +476,6 @@ input, textarea, .search-query, .uneditable-input,
}
}
// MISCELLANEOUS
// -----------------------------------------------------
......@@ -638,4 +578,4 @@ blockquote {
small {
color: rgba(256, 256, 256, 0.6);
}
}
\ No newline at end of file
}
......@@ -16,7 +16,6 @@
<link href="bootstrap.min.css" rel="stylesheet">
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<link href="../assets/css/docs.css" rel="stylesheet">
<link href="../assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<script type="text/javascript">
......
// Variables.less
// Variables to customize the look and feel of Bootstrap
// Swatch: Amelia
// Version: 2.0.2
// -----------------------------------------------------
// CUSTOM VALUES
// --------------------------------------------------
@bodyBackgroundColor: #003F4D;
// GLOBAL VALUES
// --------------------------------------------------
// Links
@linkColor: lighten(@yellow, 15%);
@linkColorHover: @linkColor;
// Grays
// -------------------------
@black: #000;
@grayDarker: #111;
@grayDark: #333;
......@@ -25,7 +20,9 @@
@grayLighter: #ddd;
@white: #fff;
// Accent colors
// -------------------------
@blue: #00BCE1;
@blueDark: #1269B0;
@green: #7FC518;
......@@ -35,14 +32,79 @@
@pink: #FFBCB9;
@purple: #4D3A7D;
// Scaffolding
// -------------------------
@bodyBackground: #003F4D;
@textColor: rgba(256, 256, 256, 0.9);
// Links
// -------------------------
@linkColor: lighten(@yellow, 15%);
@linkColorHover: @linkColor;
// Typography
// -------------------------
@baseFontSize: 14px;
@baseFontFamily: 'Cabin', Verdana, sans-serif;
@baseLineHeight: 20px;
@textColor: rgba(256, 256, 256, 0.9);
@altFontFamily: Georgia, "Times New Roman", Times, serif;
@headingsFontFamily: 'Lobster', cursive; // empty to use BS default, @baseFontFamily
@headingsFontWeight: normal; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor
// Tables
// -------------------------
@tableBackground: lighten(#147E88, 10%); // overall background-color
@tableBackgroundAccent: lighten(#147E88, 15%); // for striping
@tableBackgroundHover: rgba(256, 256, 256, 0.4); // for hover
@tableBorder: lighten(#147E88, 12%); // table and cell border
// Buttons
@primaryButtonBackground: @linkColor;
// -------------------------
@btnBackground: @grayLighter;
@btnBackgroundHighlight: @grayLighter;
@btnBorder: rgba(0, 0, 0, 0);
@btnPrimaryBackground: @navbarBackground;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
@btnInfoBackground: @purple;
@btnInfoBackgroundHighlight: @purple;
@btnSuccessBackground: @green;
@btnSuccessBackgroundHighlight: @green;
@btnWarningBackground: @orange;
@btnWarningBackgroundHighlight: @orange;
@btnDangerBackground: darken(@yellow, 3%);
@btnDangerBackgroundHighlight: darken(@yellow, 3%);
@btnInverseBackground: #27666D;
@btnInverseBackgroundHighlight: #27666D;
// Forms
// -------------------------
@inputBackground: @white;
@inputBorder: transparent;
@inputDisabledBackground: @grayLighter;
// Dropdowns
// -------------------------
@dropdownBackground: @white;
@dropdownBorder: rgba(0,0,0,.2);
@dropdownLinkColor: @bodyBackground;
@dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: rgba(0, 57, 59, 0.9);
......@@ -50,6 +112,7 @@
// --------------------------------------------------
// Z-index master list
// -------------------------
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
@zindexDropdown: 1000;
......@@ -59,27 +122,51 @@
@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: transparent;
// Navbar
// -------------------------
@navbarHeight: 50px;
@navbarBackground: #AD1D28;
@navbarBackgroundHighlight: #AD1D28;
@navbarLinkBackgroundHover: transparent;
@navbarText: @grayLight;
@navbarLinkColor: @grayLight;
@navbarText: @white;
@navbarLinkColor: @white;
@navbarLinkColorHover: @white;
@navbarLinkColorActive: @navbarLinkColorHover;
@navbarLinkBackgroundHover: lighten(@navbarBackground, 10%);
@navbarLinkBackgroundActive: lighten(@navbarBackground, 10%);
@navbarSearchBackground: rgba(0, 0, 0, 0);
@navbarSearchBackgroundFocus: lighten(@navbarBackground, 25%);
@navbarSearchBorder: darken(@navbarSearchBackground, 30%);
@navbarSearchPlaceholderColor: @textColor;
// Hero unit
// -------------------------
@heroUnitBackground: #3CB9C6;
@heroUnitHeadingColor: inherit;
@heroUnitLeadColor: inherit;
// Form states and alerts
// -------------------------
@warningText: #c09853;
@warningBackground: #fcf8e3;
@warningBorder: darken(spin(@warningBackground, -10), 3%);
......@@ -98,15 +185,19 @@
// GRID
// --------------------------------------------------
// Default 940px grid
// -------------------------
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Fluid grid
// -------------------------
@fluidGridColumnWidth: 6.382978723%;
@fluidGridGutterWidth: 2.127659574%;
This diff is collapsed.
This diff is collapsed.
......@@ -11,8 +11,8 @@
body {
position: relative;
padding-top: 90px;
/* background-color: #fff;*/
/* background-image: url(../img/grid-18px-masked.png);*/
/* background-color: #fff;
background-image: url(../img/grid-18px-masked.png);*/
background-repeat: repeat-x;
background-position: 0 40px;
}
......@@ -20,7 +20,7 @@ body {
/* Tweak navbar brand link to be super sleek
-------------------------------------------------- */
/* .navbar-fixed-top .brand {
/*.navbar-fixed-top .brand {
padding-right: 0;
padding-left: 0;
margin-left: 20px;
......@@ -34,7 +34,7 @@ body {
}
.navbar-fixed-top .brand:hover {
text-decoration: none;
} */
}*/
/* Space out sub-sections more
......@@ -63,6 +63,7 @@ hr.soften {
.jumbotron h1 {
margin-bottom: 9px;
font-size: 81px;
font-weight: bold;
letter-spacing: -1px;
line-height: 1;
}
......@@ -79,6 +80,9 @@ hr.soften {
-moz-border-radius: 6px;
border-radius: 6px;
}
.jumbotron .btn-large small {
font-size: 14px;
}
/* Masthead (docs home) */
.masthead {
......@@ -181,7 +185,7 @@ hr.soften {
top: 40px;
left: 0;
right: 0;
z-index: 900;
z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
border-color: #d5d5d5;
border-width: 0 0 1px; /* drop the border on the fixed edges */
-webkit-border-radius: 0;
......@@ -190,6 +194,7 @@ hr.soften {
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
}
.subnav-fixed .nav {
width: 938px;
......@@ -207,14 +212,20 @@ hr.soften {
/* Quick links
-------------------------------------------------- */
.bs-links {
margin: 36px 0;
}
.quick-links {
min-height: 30px;
margin: 0;
padding: 5px 20px;
margin: 36px 0;
list-style: none;
text-align: center;
overflow: hidden;
}
.quick-links:first-child {
min-height: 0;
}
.quick-links li {
display: inline;
margin: 0 5px;
......@@ -426,17 +437,17 @@ hr.soften {
.download-btn {
margin: 36px 0 108px;
}
.download p,
.download h4 {
#download p,
#download h4 {
max-width: 50%;
margin: 0 auto;
color: #999;
text-align: center;
}
.download h4 {
#download h4 {
margin-bottom: 0;
}
.download p {
#download p {
margin-bottom: 18px;
}
.download-btn .btn {
......@@ -481,11 +492,7 @@ hr.soften {
/* Misc
-------------------------------------------------- */
pre.prettyprint {
overflow: hidden;
}
.browser-support {
img {
max-width: 100%;
}
......@@ -546,28 +553,12 @@ form.well {
/* Icons
------------------------- */
.the-icons {
margin-bottom: 18px;
}
.the-icons i {
display: block;
margin-bottom: 5px;
margin-left: 0;
list-style: none;
}
.the-icons i:hover {
background-color: rgba(255,0,0,.25);
}
.the-icons i:after {
display: block;
content: attr(class);
font-style: normal;
margin-left: 20px;
width: 140px;
}
#javascript input[type=checkbox] {
position: relative;
top: -1px;
display: inline;
margin-left: 6px;
}
/* Eaxmples page
------------------------- */
......@@ -576,6 +567,70 @@ form.well {
background-color: #fff;
}
/* Responsive table
------------------------- */
.responsive-utilities th small {
display: block;
font-weight: normal;
color: #999;
}
.responsive-utilities tbody th {
font-weight: normal;
}
.responsive-utilities td {
text-align: center;
}
.responsive-utilities td.is-visible {
color: #468847;
background-color: #dff0d8 !important;
}
.responsive-utilities td.is-hidden {
color: #ccc;