mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Mark Otto
2011-11-29 22:35:58 -08:00
parent b36df46310 08d0aff19f
commit cbb291b8ab
32 changed files with 1372 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/forms.less
+4 -5
View File
@@ -1,7 +1,6 @@
/* Forms.less
* Base styles for various input types, form layouts, and states
* ------------------------------------------------------------- */
// Forms.less
// Base styles for various input types, form layouts, and states
// -------------------------------------------------------------
// GENERAL STYLES
@@ -146,7 +145,7 @@ select:focus {
.formColumns(@columnSpan: 1) {
display: inline-block;
float: none;
width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
margin-left: 0;
}
input,
lib/mixins.less
+3 -3
View File
@@ -1,6 +1,6 @@
/* Mixins.less
* Snippets of reusable CSS to develop faster and keep code readable
* ----------------------------------------------------------------- */
// Mixins.less
// Snippets of reusable CSS to develop faster and keep code readable
// -----------------------------------------------------------------
// Clearfix for clearing floats like a boss h5bp.com/q
lib/patterns.less
+12 -11
View File
@@ -1,6 +1,6 @@
/* Patterns.less
* Repeatable UI elements outside the base styles provided from the scaffolding
* ---------------------------------------------------------------------------- */
// Patterns.less
// Repeatable UI elements outside the base styles provided from the scaffolding
// ----------------------------------------------------------------------------
// NAVBAR (FIXED AND STATIC)
@@ -415,6 +415,7 @@ footer {
.transition(.1s linear all);
// Active and Disabled states
&.active,
&:active {
@shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
@@ -630,14 +631,6 @@ input[type=submit].btn {
}
// PATTERN ANIMATIONS
// ------------------
@@ -649,6 +642,14 @@ input[type=submit].btn {
}
}
.collapse {
.transition(height .35s ease);
position:relative;
overflow:hidden;
height: 0;
&.in { height: auto; }
}
// LABELS
// ------
lib/reset.less
+5 -3
View File
@@ -1,6 +1,8 @@
/* 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).
* ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
// 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).
// ------------------------------------------------------------------------
// ERIC MEYER RESET
lib/responsive.less
+3 -3
View File
@@ -1,6 +1,6 @@
/* Responsive.less
* For phone and tablet devices
* ------------------------------------------------------------- */
// Responsive.less
// For phone and tablet devices
// -------------------------------------------------------------
// UP TO LANDSCAPE PHONE
lib/scaffolding.less
+4 -4
View File
@@ -1,7 +1,7 @@
/*
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
* ------------------------------------------------------------------------------------------- */
//
// Scaffolding
// Basic and global styles for generating a grid system, structural layout, and page templates
// -------------------------------------------------------------------------------------------
// STRUCTURAL LAYOUT
lib/tables.less
+5 -5
View File
@@ -1,7 +1,7 @@
/*
* Tables.less
* Tables for, you guessed it, tabular data
* ---------------------------------------- */
//
// Tables.less
// Tables for, you guessed it, tabular data
// ----------------------------------------
@@ -223,4 +223,4 @@ table {
.headerSortDown.purple {
background-color: lighten(@purple, 40%);
}
}*/
}*/
lib/twipsy.less
+2 -2
View File
@@ -8,8 +8,8 @@
visibility: visible;
padding: 5px;
font-size: 11px;
.opacity(80);
&.fade.in {
.opacity(0);
&.in {
.opacity(80);
}
&.above .twipsy-arrow { #popoverArrow > .above(); }
lib/type.less
+3 -3
View File
@@ -1,6 +1,6 @@
/* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
* ---------------------------------------------------------------------------------------- */
// Typography.less
// Headings, body text, lists, code, and more for a versatile and durable typography system
// ----------------------------------------------------------------------------------------
// BODY TEXT
lib/variables.less
+3 -3
View File
@@ -1,6 +1,6 @@
/* Variables.less
* Variables to customize the look and feel of Bootstrap
* ----------------------------------------------------- */
// Variables.less
// Variables to customize the look and feel of Bootstrap
// -----------------------------------------------------
// LINK COLORS