rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-17 14:54:30 +01:00
Code Issues Actions Packages Releases Activity

update property order and do some misc cleanup

Browse Source
This commit is contained in:
Mark Otto 2011-11-17 01:28:42 -08:00
parent 159c7a7fda
commit 4e6275d0fe
13 changed files with 105 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/breadcrumbs.less
View File

@ -2,8 +2,8 @@
// ----------- // -----------
.breadcrumb { .breadcrumb {
margin: 0 0 @baseLineHeight;
padding: 7px 14px; padding: 7px 14px;
margin: 0 0 @baseLineHeight;
#gradient > .vertical(#ffffff, #f5f5f5); #gradient > .vertical(#ffffff, #f5f5f5);
border: 1px solid #ddd; border: 1px solid #ddd;
.border-radius(3px); .border-radius(3px);

30
lib/forms.less
View File

@ -69,11 +69,11 @@ input[type=radio] {
// Reset the file input to browser defaults // Reset the file input to browser defaults
input[type=file] { input[type=file] {
padding: initial;
line-height: initial;
border: initial;
background-color: @white; background-color: @white;
background-color: initial; background-color: initial;
padding: initial;
border: initial;
line-height: initial;
.box-shadow(none); .box-shadow(none);
} }
@ -89,14 +89,14 @@ input[type=submit] {
select, select,
input[type=file] { input[type=file] {
height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size height: @baseLineHeight * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
line-height: @baseLineHeight * 1.5;
*margin-top: 4px; /* For IE7, add top margin to align select with labels */ *margin-top: 4px; /* For IE7, add top margin to align select with labels */
line-height: @baseLineHeight * 1.5;
} }
// Make multiple select elements height not fixed // Make multiple select elements height not fixed
select[multiple] { select[multiple] {
background-color: @white; // Fixes Chromium bug?
height: inherit; height: inherit;
background-color: @white; // Fixes Chromium bug?
} }
textarea { textarea {
@ -110,16 +110,16 @@ textarea {
input, input,
textarea { textarea {
.box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
@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));
} }
input:focus, input:focus,
textarea:focus { textarea:focus {
outline: 0;
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
@shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow); .box-shadow(@shadow);
outline: 0;
} }
input[type=file]:focus, input[type=file]:focus,
input[type=checkbox]:focus, input[type=checkbox]:focus,
@ -248,8 +248,8 @@ form .clearfix.success {
// For text that needs to appear as an input but should not be an input // For text that needs to appear as an input but should not be an input
.uneditable-input { .uneditable-input {
background-color: @white;
display: block; display: block;
background-color: @white;
border-color: #eee; border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
cursor: not-allowed; cursor: not-allowed;
@ -275,10 +275,10 @@ form .clearfix.success {
} }
.help-inline { .help-inline {
display: inline;
padding-left: 5px;
*position: relative; /* IE6-7 */ *position: relative; /* IE6-7 */
*top: -5px; /* IE6-7 */ *top: -5px; /* IE6-7 */
display: inline;
padding-left: 5px;
} }
// Big blocks of help text // Big blocks of help text
@ -321,25 +321,25 @@ form .clearfix.success {
} }
.add-on { .add-on {
position: relative; position: relative;
background: #f5f5f5;
border: 1px solid #ccc;
z-index: 2; z-index: 2;
float: left; float: left;
display: block; display: block;
width: auto; width: auto;
min-width: 16px; min-width: 16px;
height: @baseLineHeight; height: @baseLineHeight;
padding: 4px 4px 4px 5px;
margin-right: -1px; margin-right: -1px;
padding: 4px 4px 4px 5px;
font-weight: normal; font-weight: normal;
line-height: @baseLineHeight; line-height: @baseLineHeight;
color: @grayLight; color: @grayLight;
text-align: center; text-align: center;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
background-color: #f5f5f5;
border: 1px solid #ccc;
.border-radius(3px 0 0 3px); .border-radius(3px 0 0 3px);
} }
.active { .active {
background: lighten(@green, 30); background-color: lighten(@green, 30);
border-color: @green; border-color: @green;
} }
} }
@ -354,9 +354,9 @@ form .clearfix.success {
.border-radius(3px 0 0 3px); .border-radius(3px 0 0 3px);
} }
.add-on { .add-on {
.border-radius(0 3px 3px 0);
margin-right: 0; margin-right: 0;
margin-left: -1px; margin-left: -1px;
.border-radius(0 3px 3px 0);
} }
} }

11
lib/mixins.less
View File

@ -9,9 +9,9 @@
&:before, &:before,
&:after { &:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1; zoom: 1;
*display: inline;
} }
&:after { &:after {
clear: both; clear: both;
@ -27,8 +27,8 @@
// Sizing shortcuts // Sizing shortcuts
.size(@height: 5px, @width: 5px) { .size(@height: 5px, @width: 5px) {
height: @height;
width: @width; width: @width;
height: @height;
} }
.square(@size: 5px) { .square(@size: 5px) {
.size(@size, @size); .size(@size, @size);
@ -197,14 +197,16 @@
} }
.border(@color: @white, @alpha: 1) { .border(@color: @white, @alpha: 1) {
border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha); border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
} }
} }
// Gradient Bar Colors for buttons and alerts // Gradient Bar Colors for buttons and alerts
.gradientBar(@primaryColor, @secondaryColor) { .gradientBar(@primaryColor, @secondaryColor) {
#gradient > .vertical(@primaryColor, @secondaryColor);
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);
#gradient > .vertical(@primaryColor, @secondaryColor);
border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
} }
@ -274,7 +276,6 @@
// Opacity // Opacity
.opacity(@opacity: 100) { .opacity(@opacity: 100) {
filter: e(%("alpha(opacity=%d)", @opacity)); filter: e(%("alpha(opacity=%d)", @opacity));
-khtml-opacity: @opacity / 100;
-moz-opacity: @opacity / 100; -moz-opacity: @opacity / 100;
opacity: @opacity / 100; opacity: @opacity / 100;
} }

10
lib/modals.less
View File

@ -2,13 +2,13 @@
// ------ // ------
.modal-backdrop { .modal-backdrop {
background-color: @black;
position: fixed; position: fixed;
top: 0; top: 0;
left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0;
z-index: 10000; z-index: 10000;
background-color: @black;
// Fade for backdrop // Fade for backdrop
&.fade { opacity: 0; } &.fade { opacity: 0; }
} }
@ -39,20 +39,20 @@
&.fade.in { top: 50%; } &.fade.in { top: 50%; }
} }
.modal-header { .modal-header {
border-bottom: 1px solid #eee;
padding: 5px 15px; padding: 5px 15px;
border-bottom: 1px solid #eee;
} }
.modal-body { .modal-body {
padding: 15px; padding: 15px;
} }
.modal-footer { .modal-footer {
background-color: #f5f5f5;
padding: 14px 15px 15px; padding: 14px 15px 15px;
margin-bottom: 0;
background-color: #f5f5f5;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
.border-radius(0 0 6px 6px); .border-radius(0 0 6px 6px);
.box-shadow(inset 0 1px 0 @white); .box-shadow(inset 0 1px 0 @white);
.clearfix(); .clearfix();
margin-bottom: 0;
.btn { .btn {
float: right; float: right;
margin-left: 5px; margin-left: 5px;

4
lib/pagination.less
View File

@ -19,11 +19,11 @@
float: left; float: left;
padding: 0 14px; padding: 0 14px;
line-height: (@baseLineHeight * 2) - 2; line-height: (@baseLineHeight * 2) - 2;
text-decoration: none;
border-right: 1px solid; border-right: 1px solid;
border-right-color: #ddd; border-right-color: #ddd;
border-right-color: rgba(0,0,0,.15); border-right-color: rgba(0,0,0,.15);
*border-right-color: #ddd; /* IE6-7 */ *border-right-color: #ddd; /* IE6-7 */
text-decoration: none;
} }
a:hover, a:hover,
.active a { .active a {
@ -31,8 +31,8 @@
} }
.disabled a, .disabled a,
.disabled a:hover { .disabled a:hover {
background-color: transparent;
color: @grayLight; color: @grayLight;
background-color: transparent;
} }
.next a { .next a {
border: 0; border: 0;

95
lib/patterns.less
View File

@ -33,10 +33,10 @@
// Hover and active states // Hover and active states
.brand a:hover, .brand a:hover,
ul .active > a { ul .active > a {
background-color: @navBarBgStart;
background-color: rgba(255,255,255,.05);
color: @white; color: @white;
text-decoration: none; text-decoration: none;
background-color: @navBarBgStart;
background-color: rgba(255,255,255,.05);
} }
// Website or project name // Website or project name
.brand { .brand {
@ -44,18 +44,18 @@
display: block; display: block;
padding: 8px 20px 12px; padding: 8px 20px 12px;
margin-left: -20px; // negative indent to left-align the text down the page margin-left: -20px; // negative indent to left-align the text down the page
color: @white;
font-size: 20px; font-size: 20px;
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
color: @white;
} }
// Plain text in topbar // Plain text in topbar
p { p {
margin: 0; margin: 0;
line-height: 40px; line-height: 40px;
a:hover { a:hover {
background-color: transparent;
color: @white; color: @white;
background-color: transparent;
} }
} }
} }
@ -63,16 +63,16 @@
// Navbar search // Navbar search
.navbar-search { .navbar-search {
position: relative; position: relative;
float: left;
margin-top: 6px; margin-top: 6px;
margin-bottom: 0; margin-bottom: 0;
float: left;
.search-query { .search-query {
background-color: #444;
background-color: rgba(255,255,255,.3);
#font > .sans-serif(13px, normal, 1);
padding: 4px 9px; padding: 4px 9px;
#font > .sans-serif(13px, normal, 1);
color: @white; color: @white;
color: rgba(255,255,255,.75); color: rgba(255,255,255,.75);
background-color: #444;
background-color: rgba(255,255,255,.3);
border: 1px solid #111; border: 1px solid #111;
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
.box-shadow(@shadow); .box-shadow(@shadow);
@ -87,20 +87,20 @@
} }
// Hover states // Hover states
&:hover { &:hover {
color: @white;
background-color: @grayLight; background-color: @grayLight;
background-color: rgba(255,255,255,.5); background-color: rgba(255,255,255,.5);
color: @white;
} }
// 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: 0; padding: 5px 10px;
background-color: @white;
color: @grayDark; color: @grayDark;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
background-color: @white;
border: 0; border: 0;
padding: 5px 10px;
.box-shadow(0 0 3px rgba(0,0,0,.15)); .box-shadow(0 0 3px rgba(0,0,0,.15));
outline: 0;
} }
} }
} }
@ -120,8 +120,8 @@
.navbar-fixed { .navbar-fixed {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0;
right: 0; right: 0;
left: 0;
z-index: 10000; z-index: 10000;
} }
@ -133,11 +133,11 @@
// Nav for navbar and topbar // Nav for navbar and topbar
// ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
.nav { .nav {
position: relative;
left: 0;
display: block; display: block;
float: left; float: left;
margin: 0 10px 0 0; margin: 0 10px 0 0;
position: relative;
left: 0;
> li { > li {
display: block; display: block;
float: left; float: left;
@ -212,37 +212,36 @@
} }
// The link that is clicked to toggle the dropdown // The link that is clicked to toggle the dropdown
.dropdown-toggle:after { .dropdown-toggle:after {
display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
display: inline-block;
content: "↓";
text-indent: -99999px;
vertical-align: top;
margin-top: 8px; margin-top: 8px;
margin-left: 6px; margin-left: 6px;
text-indent: -99999px;
vertical-align: top;
border-left: 4px solid transparent; border-left: 4px solid transparent;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-top: 4px solid @white; border-top: 4px solid @white;
.opacity(30); .opacity(30);
content: "↓";
} }
.dropdown:hover .dropdown-toggle:after { .dropdown:hover .dropdown-toggle:after {
.opacity(100); .opacity(100);
} }
// The dropdown menu (ul) // The dropdown menu (ul)
.dropdown-menu { .dropdown-menu {
background-color: @white;
float: left;
display: none; // None by default, but block on "open" of the menu
position: absolute; position: absolute;
top: 40px; top: 40px;
z-index: 900; z-index: 900;
float: left;
display: none; // None by default, but block on "open" of the menu
min-width: 160px; min-width: 160px;
max-width: 220px; max-width: 220px;
_width: 160px; _width: 160px;
padding: 6px 0;
margin-left: 0; // override default ul styles margin-left: 0; // override default ul styles
margin-right: 0; margin-right: 0;
padding: 6px 0; background-color: @white;
zoom: 1; // do we need this?
border-color: #999; border-color: #999;
border-color: rgba(0,0,0,.2); border-color: rgba(0,0,0,.2);
border-style: solid; border-style: solid;
@ -250,6 +249,7 @@
.border-radius(0 0 6px 6px); .border-radius(0 0 6px 6px);
.box-shadow(0 2px 4px rgba(0,0,0,.2)); .box-shadow(0 2px 4px rgba(0,0,0,.2));
.background-clip(padding-box); .background-clip(padding-box);
zoom: 1; // do we need this?
// Unfloat any li's to make them stack // Unfloat any li's to make them stack
li { li {
@ -279,9 +279,9 @@
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
// Hover state // Hover state
&:hover { &:hover {
#gradient > .vertical(#eeeeee, #dddddd);
color: @grayDark; color: @grayDark;
text-decoration: none; text-decoration: none;
#gradient > .vertical(#eeeeee, #dddddd);
@shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025); @shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
.box-shadow(@shadow); .box-shadow(@shadow);
} }
@ -309,9 +309,9 @@
// ------------ // ------------
.hero-unit { .hero-unit {
background-color: #f5f5f5;
margin-bottom: 30px;
padding: 60px; padding: 60px;
margin-bottom: 30px;
background-color: #f5f5f5;
.border-radius(6px); .border-radius(6px);
h1 { h1 {
margin-bottom: 0; margin-bottom: 0;
@ -326,8 +326,8 @@
} }
} }
footer { footer {
margin-top: @baseLineHeight - 1;
padding-top: @baseLineHeight - 1; padding-top: @baseLineHeight - 1;
margin-top: @baseLineHeight - 1;
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
@ -380,24 +380,24 @@ footer {
// Base .btn styles // Base .btn styles
.btn { .btn {
// Button Base // Button Base
cursor: pointer;
display: inline-block; display: inline-block;
#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);
color: #333;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: normal; line-height: normal;
color: #333;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
#gradient > .vertical-three-colors(#ffffff, #ffffff, 25%, darken(#ffffff, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
border: 1px solid #ccc; border: 1px solid #ccc;
border-bottom-color: #bbb; border-bottom-color: #bbb;
.border-radius(4px); .border-radius(4px);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow); .box-shadow(@shadow);
cursor: pointer;
&:hover { &:hover {
background-position: 0 -15px;
color: #333; color: #333;
text-decoration: none; text-decoration: none;
background-position: 0 -15px;
} }
// Focus state for keyboard and accessibility // Focus state for keyboard and accessibility
@ -438,9 +438,9 @@ footer {
// Button Sizes // Button Sizes
&.large { &.large {
padding: 9px 14px 9px;
font-size: @baseFontSize + 2px; font-size: @baseFontSize + 2px;
line-height: normal; line-height: normal;
padding: 9px 14px 9px;
.border-radius(6px); .border-radius(6px);
} }
&.small { &.small {
@ -516,10 +516,10 @@ input[type=submit].btn {
// ----------- // -----------
.close { .close {
float: right; float: right;
color: @black;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
line-height: @baseLineHeight * .75; line-height: @baseLineHeight * .75;
color: @black;
text-shadow: 0 1px 0 rgba(255,255,255,1); text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20); .opacity(20);
&:hover { &:hover {
@ -539,8 +539,8 @@ input[type=submit].btn {
padding: 7px 15px; padding: 7px 15px;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
color: @grayDark; color: @grayDark;
.gradientBar(#fceec1, #eedc94); // warning by default
text-shadow: 0 1px 0 rgba(255,255,255,.5); text-shadow: 0 1px 0 rgba(255,255,255,.5);
.gradientBar(#fceec1, #eedc94); // warning by default
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
.border-radius(4px); .border-radius(4px);
@ -569,10 +569,10 @@ input[type=submit].btn {
} }
&.block-message { &.block-message {
padding: 14px;
background-image: none; background-image: none;
background-color: lighten(#fceec1, 5%); background-color: lighten(#fceec1, 5%);
.reset-filter(); .reset-filter(); // undo gradient for IE9
padding: 14px;
border-color: #fceec1; border-color: #fceec1;
.box-shadow(none); .box-shadow(none);
ul, p { ul, p {
@ -615,10 +615,10 @@ input[type=submit].btn {
// ----- // -----
.well { .well {
background-color: #f5f5f5;
margin-bottom: 20px;
padding: 19px;
min-height: 20px; min-height: 20px;
padding: 19px;
margin-bottom: 20px;
background-color: #f5f5f5;
border: 1px solid #eee; border: 1px solid #eee;
border: 1px solid rgba(0,0,0,.05); border: 1px solid rgba(0,0,0,.05);
.border-radius(4px); .border-radius(4px);
@ -655,11 +655,11 @@ input[type=submit].btn {
.label { .label {
padding: 1px 3px 2px; padding: 1px 3px 2px;
background-color: @grayLight;
font-size: @baseFontSize * .75; font-size: @baseFontSize * .75;
font-weight: bold; font-weight: bold;
color: @white; color: @white;
text-transform: uppercase; text-transform: uppercase;
background-color: @grayLight;
.border-radius(3px); .border-radius(3px);
&.important { background-color: #c43c35; } &.important { background-color: #c43c35; }
&.warning { background-color: @orange; } &.warning { background-color: @orange; }
@ -667,14 +667,3 @@ input[type=submit].btn {
&.notice { background-color: lighten(@blue, 25%); } &.notice { background-color: lighten(@blue, 25%); }
} }
// MISC
// ----
.pull-right {
float: right;
}
.pull-left {
float: left;
}

14
lib/popovers.less
View File

@ -6,8 +6,8 @@
top: 0; top: 0;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
padding: 5px;
display: none; display: none;
padding: 5px;
&.above .arrow { #popoverArrow > .above(); } &.above .arrow { #popoverArrow > .above(); }
&.right .arrow { #popoverArrow > .right(); } &.right .arrow { #popoverArrow > .right(); }
&.below .arrow { #popoverArrow > .below(); } &.below .arrow { #popoverArrow > .below(); }
@ -18,24 +18,24 @@
height: 0; height: 0;
} }
.inner { .inner {
padding: 3px;
width: 280px;
overflow: hidden;
background-color: @black; background-color: @black;
background-color: rgba(0,0,0,.8); background-color: rgba(0,0,0,.8);
padding: 3px;
overflow: hidden;
width: 280px;
.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));
} }
.title { .title {
background-color: #f5f5f5;
padding: 9px 15px; padding: 9px 15px;
line-height: 1; line-height: 1;
.border-radius(3px 3px 0 0); background-color: #f5f5f5;
border-bottom:1px solid #eee; border-bottom:1px solid #eee;
.border-radius(3px 3px 0 0);
} }
.content { .content {
background-color: @white;
padding: 14px; padding: 14px;
background-color: @white;
.border-radius(0 0 3px 3px); .border-radius(0 0 3px 3px);
.background-clip(padding-box); .background-clip(padding-box);
p, ul, ol { p, ul, ol {

12
lib/reset.less
View File

@ -75,9 +75,9 @@ audio:not([controls]) {
// Source: http://github.com/necolas/normalize.css // Source: http://github.com/necolas/normalize.css
sub, sub,
sup { sup {
position: relative;
font-size: 75%; font-size: 75%;
line-height: 0; line-height: 0;
position: relative;
vertical-align: baseline; vertical-align: baseline;
} }
sup { sup {
@ -91,8 +91,8 @@ sub {
// ------------------------- // -------------------------
// Source: http://github.com/necolas/normalize.css // Source: http://github.com/necolas/normalize.css
img { img {
border: 0; border: 0;
-ms-interpolation-mode: bicubic; -ms-interpolation-mode: bicubic;
} }
// Forms // Forms
@ -104,20 +104,20 @@ button,
input, input,
select, select,
textarea { textarea {
font-size: 100%;
margin: 0; margin: 0;
font-size: 100%;
vertical-align: baseline; vertical-align: baseline;
*vertical-align: middle; *vertical-align: middle;
} }
button, button,
input { input {
line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
*overflow: visible; // Inner spacing ie IE6/7 *overflow: visible; // Inner spacing ie IE6/7
line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
} }
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
border: 0;
padding: 0; padding: 0;
border: 0;
} }
button, button,
input[type="button"], input[type="button"],

6
lib/scaffolding.less
View File

@ -8,12 +8,12 @@
// ----------------- // -----------------
body { body {
background-color: @white;
margin: 0; margin: 0;
font-family: @baseFontFamily; font-family: @baseFontFamily;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
color: @grayDark; color: @grayDark;
background-color: @white;
} }
// Container (centered, fixed-width layouts) // Container (centered, fixed-width layouts)
@ -52,10 +52,10 @@ body {
// Links // Links
a { a {
font-weight: inherit;
line-height: inherit;
color: @linkColor; color: @linkColor;
text-decoration: none; text-decoration: none;
line-height: inherit;
font-weight: inherit;
&:hover { &:hover {
color: @linkColorHover; color: @linkColorHover;
text-decoration: underline; text-decoration: underline;

8
lib/tables.less
View File

@ -130,32 +130,32 @@ table {
.header { .header {
cursor: pointer; cursor: pointer;
&:after { &:after {
content: "";
float: right; float: right;
margin-top: 7px; margin-top: 7px;
border-width: 0 4px 4px; border-width: 0 4px 4px;
border-style: solid; border-style: solid;
border-color: #000 transparent; border-color: #000 transparent;
content: "";
visibility: hidden; visibility: hidden;
} }
} }
// Style the sorted column headers (THs) // Style the sorted column headers (THs)
.headerSortUp, .headerSortUp,
.headerSortDown { .headerSortDown {
background-color: rgba(141,192,219,.25);
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
background-color: rgba(141,192,219,.25);
} }
// Style the ascending (reverse alphabetical) column header // Style the ascending (reverse alphabetical) column header
.header:hover { .header:hover {
&:after { &:after {
visibility:visible; visibility: visible;
} }
} }
// Style the descending (alphabetical) column header // Style the descending (alphabetical) column header
.headerSortDown, .headerSortDown,
.headerSortDown:hover { .headerSortDown:hover {
&:after { &:after {
visibility:visible; visibility: visible;
.opacity(60); .opacity(60);
} }
} }

7
lib/tabs-pills.less
View File

@ -1,8 +1,8 @@
// Tabs and Pills // Tabs and Pills
.tabs, .tabs,
.pills { .pills {
margin: 0 0 20px;
padding: 0; padding: 0;
margin: 0 0 20px;
list-style: none; list-style: none;
.clearfix(); .clearfix();
> li { > li {
@ -183,8 +183,8 @@
// Pills // Pills
.pills { .pills {
a { a {
margin: 5px 3px 5px 0;
padding: 0 15px; padding: 0 15px;
margin: 5px 3px 5px 0;
line-height: 30px; line-height: 30px;
text-shadow: 0 1px 1px @white; text-shadow: 0 1px 1px @white;
.border-radius(15px); .border-radius(15px);
@ -208,9 +208,6 @@
} }
// Tabbable areas // Tabbable areas
.tab-content,
.pill-content {
}
.tab-content > .tab-pane, .tab-content > .tab-pane,
.pill-content > .pill-pane { .pill-content > .pill-pane {
display: none; display: none;

8
lib/twipsy.less
View File

@ -2,12 +2,12 @@
// ------ // ------
.twipsy { .twipsy {
display: block;
position: absolute; position: absolute;
z-index: 1000;
display: block;
visibility: visible; visibility: visible;
padding: 5px; padding: 5px;
font-size: 11px; font-size: 11px;
z-index: 1000;
.opacity(80); .opacity(80);
&.fade.in { &.fade.in {
.opacity(80); .opacity(80);
@ -18,12 +18,12 @@
&.right .twipsy-arrow { #popoverArrow > .right(); } &.right .twipsy-arrow { #popoverArrow > .right(); }
} }
.twipsy-inner { .twipsy-inner {
max-width: 200px;
padding: 3px 8px; padding: 3px 8px;
background-color: @black;
color: white; color: white;
text-align: center; text-align: center;
max-width: 200px;
text-decoration: none; text-decoration: none;
background-color: @black;
.border-radius(4px); .border-radius(4px);
} }
.twipsy-arrow { .twipsy-arrow {

16
lib/type.less
View File

@ -7,10 +7,10 @@
// --------- // ---------
p { p {
margin-bottom: @baseLineHeight / 2;
font-family: @baseFontFamily; font-family: @baseFontFamily;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
margin-bottom: @baseLineHeight / 2;
small { small {
font-size: @baseFontSize - 2; font-size: @baseFontSize - 2;
color: @grayLight; color: @grayLight;
@ -93,8 +93,8 @@ li {
color: @grayDark; color: @grayDark;
} }
ul.unstyled { ul.unstyled {
list-style: none;
margin-left: 0; margin-left: 0;
list-style: none;
} }
// Description Lists // Description Lists
@ -145,12 +145,12 @@ abbr {
// Blockquotes // Blockquotes
blockquote { blockquote {
padding-left: 15px;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
border-left: 5px solid #eee; border-left: 5px solid #eee;
padding-left: 15px;
p { p {
#font > .shorthand(300,16px,@baseLineHeight * 1.25);
margin-bottom: 0; margin-bottom: 0;
#font > .shorthand(300,16px,@baseLineHeight * 1.25);
} }
small { small {
display: block; display: block;
@ -174,8 +174,8 @@ blockquote {
// Addresses // Addresses
address { address {
display: block; display: block;
line-height: @baseLineHeight;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
line-height: @baseLineHeight;
} }
// Inline and block code styles // Inline and block code styles
@ -188,16 +188,16 @@ pre {
.border-radius(3px); .border-radius(3px);
} }
code { code {
background-color: lighten(@orange, 40%);
padding: 1px 3px; padding: 1px 3px;
background-color: lighten(@orange, 40%);
} }
pre { pre {
background-color: #f5f5f5;
display: block; display: block;
padding: (@baseLineHeight - 1) / 2; padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseLineHeight / 2; margin: 0 0 @baseLineHeight / 2;
line-height: @baseLineHeight;
font-size: 12px; font-size: 12px;
line-height: @baseLineHeight;
background-color: #f5f5f5;
border: 1px solid #ccc; border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);
.border-radius(3px); .border-radius(3px);