update bootstrap

This commit is contained in:
Nils Schneider 2011-09-16 20:32:45 +02:00
parent 142775e6a4
commit 246b25f9ac
7 changed files with 462 additions and 465 deletions

View file

@ -38,6 +38,7 @@ img.icon {
box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.1); box-shadow: inset 0 10px 30px rgba(0, 0, 0, 0.1);
background-image: url(innerbg.png); background-image: url(innerbg.png);
padding-top: 2em; padding-top: 2em;
padding-bottom: 1em;
} }
color: #fff; color: #fff;

View file

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v1.1.1 * Bootstrap @VERSION
* *
* Copyright 2011 Twitter, Inc * Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0

View file

@ -26,7 +26,7 @@ fieldset {
} }
// Parent element that clears floats and wraps labels and fields together // Parent element that clears floats and wraps labels and fields together
.clearfix { form .clearfix {
margin-bottom: @baseline; margin-bottom: @baseline;
} }
@ -61,29 +61,58 @@ input[type=radio] {
} }
// Inputs, Textareas, Selects // Inputs, Textareas, Selects
input[type=text], input,
input[type=password],
textarea, textarea,
select, select,
.uneditable-input { .uneditable-input {
display: inline-block; display: inline-block;
width: 210px; width: 210px;
height: @baseline;
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
line-height: @baseline; line-height: @baseline;
height: @baseline;
color: @gray; color: @gray;
border: 1px solid #ccc; border: 1px solid #ccc;
.border-radius(3px); .border-radius(3px);
} }
/* mini reset for non-html5 file types */
input[type=checkbox],
input[type=radio] {
width: auto;
height: auto;
padding: 0;
margin: 3px 0;
*margin-top: 0; /* IE6-7 */
line-height: normal;
border: none;
}
input[type=file] {
background-color: #fff;
padding: initial;
border: initial;
line-height: initial;
.box-shadow(none);
}
input[type=button],
input[type=reset],
input[type=submit] {
width: auto;
height: auto;
}
select, select,
input[type=file] { input[type=file] {
height: @baseline * 1.5; height: @baseline * 1.5;
line-height: @baseline * 1.5; line-height: @baseline * 1.5;
} }
textarea { textarea {
height: auto; height: auto;
} }
.uneditable-input { .uneditable-input {
background-color: #eee; background-color: #eee;
display: block; display: block;
@ -100,15 +129,13 @@ textarea {
} }
// Focus states // Focus states
input[type=text], input,
input[type=password],
select, textarea { select, textarea {
@transition: border linear .2s, box-shadow linear .2s; @transition: border linear .2s, box-shadow linear .2s;
.transition(@transition); .transition(@transition);
.box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
} }
input[type=text]:focus, input:focus,
input[type=password]:focus,
textarea:focus { textarea:focus {
outline: none; outline: none;
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
@ -128,8 +155,7 @@ form div.error {
span.help-block { span.help-block {
color: @red; color: @red;
} }
input[type=text], input,
input[type=password],
textarea { textarea {
border-color: @error-text; border-color: @error-text;
.box-shadow(0 0 3px rgba(171,41,32,.25)); .box-shadow(0 0 3px rgba(171,41,32,.25));
@ -221,7 +247,7 @@ input.disabled {
// Inline Fields (input fields that appear as inline objects // Inline Fields (input fields that appear as inline objects
.inline-inputs { .inline-inputs {
color: @gray; color: @gray;
span, input[type=text] { span, input {
display: inline-block; display: inline-block;
} }
input.mini { input.mini {
@ -238,8 +264,7 @@ input.disabled {
// Allow us to put symbols and text within the input field for a cleaner look // Allow us to put symbols and text within the input field for a cleaner look
.input-prepend, .input-prepend,
.input-append { .input-append {
input[type=text], input {
input[type=password] {
.border-radius(0 3px 3px 0); .border-radius(0 3px 3px 0);
} }
.add-on { .add-on {
@ -270,8 +295,7 @@ input.disabled {
} }
} }
.input-append { .input-append {
input[type=text], input {
input[type=password] {
float: left; float: left;
.border-radius(3px 0 0 3px); .border-radius(3px 0 0 3px);
} }

View file

@ -16,14 +16,6 @@
z-index: 10000; z-index: 10000;
overflow: visible; overflow: visible;
// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
.fill {
background:#222;
#gradient > .vertical(#333, #222);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
}
// Links get text shadow // Links get text shadow
a { a {
color: @grayLight; color: @grayLight;
@ -32,7 +24,7 @@
// Hover and active states // Hover and active states
a:hover, a:hover,
ul li.active a { ul .active a {
background-color: #333; background-color: #333;
background-color: rgba(255,255,255,.05); background-color: rgba(255,255,255,.05);
color: @white; color: @white;
@ -41,7 +33,7 @@
// Website name // Website name
h3 { h3 {
position:relative; position: relative;
a { a {
float: left; float: left;
display: block; display: block;
@ -60,191 +52,330 @@
margin: 5px 0 0 0; margin: 5px 0 0 0;
position: relative; position: relative;
.opacity(100); .opacity(100);
input { }
background-color: #444; input {
background-color: rgba(255,255,255,.3); background-color: #444;
#font > .sans-serif(13px, normal, 1); background-color: rgba(255,255,255,.3);
width: 220px; #font > .sans-serif(13px, normal, 1);
padding: 4px 9px; padding: 4px 9px;
color: #fff; color: #fff;
color: rgba(255,255,255,.75); color: rgba(255,255,255,.75);
border: 1px solid #111; border: 1px solid #111;
.border-radius(4px); .border-radius(4px);
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25); @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
.box-shadow(@shadow); .box-shadow(@shadow);
.transition(none); .transition(none);
// Placeholder text gets special styles; can't be bundled together though for some reason // Placeholder text gets special styles; can't be bundled together though for some reason
&:-moz-placeholder { &:-moz-placeholder {
color: @grayLighter; color: @grayLighter;
} }
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: @grayLighter; color: @grayLighter;
} }
// Hover states // Hover states
&:hover { &:hover {
background-color: @grayLight; background-color: @grayLight;
background-color: rgba(255,255,255,.5); background-color: rgba(255,255,255,.5);
color: #fff; color: #fff;
} }
// Focus states (we use .focused since IE8 and down doesn't support :focus) // Focus states (we use .focused since IE8 and down doesn't support :focus)
&:focus, &:focus,
&.focused { &.focused {
outline: none; outline: none;
background-color: #fff; background-color: #fff;
color: @grayDark; color: @grayDark;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
border: 0; border: 0;
padding: 5px 10px; padding: 5px 10px;
.box-shadow(0 0 3px rgba(0,0,0,.15)); .box-shadow(0 0 3px rgba(0,0,0,.15));
}
} }
} }
}
// Navigation // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
ul { // For backwards compatability, include .topbar .fill
.topbar-inner,
.topbar .fill {
background-color: #222;
#gradient > .vertical(#333, #222);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
}
// NAVIGATION
// ----------
// Topbar Nav
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
// For backwards compatibility, leave in .topbar div > ul
.topbar div > ul,
.nav {
display: block;
float: left;
margin: 0 10px 0 0;
position: relative;
left: 0;
> li {
display: block; display: block;
float: left; float: left;
margin: 0 10px 0 0; }
position: relative; a {
&.secondary-nav { display: block;
float: right; float: none;
margin-left: 10px; padding: 10px 10px 11px;
margin-right: 0; line-height: 19px;
} text-decoration: none;
li { &:hover {
display: block; color: #fff;
float: left; text-decoration: none;
font-size: 13px;
a {
display: block;
float: none;
padding: 10px 10px 11px;
line-height: 19px;
text-decoration: none;
&:hover {
color: #fff;
text-decoration: none;
}
}
&.active a {
background-color: #222;
background-color: rgba(0,0,0,.5);
}
} }
}
.active a {
background-color: #222;
background-color: rgba(0,0,0,.5);
}
// Dropdowns // Secondary (floated right) nav in topbar
&.primary-nav li ul { &.secondary-nav {
left: 0; float: right;
} margin-left: 10px;
&.secondary-nav li ul { margin-right: 0;
// backwards compatibility
.menu-dropdown,
.dropdown-menu {
right: 0; right: 0;
} }
li.menu { }
position: relative; // Dropdowns within the .nav
a.menu { // a.menu:hover and li.open .menu for backwards compatibility
&:after { a.menu:hover,
width: 0px; li.open .menu,
height: 0px; .dropdown-toggle:hover,
display: inline-block; .dropdown.open .dropdown-toggle {
content: "↓"; background: #444;
text-indent: -99999px; background: rgba(255,255,255,.05);
vertical-align: top; }
margin-top: 8px; // .menu-dropdown for backwards compatibility
margin-left: 4px; .menu-dropdown,
border-left: 4px solid transparent; .dropdown-menu {
border-right: 4px solid transparent; background-color: #333;
border-top: 4px solid #fff; // a.menu for backwards compatibility
.opacity(50); a.menu,
} .dropdown-toggle {
} color: #fff;
&.open { &.open {
a.menu, background: #444;
a:hover { background: rgba(255,255,255,.05);
background-color: #444;
background-color: rgba(255,255,255,.1);
*background-color: #444; /* IE6-7 */
color: #fff;
}
ul {
display: block;
li {
a {
background-color: transparent;
font-weight: normal;
&:hover {
background-color: rgba(255,255,255,.1);
*background-color: #444; /* IE6-7 */
color: #fff;
}
}
&.active a {
background-color: rgba(255,255,255,.1);
font-weight: bold;
}
}
}
} }
} }
li ul { li a {
background-color: #333; color: #999;
float: left; text-shadow: 0 1px 0 rgba(0,0,0,.5);
display: none; &:hover {
position: absolute; #gradient > .vertical(#292929,#191919);
top: 40px; color: #fff;
min-width: 160px;
max-width: 220px;
_width: 160px;
margin-left: 0;
margin-right: 0;
padding: 0;
text-align: left;
border: 0;
zoom: 1;
.border-radius(0 0 5px 5px);
.box-shadow(0 1px 2px rgba(0,0,0,0.6));
li {
float: none;
clear: both;
display: block;
background: none;
font-size: 12px;
a {
display: block;
padding: 6px 15px;
clear: both;
font-weight: normal;
line-height: 19px;
color: #bbb;
&:hover {
background-color: #333;
background-color: rgba(255,255,255,.25);
color: #fff;
}
}
// Dividers (basically an hr)
&.divider {
height: 1px;
overflow: hidden;
background: #222;
background: rgba(0,0,0,.2);
border-bottom: 1px solid rgba(255,255,255,.1);
margin: 5px 0;
}
// Section separaters
span {
clear: both;
display: block;
background: rgba(0,0,0,.2);
padding: 6px 15px;
cursor: default;
color: @gray;
border-top: 1px solid rgba(0,0,0,.2);
}
} }
} }
.divider {
background-color: #222;
border-color: #444;
}
}
}
// For backwards compatability with new dropdowns, redeclare dropdown link padding
.topbar ul .menu-dropdown li a,
.topbar ul .dropdown-menu li a {
padding: 4px 15px;
}
// Dropdown Menus
// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
// li.menu for backwards compatibility
li.menu,
.dropdown {
position: relative;
}
// The link that is clicked to toggle the dropdown
// a.menu for backwards compatibility
a.menu:after,
.dropdown-toggle:after {
width: 0;
height: 0;
display: inline-block;
content: "&darr;";
text-indent: -99999px;
vertical-align: top;
margin-top: 8px;
margin-left: 4px;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #fff;
.opacity(50);
}
// The dropdown menu (ul)
// .menu-dropdown for backwards compatibility
.menu-dropdown,
.dropdown-menu {
background-color: #fff;
float: left;
display: none; // None by default, but block on "open" of the menu
position: absolute;
top: 40px;
min-width: 160px;
max-width: 220px;
_width: 160px;
margin-left: 0; // override default ul styles
margin-right: 0;
padding: 6px 0;
zoom: 1; // do we need this?
border-color: #999;
border-color: rgba(0,0,0,.2);
border-style: solid;
border-width: 0 1px 1px;
.border-radius(0 0 6px 6px);
.box-shadow(0 2px 4px rgba(0,0,0,.2));
.background-clip(padding-box);
// Unfloat any li's to make them stack
li {
float: none;
display: block;
background-color: none;
}
// Dividers (basically an hr) within the dropdown
.divider {
height: 1px;
margin: 5px 0;
overflow: hidden;
background-color: #eee;
border-bottom: 1px solid #fff;
}
}
.topbar .dropdown-menu, .dropdown-menu {
// Links within the dropdown menu
a {
display: block;
padding: 4px 15px;
clear: both;
font-weight: normal;
line-height: 18px;
color: @gray;
text-shadow: 0 1px 0 #fff;
// Hover state
&:hover {
#gradient > .vertical(#eeeeee, #dddddd);
color: @grayDark;
text-decoration: none;
@shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
.box-shadow(@shadow);
}
}
}
// Open state for the dropdown
// .open for backwards compatibility
.open,
.dropdown.open {
// .menu for backwards compatibility
.menu,
.dropdown-toggle {
color: #fff;
background: #ccc;
background: rgba(0,0,0,.3);
}
// .menu-dropdown for backwards compatibility
.menu-dropdown,
.dropdown-menu {
display: block;
}
}
// Tabs and Pills
.tabs,
.pills {
margin: 0 0 20px;
padding: 0;
list-style: none;
.clearfix();
> li {
float: left;
> a {
display: block;
}
}
}
// Basic Tabs
.tabs {
width: 100%;
border-bottom: 1px solid #ddd;
> li {
position: relative; // For the dropdowns mostly
top: 1px;
> a {
margin-right: 2px;
padding: 0 15px;
line-height: (@baseline * 2) - 1;
.border-radius(4px 4px 0 0);
&:hover {
background-color: #eee;
border-bottom: 1px solid #ddd;
text-decoration: none;
}
}
&.active > a {
background-color: #fff;
padding: 0 14px;
border: 1px solid #ddd;
border-bottom: 0;
color: @gray;
}
}
// first one for backwards compatibility
.menu-dropdown,
.dropdown-menu {
top: 35px;
border-width: 1px;
.border-radius(0 6px 6px 6px);
}
// first one for backwards compatibility
a.menu:after,
.dropdown-toggle:after {
border-top-color: #999;
margin-top: 15px;
margin-left: 5px;
}
// first one for backwards compatibility
li.open a.menu:after,
.dropdown.open .dropdown-toggle:after {
border-top-color: #555;
}
}
// Basic pill nav
.pills {
a {
margin: 5px 3px 5px 0;
padding: 0 15px;
text-shadow: 0 1px 1px #fff;
line-height: 30px;
.border-radius(15px);
&:hover {
background: @linkColorHover;
color: #fff;
text-decoration: none;
text-shadow: 0 1px 1px rgba(0,0,0,.25);
}
}
.active a {
background: @linkColor;
color: #fff;
text-shadow: 0 1px 1px rgba(0,0,0,.25);
} }
} }
@ -276,6 +407,7 @@ footer {
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
// PAGE HEADERS // PAGE HEADERS
// ------------ // ------------
@ -288,16 +420,16 @@ footer {
} }
} }
// BUTTON STYLES // BUTTON STYLES
// ------------- // -------------
// Base .btn styles // Base .btn styles
.btn { .btn {
// Button Base // Button Base
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
#gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); #gradient > .vertical-three-colors(#ffffff, #ffffff, 25%, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
padding: 5px 14px 6px; padding: 5px 14px 6px;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
color: #333; color: #333;
@ -325,23 +457,25 @@ footer {
.transition(.1s linear all); .transition(.1s linear all);
// Active and Disabled states // Active and Disabled states
&:active {
@shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
}
&.disabled { &.disabled {
cursor: default; cursor: default;
background-image: none; background-image: none;
.reset-filter();
.opacity(65); .opacity(65);
.box-shadow(none);
} }
&[disabled] {
&:disabled {
// disabled pseudo can't be included with .disabled // disabled pseudo can't be included with .disabled
// def because IE8 and below will drop it ;_; // def because IE8 and below will drop it ;_;
cursor: default; cursor: default;
background-image: none; background-image: none;
.reset-filter();
.opacity(65); .opacity(65);
} .box-shadow(none);
&:active {
@shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
} }
// Button Sizes // Button Sizes
@ -351,12 +485,15 @@ footer {
padding: 9px 14px 9px; padding: 9px 14px 9px;
.border-radius(6px); .border-radius(6px);
} }
&.small { &.small {
padding: 7px 9px 7px; padding: 7px 9px 7px;
font-size: 11px; font-size: 11px;
} }
}
// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
:root .alert-message,
:root .btn {
border-radius: 0 \0;
} }
// Help Firefox not be a jerk about adding extra padding to buttons // Help Firefox not be a jerk about adding extra padding to buttons
@ -369,7 +506,6 @@ input[type=submit].btn {
} }
// ERROR STYLES // ERROR STYLES
// ------------ // ------------
@ -419,6 +555,7 @@ input[type=submit].btn {
&.block-message { &.block-message {
background-image: none; background-image: none;
background-color: lighten(#fceec1, 5%); background-color: lighten(#fceec1, 5%);
.reset-filter();
padding: 14px; padding: 14px;
border-color: #fceec1; border-color: #fceec1;
.box-shadow(none); .box-shadow(none);
@ -450,74 +587,6 @@ input[type=submit].btn {
} }
} }
// NAVIGATION
// ----------
// Common tab and pill styles
.tabs,
.pills {
margin: 0 0 20px;
padding: 0;
.clearfix();
li {
display: inline;
a {
float: left;
width: auto;
}
}
}
// Basic Tabs
.tabs {
width: 100%;
border-bottom: 1px solid @grayLight;
li {
a {
margin-bottom: -1px;
margin-right: 2px;
padding: 0 15px;
line-height: (@baseline * 2) - 1;
.border-radius(3px 3px 0 0);
&:hover {
background-color: @grayLighter;
border-bottom: 1px solid @grayLight;
}
}
&.active a {
background-color: #fff;
padding: 0 14px;
border: 1px solid #ccc;
border-bottom: 0;
color: @gray;
}
}
}
// Basic pill nav
.pills {
li {
a {
margin: 5px 3px 5px 0;
padding: 0 15px;
text-shadow: 0 1px 1px #fff;
line-height: 30px;
.border-radius(15px);
&:hover {
background: @linkColorHover;
color: #fff;
text-decoration: none;
text-shadow: 0 1px 1px rgba(0,0,0,.25);
}
}
&.active a {
background: @linkColor;
color: #fff;
text-shadow: 0 1px 1px rgba(0,0,0,.25);
}
}
}
// PAGINATION // PAGINATION
// ---------- // ----------
@ -532,31 +601,31 @@ input[type=submit].btn {
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);
.border-radius(3px); .border-radius(3px);
.box-shadow(0 1px 2px rgba(0,0,0,.05)); .box-shadow(0 1px 2px rgba(0,0,0,.05));
li { }
display: inline; li {
a { display: inline;
float: left; }
padding: 0 14px; a {
line-height: (@baseline * 2) - 2; float: left;
border-right: 1px solid; padding: 0 14px;
border-right-color: #ddd; line-height: (@baseline * 2) - 2;
border-right-color: rgba(0,0,0,.15); border-right: 1px solid;
*border-right-color: #ddd; /* IE6-7 */ border-right-color: #ddd;
text-decoration: none; border-right-color: rgba(0,0,0,.15);
} *border-right-color: #ddd; /* IE6-7 */
a:hover, text-decoration: none;
&.active a { }
background-color: lighten(@blue, 45%); a:hover,
} .active a {
&.disabled a, background-color: lighten(@blue, 45%);
&.disabled a:hover { }
background-color: transparent; .disabled a,
color: @grayLight; .disabled a:hover {
} background-color: transparent;
&.next a { color: @grayLight;
border: 0; }
} .next a {
} border: 0;
} }
} }
@ -602,33 +671,33 @@ input[type=submit].btn {
.border-radius(6px); .border-radius(6px);
.box-shadow(0 3px 7px rgba(0,0,0,0.3)); .box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding-box); .background-clip(padding-box);
.modal-header { }
border-bottom: 1px solid #eee; .modal-header {
padding: 5px 20px; border-bottom: 1px solid #eee;
.close { padding: 5px 20px;
position: absolute; .close {
right: 10px; position: absolute;
top: 10px; right: 10px;
color: #999; top: 10px;
line-height:10px; color: #999;
font-size: 18px; line-height:10px;
} font-size: 18px;
} }
.modal-body { }
padding: 20px; .modal-body {
} padding: 20px;
.modal-footer { }
background-color: #f5f5f5; .modal-footer {
padding: 14px 20px 15px; background-color: #f5f5f5;
border-top: 1px solid #ddd; padding: 14px 20px 15px;
.border-radius(0 0 6px 6px); border-top: 1px solid #ddd;
.box-shadow(inset 0 1px 0 #fff); .border-radius(0 0 6px 6px);
.clearfix(); .box-shadow(inset 0 1px 0 #fff);
margin-bottom: 0; .clearfix();
.btn { margin-bottom: 0;
float: right; .btn {
margin-left: 10px; float: right;
} margin-left: 10px;
} }
} }
@ -686,20 +755,20 @@ input[type=submit].btn {
&.left .twipsy-arrow { #popoverArrow > .left(); } &.left .twipsy-arrow { #popoverArrow > .left(); }
&.below .twipsy-arrow { #popoverArrow > .below(); } &.below .twipsy-arrow { #popoverArrow > .below(); }
&.right .twipsy-arrow { #popoverArrow > .right(); } &.right .twipsy-arrow { #popoverArrow > .right(); }
.twipsy-inner { }
padding: 3px 8px; .twipsy-inner {
background-color: #000; padding: 3px 8px;
color: white; background-color: #000;
text-align: center; color: white;
max-width: 200px; text-align: center;
text-decoration: none; max-width: 200px;
.border-radius(4px); text-decoration: none;
} .border-radius(4px);
.twipsy-arrow { }
position: absolute; .twipsy-arrow {
width: 0; position: absolute;
height: 0; width: 0;
} height: 0;
} }
@ -723,9 +792,8 @@ input[type=submit].btn {
height: 0; height: 0;
} }
.inner { .inner {
background-color: #333; background: #333;
background-color: rgba(0,0,0,.8); background: rgba(0,0,0,.8);
*background-color: #333; /* IE 6-7 */
padding: 3px; padding: 3px;
overflow: hidden; overflow: hidden;
width: 280px; width: 280px;

View file

@ -36,7 +36,7 @@
@gridColumns: 16; @gridColumns: 16;
@gridColumnWidth: 40px; @gridColumnWidth: 40px;
@gridGutterWidth: 20px; @gridGutterWidth: 20px;
@extraSpace: 40px; @extraSpace: (@gridGutterWidth * 2); // For our grid calculations
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Color Scheme // Color Scheme
@ -229,6 +229,7 @@
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(left, @startColor, @endColor); // Le standard background-image: linear-gradient(left, @startColor, @endColor); // Le standard
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
} }
.vertical (@startColor: #555, @endColor: #333) { .vertical (@startColor: #555, @endColor: #333) {
background-color: @endColor; background-color: @endColor;
@ -240,6 +241,7 @@
background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(top, @startColor, @endColor); // The standard background-image: linear-gradient(top, @startColor, @endColor); // The standard
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
} }
.directional (@startColor: #555, @endColor: #333, @deg: 45deg) { .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
background-color: @endColor; background-color: @endColor;
@ -255,13 +257,19 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -moz-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
} }
} }
// Reset filters for IE
.reset-filter() {
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
}
// Opacity // Opacity
.opacity(@opacity: 100) { .opacity(@opacity: 100) {
filter: e(%("alpha(opacity=%d)", @opacity)); filter: e(%("alpha(opacity=%d)", @opacity));

View file

@ -134,13 +134,3 @@ textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9 overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser vertical-align: top; // Readability and alignment cross-browser
} }
// Tables
// -------------------------
// Source: http://github.com/necolas/normalize.css
// Remove spacing between table cells
table {
border-collapse: collapse;
border-spacing: 0;
}

View file

@ -9,28 +9,14 @@
.row { .row {
.clearfix(); .clearfix();
margin-left: -20px; margin-left: -1 * @gridGutterWidth;
// Default columns // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
.span1, // Credit to @dhg for the idea
.span2, [class*="span"] {
.span3,
.span4,
.span5,
.span6,
.span7,
.span8,
.span9,
.span10,
.span11,
.span12,
.span13,
.span14,
.span15,
.span16 {
display: inline; display: inline;
float: left; float: left;
margin-left: 20px; margin-left: @gridGutterWidth;
} }
// Default columns // Default columns
@ -64,6 +50,12 @@
.offset10 { .offset(10); } .offset10 { .offset(10); }
.offset11 { .offset(11); } .offset11 { .offset(11); }
.offset12 { .offset(12); } .offset12 { .offset(12); }
// Unique column sizes for 16-column grid
.span-one-third { width: 300px; }
.span-two-thirds { width: 620px; }
.offset-one-third { margin-left: 340px; }
.offset-two-thirds { margin-left: 660px; }
} }
@ -77,7 +69,6 @@ body {
margin: 0; margin: 0;
#font > .sans-serif(normal,@basefont,@baseline); #font > .sans-serif(normal,@basefont,@baseline);
color: @gray; color: @gray;
text-rendering: optimizeLegibility;
} }
// Container (centered, fixed-width layouts) // Container (centered, fixed-width layouts)
@ -90,11 +81,12 @@ body {
.container-fluid { .container-fluid {
padding: 0 20px; padding: 0 20px;
.clearfix(); .clearfix();
.sidebar { > .sidebar {
float: left; float: left;
width: 220px; width: 220px;
} }
.content { // TODO in v2: rename this and .popover .content to be more specific
> .content {
min-width: 700px; min-width: 700px;
max-width: 1180px; max-width: 1180px;
margin-left: 240px; margin-left: 240px;
@ -116,89 +108,3 @@ a {
text-decoration: underline; text-decoration: underline;
} }
} }
// Buttons
.btn {
display: inline-block;
#gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
padding: 4px 14px;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
color: #333;
font-size: 13px;
line-height: @baseline;
border: 1px solid #ccc;
border-bottom-color: #bbb;
.border-radius(4px);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
&:hover {
background-position: 0 -15px;
color: #333;
text-decoration: none;
}
}
.primary {
#gradient > .vertical(#049CDB, #0064CD);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border: 1px solid darken(#0064CD, 10%);
border-bottom-color: darken(#0064CD, 15%);
&:hover {
color: #fff;
}
}
.btn {
//.button(#1174C6);
.transition(.1s linear all);
&.primary {
//#gradient > .vertical(@blue, @blueDark);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border-color: @blueDark @blueDark darken(@blueDark, 15%);
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
&:hover {
color: #fff;
}
}
&.large {
font-size: 16px;
line-height: 28px;
.border-radius(6px);
}
&.small {
padding-right: 9px;
padding-left: 9px;
font-size: 11px;
}
&.disabled {
background-image: none;
.opacity(65);
cursor: default;
.box-shadow(none);
}
// this can't be included with the .disabled def because IE8 and below will drop it ;_;
&:disabled {
background-image: none;
.opacity(65);
cursor: default;
.box-shadow(none);
&.primary {
color: #fff;
}
}
&:active {
@shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
}
}
// Help Firefox not be a jerk about adding extra padding to buttons
button.btn,
input[type=submit].btn {
&::-moz-focus-inner {
padding: 0;
border: 0;
}
}