root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

resolve conflict

This commit is contained in:
Mark Otto 2011-06-28 14:30:48 -07:00
parent 5949b8e145 e91a74e8e8
commit 01c5e74bb3
9 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bootstrap-1.0.0.css vendored
View File

@ -1,11 +1,11 @@
/* /*
Master Stylesheet * Master Stylesheet
This file is only for importing all required stylesheets for LESS to include and then compile. * This file is only for importing all required stylesheets for LESS to include and then compile.
*/ */
/* /*
Global Reset * 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). * 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 { html, body {
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -88,9 +88,9 @@ aside {
display: block; display: block;
} }
/* /*
Preboot * Preboot.less
Variables and mixins to pre-ignite any new web development project * Variables and mixins to pre-ignite any new web development project
*/ */
/* Variables /* Variables
-------------------------------------------------- */ -------------------------------------------------- */
/* Color Scheme /* Color Scheme
@ -124,9 +124,9 @@ aside {
content: "."; content: ".";
} }
/* /*
Scaffolding * Scaffolding
Basic and global styles for generating a grid system, structural layout, and page templates * Basic and global styles for generating a grid system, structural layout, and page templates
*/ */
/* Baseline Grid System /* Baseline Grid System
-------------------------------------------------- */ -------------------------------------------------- */
div.row { div.row {
@ -411,9 +411,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
border: 0; border: 0;
} }
/* /*
Typography * Typography.less
Headings, body text, lists, code, and more for a versatile and durable typography system * Headings, body text, lists, code, and more for a versatile and durable typography system
*/ */
/* Body text /* Body text
-------------------------------------------------- */ -------------------------------------------------- */
p { p {
@ -668,9 +668,9 @@ span.html__attr_value {
color: #de4a3f; color: #de4a3f;
} }
/* /*
Forms * Forms.less
Base line styles for various input types, form layouts, and states * Base line styles for various input types, form layouts, and states
*/ */
/* Global form styles /* Global form styles
-------------------------------------------------- */ -------------------------------------------------- */
form { form {
@ -1006,8 +1006,9 @@ form.form-stacked ul.inputs-list li label {
padding-top: 0; padding-top: 0;
} }
/* /*
Tables * Tables.less
*/ * Tables for, you guessed it, tabular data
*/
/* Baseline styles /* Baseline styles
-------------------------------------------------- */ -------------------------------------------------- */
table { table {
@ -1107,9 +1108,9 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow
background-color: #e2d5f0; background-color: #e2d5f0;
} }
/* /*
Patterns.less * Patterns.less
Repeatable UI elements outside the base styles provided from the scaffolding * Repeatable UI elements outside the base styles provided from the scaffolding
*/ */
/* Top bar /* Top bar
-------------------------------------------------- */ -------------------------------------------------- */
div.topbar { div.topbar {

6
lib/bootstrap.less vendored
View File

@ -1,7 +1,7 @@
/* /*
Master Stylesheet * Master Stylesheet
This file is only for importing all required stylesheets for LESS to include and then compile. * This file is only for importing all required stylesheets for LESS to include and then compile.
*/ */
// CSS Reset // CSS Reset
@import "reset.less"; @import "reset.less";

6
lib/forms.less
View File

@ -1,7 +1,7 @@
/* /*
Forms * Forms.less
Baseline styles for various input types, form layouts, and states * Base line styles for various input types, form layouts, and states
*/ */
/* Global form styles /* Global form styles

6
lib/patterns.less
View File

@ -1,7 +1,7 @@
/* /*
Patterns.less * Patterns.less
Repeatable UI elements outside the base styles provided from the scaffolding * Repeatable UI elements outside the base styles provided from the scaffolding
*/ */
/* Top bar /* Top bar

6
lib/preboot.less
View File

@ -1,7 +1,7 @@
/* /*
Preboot * Preboot.less
Variables and mixins to pre-ignite any new web development project * Variables and mixins to pre-ignite any new web development project
*/ */
/* Variables /* Variables

6
lib/reset.less
View File

@ -1,7 +1,7 @@
/* /*
Global Reset * 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). * 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 // Eric Meyer reset
html, body { margin: 0; padding: 0; } html, body { margin: 0; padding: 0; }

6
lib/scaffolding.less
View File

@ -1,7 +1,7 @@
/* /*
Scaffolding * Scaffolding
Basic and global styles for generating a grid system, structural layout, and page templates * Basic and global styles for generating a grid system, structural layout, and page templates
*/ */
/* Baseline Grid System /* Baseline Grid System
-------------------------------------------------- */ -------------------------------------------------- */

5
lib/tables.less
View File

@ -1,6 +1,7 @@
/* /*
Tables * Tables.less
*/ * Tables for, you guessed it, tabular data
*/
/* Baseline styles /* Baseline styles

6
lib/type.less
View File

@ -1,7 +1,7 @@
/* /*
Typography * Typography.less
Headings, body text, lists, code, and more for a versatile and durable typography system * Headings, body text, lists, code, and more for a versatile and durable typography system
*/ */
/* Body text /* Body text