mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
resolve conflict
This commit is contained in:
Mark Otto
commit
01c5e74bb3
47
bootstrap-1.0.0.css
vendored
47
bootstrap-1.0.0.css
vendored
@ -1,11 +1,11 @@
|
||||
/*
|
||||
Master Stylesheet
|
||||
This file is only for importing all required stylesheets for LESS to include and then compile.
|
||||
*/
|
||||
* Master Stylesheet
|
||||
* This file is only for importing all required stylesheets for LESS to include and then compile.
|
||||
*/
|
||||
/*
|
||||
Global Reset
|
||||
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).
|
||||
*/
|
||||
html, body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
@ -88,9 +88,9 @@ aside {
|
||||
display: block;
|
||||
}
|
||||
/*
|
||||
Preboot
|
||||
Variables and mixins to pre-ignite any new web development project
|
||||
*/
|
||||
* Preboot.less
|
||||
* Variables and mixins to pre-ignite any new web development project
|
||||
*/
|
||||
/* Variables
|
||||
-------------------------------------------------- */
|
||||
/* Color Scheme
|
||||
@ -124,9 +124,9 @@ aside {
|
||||
content: ".";
|
||||
}
|
||||
/*
|
||||
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
|
||||
*/
|
||||
/* Baseline Grid System
|
||||
-------------------------------------------------- */
|
||||
div.row {
|
||||
@ -411,9 +411,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
||||
border: 0;
|
||||
}
|
||||
/*
|
||||
Typography
|
||||
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
|
||||
-------------------------------------------------- */
|
||||
p {
|
||||
@ -668,9 +668,9 @@ span.html__attr_value {
|
||||
color: #de4a3f;
|
||||
}
|
||||
/*
|
||||
Forms
|
||||
Base line styles for various input types, form layouts, and states
|
||||
*/
|
||||
* Forms.less
|
||||
* Base line styles for various input types, form layouts, and states
|
||||
*/
|
||||
/* Global form styles
|
||||
-------------------------------------------------- */
|
||||
form {
|
||||
@ -1006,8 +1006,9 @@ form.form-stacked ul.inputs-list li label {
|
||||
padding-top: 0;
|
||||
}
|
||||
/*
|
||||
Tables
|
||||
*/
|
||||
* Tables.less
|
||||
* Tables for, you guessed it, tabular data
|
||||
*/
|
||||
/* Baseline styles
|
||||
-------------------------------------------------- */
|
||||
table {
|
||||
@ -1107,9 +1108,9 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow
|
||||
background-color: #e2d5f0;
|
||||
}
|
||||
/*
|
||||
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
|
||||
*/
|
||||
/* Top bar
|
||||
-------------------------------------------------- */
|
||||
div.topbar {
|
||||
|
||||
6
lib/bootstrap.less
vendored
6
lib/bootstrap.less
vendored
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Master Stylesheet
|
||||
This file is only for importing all required stylesheets for LESS to include and then compile.
|
||||
*/
|
||||
* Master Stylesheet
|
||||
* This file is only for importing all required stylesheets for LESS to include and then compile.
|
||||
*/
|
||||
|
||||
// CSS Reset
|
||||
@import "reset.less";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Forms
|
||||
Baseline styles for various input types, form layouts, and states
|
||||
*/
|
||||
* Forms.less
|
||||
* Base line styles for various input types, form layouts, and states
|
||||
*/
|
||||
|
||||
|
||||
/* Global form styles
|
||||
@ -79,14 +79,14 @@ form {
|
||||
.box-shadow(inset 0 1px 2px rgba(0,0,0,.075));
|
||||
}
|
||||
// Focus states
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
select, textarea {
|
||||
@transition: border linear .2s, box-shadow linear .2s;
|
||||
.transition(@transition);
|
||||
}
|
||||
input[type=text]:focus,
|
||||
input[type=password]:focus,
|
||||
input[type=text]:focus,
|
||||
input[type=password]:focus,
|
||||
textarea:focus {
|
||||
outline: none;
|
||||
border-color: rgba(82,168,236,.75);
|
||||
@ -102,8 +102,8 @@ form {
|
||||
> label {
|
||||
color: @red;
|
||||
}
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
textarea {
|
||||
border-color: @error-text;
|
||||
.box-shadow(0 0 3px rgba(171,41,32,.25));
|
||||
@ -304,7 +304,7 @@ ul.inputs-list {
|
||||
form.form-stacked {
|
||||
fieldset {
|
||||
padding-top: @baseline / 2;
|
||||
}
|
||||
}
|
||||
legend {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
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
|
||||
*/
|
||||
|
||||
|
||||
/* Top bar
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Preboot
|
||||
Variables and mixins to pre-ignite any new web development project
|
||||
*/
|
||||
* Preboot.less
|
||||
* Variables and mixins to pre-ignite any new web development project
|
||||
*/
|
||||
|
||||
|
||||
/* Variables
|
||||
@ -70,7 +70,7 @@
|
||||
}
|
||||
|
||||
// Center-align a block level element
|
||||
.center-block {
|
||||
.center-block {
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Global Reset
|
||||
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
|
||||
html, body { margin: 0; padding: 0; }
|
||||
@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, cod
|
||||
table { border-collapse: collapse; border-spacing: 0; }
|
||||
ol, ul { list-style: none; }
|
||||
q:before, q:after, blockquote:before, blockquote:after { content: ""; }
|
||||
|
||||
|
||||
// HTML5
|
||||
header,
|
||||
section,
|
||||
|
||||
@ -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
|
||||
*/
|
||||
|
||||
/* Baseline Grid System
|
||||
-------------------------------------------------- */
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
/*
|
||||
Tables
|
||||
*/
|
||||
* Tables.less
|
||||
* Tables for, you guessed it, tabular data
|
||||
*/
|
||||
|
||||
|
||||
/* Baseline styles
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
Typography
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user