Skip to content

Commit

Permalink
update whitspace and comment styles
Browse files Browse the repository at this point in the history
  • Loading branch information
fat committed Aug 17, 2011
1 parent 5eb962f commit 6d0b083
Show file tree
Hide file tree
Showing 10 changed files with 109 additions and 82 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -26,7 +26,6 @@ Reporting bugs

Please create an issue here on github! :P


AUTHORS
-------

Expand Down
28 changes: 7 additions & 21 deletions bootstrap-1.0.0.css
Expand Up @@ -6,12 +6,11 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jul 29 13:03:43 PDT 2011
* Date: Tue Aug 16 22:54:18 PDT 2011
*/
/*
* Reset.less
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
*/
* ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
html, body {
margin: 0;
padding: 0;
Expand Down Expand Up @@ -125,9 +124,7 @@ aside {
/*
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
*/
/* Baseline Grid System
-------------------------------------------------- */
* ------------------------------------------------------------------------------------------- */
.row {
zoom: 1;
}
Expand Down Expand Up @@ -338,8 +335,6 @@ aside {
.row .offset12:first-child {
margin-left: 720px !important;
}
/* Structural Layout
-------------------------------------------------- */
html, body {
background-color: #fff;
}
Expand Down Expand Up @@ -376,8 +371,6 @@ div.container-fluid div.content {
max-width: 1180px;
margin-left: 240px;
}
/* Base Styles
-------------------------------------------------- */
a {
color: #0069d6;
text-decoration: none;
Expand Down Expand Up @@ -639,12 +632,9 @@ pre {
border-radius: 3px;
white-space: pre-wrap;
}
/*
* Forms.less
/* Forms.less
* Base styles for various input types, form layouts, and states
*/
/* Global form styles
-------------------------------------------------- */
* ------------------------------------------------------------- */
form {
margin-bottom: 18px;
}
Expand Down Expand Up @@ -981,9 +971,7 @@ form.form-stacked div.actions {
/*
* Tables.less
* Tables for, you guessed it, tabular data
*/
/* Baseline styles
-------------------------------------------------- */
* ---------------------------------------- */
table {
width: 100%;
margin-bottom: 18px;
Expand All @@ -1003,8 +991,6 @@ table th {
font-weight: bold;
border-bottom-width: 2px;
}
/* Zebra-striping
-------------------------------------------------- */
table.zebra-striped tbody tr:nth-child(odd) td {
background-color: #f9f9f9;
}
Expand Down
3 changes: 2 additions & 1 deletion lib/bootstrap.less
Expand Up @@ -20,4 +20,5 @@
@import "type.less";
@import "forms.less";
@import "tables.less";
@import "patterns.less";
@import "patterns.less";

22 changes: 17 additions & 5 deletions lib/forms.less
@@ -1,14 +1,14 @@
/*
* Forms.less
/* Forms.less
* Base styles for various input types, form layouts, and states
*/
* ------------------------------------------------------------- */


/* Global form styles
-------------------------------------------------- */
// FORM STYLES
// -----------

form {
margin-bottom: @baseline;

// Groups of fields with labels on top (legends)
fieldset {
margin-bottom: @baseline;
Expand All @@ -21,14 +21,17 @@ form {
color: @grayDark;
}
}

// Parent element that clears floats and wraps labels and fields together
div.clearfix {
margin-bottom: @baseline;
}

// Set font for forms
label, input, select, textarea {
#font > .sans-serif(normal,13px,normal);
}

// Float labels left
label {
padding-top: 6px;
Expand All @@ -39,15 +42,18 @@ form {
text-align: right;
color: @grayDark;
}

// Shift over the inside div to align all label's relevant content
div.input {
margin-left: 150px;
}

// Checkboxs and radio buttons
input[type=checkbox],
input[type=radio] {
cursor: pointer;
}

// Inputs, Textareas, Selects
input[type=text],
input[type=password],
Expand Down Expand Up @@ -79,13 +85,15 @@ form {
border-color: #ccc;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
}

// Placeholder text gets special styles; can't be bundled together though for some reason
:-moz-placeholder {
color: @grayLight;
}
::-webkit-input-placeholder {
color: @grayLight;
}

// Focus states
input[type=text],
input[type=password],
Expand All @@ -102,6 +110,7 @@ form {
@shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow);
}

// Error styles
div.error {
background: lighten(@red, 57%);
Expand Down Expand Up @@ -133,6 +142,7 @@ form {
}
}
}

// Form element sizes
.input-mini, input.mini, textarea.mini, select.mini {
width: 60px;
Expand All @@ -155,6 +165,7 @@ form {
textarea.xxlarge {
overflow-y: scroll;
}

// Turn off focus for disabled (read-only) form elements
input[readonly]:focus,
textarea[readonly]:focus,
Expand Down Expand Up @@ -194,6 +205,7 @@ div.actions {
.help-inline {
padding-left: 5px;
}

// Big blocks of help text
.help-block {
display: block;
Expand Down
35 changes: 24 additions & 11 deletions lib/patterns.less
Expand Up @@ -2,7 +2,8 @@
* Repeatable UI elements outside the base styles provided from the scaffolding
* ---------------------------------------------------------------------------- */

// Topbar

// TOPBAR
// ------

// Topbar for Branding and Nav
Expand All @@ -17,11 +18,13 @@ div.topbar {
overflow: visible;
@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
a {
color: @grayLight;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}

// Hover and active states for links
ul li a:hover,
ul li.active a,
Expand All @@ -31,6 +34,7 @@ div.topbar {
color: @white;
text-decoration: none;
}

// Logo
a.logo {
float: left;
Expand All @@ -46,6 +50,7 @@ div.topbar {
margin-right: 6px;
}
}

// Search Form
form {
float: left;
Expand All @@ -65,6 +70,7 @@ div.topbar {
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
.box-shadow(@shadow);
.transition(none);

// Placeholder text gets special styles; can't be bundled together though for some reason
&:-moz-placeholder {
color: @grayLighter;
Expand All @@ -89,6 +95,7 @@ div.topbar {
}
}
}

// Navigation
ul {
display: block;
Expand Down Expand Up @@ -120,6 +127,7 @@ div.topbar {
background-color: rgba(0,0,0,.5);
}
}

// Dropdowns
&.primary-nav li ul {
left: 0;
Expand Down Expand Up @@ -207,6 +215,7 @@ div.topbar {
color: #fff;
}
}

// Dividers (basically an hr)
&.divider {
height: 1px;
Expand All @@ -215,6 +224,7 @@ div.topbar {
border-bottom: 1px solid rgba(255,255,255,.1);
margin: 5px 0;
}

// Section separaters
span {
clear: both;
Expand All @@ -230,7 +240,8 @@ div.topbar {
}
}

// Page Headers

// PAGE HEADERS
// ------------

div.page-header {
Expand All @@ -243,7 +254,7 @@ div.page-header {
}


// Error Styles
// ERROR STYLES
// ------------

// One-liner alert bars
Expand Down Expand Up @@ -336,7 +347,7 @@ div.block-message {
}


// Navigation
// NAVIGATION
// ----------

// Common tab and pill styles
Expand All @@ -353,6 +364,7 @@ ul.pills {
}
}
}

// Basic Tabs
ul.tabs {
width: 100%;
Expand All @@ -378,6 +390,7 @@ ul.tabs {
}
}
}

// Basic pill nav
ul.pills {
li {
Expand All @@ -403,8 +416,8 @@ ul.pills {
}


// Pagination
// --------------------------------------------------
// PAGINATION
// ----------

div.pagination {
height: @baseline * 2;
Expand Down Expand Up @@ -442,7 +455,7 @@ div.pagination {
}


// Wells
// WELLS
// -----

div.well {
Expand All @@ -456,7 +469,7 @@ div.well {
}


// Modals
// MODALS
// ------

div.modal-backdrop {
Expand Down Expand Up @@ -510,7 +523,7 @@ div.modal {
}


// Popover Arrows
// POPOVER ARROWS
// --------------

#popoverArrow {
Expand Down Expand Up @@ -548,7 +561,7 @@ div.modal {
}
}

// Twipsy
// TWIPSY
// ------

div.twipsy {
Expand Down Expand Up @@ -580,7 +593,7 @@ div.twipsy {
}


// Popovers
// POPOVERS
// --------

.popover {
Expand Down

0 comments on commit 6d0b083

Please sign in to comment.