mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-05 16:42:29 +03:00
resolve conflicts in merging in other branch
This commit is contained in:
Mark Otto
Vendored
+262
-69
@@ -6,7 +6,7 @@
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||
* Date: Thu Aug 25 22:51:24 PDT 2011
|
||||
* Date: Thu Aug 25 23:12:07 PDT 2011
|
||||
*/
|
||||
/* 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).
|
||||
@@ -85,13 +85,92 @@ blockquote:before,
|
||||
blockquote:after {
|
||||
content: "";
|
||||
}
|
||||
header,
|
||||
section,
|
||||
footer,
|
||||
html {
|
||||
overflow-y: scroll;
|
||||
font-size: 100%;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
-ms-text-size-adjust: 100%;
|
||||
}
|
||||
a:focus {
|
||||
outline: thin dotted;
|
||||
}
|
||||
article,
|
||||
aside {
|
||||
aside,
|
||||
details,
|
||||
figcaption,
|
||||
figure,
|
||||
footer,
|
||||
header,
|
||||
hgroup,
|
||||
nav,
|
||||
section {
|
||||
display: block;
|
||||
}
|
||||
audio, canvas, video {
|
||||
display: inline-block;
|
||||
*display: inline;
|
||||
*zoom: 1;
|
||||
}
|
||||
audio:not([controls]) {
|
||||
display: none;
|
||||
}
|
||||
sub, sup {
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
position: relative;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
sup {
|
||||
top: -0.5em;
|
||||
}
|
||||
sub {
|
||||
bottom: -0.25em;
|
||||
}
|
||||
img {
|
||||
border: 0;
|
||||
-ms-interpolation-mode: bicubic;
|
||||
}
|
||||
button,
|
||||
input,
|
||||
select,
|
||||
textarea {
|
||||
font-size: 100%;
|
||||
margin: 0;
|
||||
vertical-align: baseline;
|
||||
*vertical-align: middle;
|
||||
}
|
||||
button, input {
|
||||
line-height: normal;
|
||||
*overflow: visible;
|
||||
}
|
||||
button::-moz-focus-inner, input::-moz-focus-inner {
|
||||
border: 0;
|
||||
padding: 0;
|
||||
}
|
||||
button,
|
||||
input[type="button"],
|
||||
input[type="reset"],
|
||||
input[type="submit"] {
|
||||
cursor: pointer;
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
input[type="search"] {
|
||||
-webkit-appearance: textfield;
|
||||
-webkit-box-sizing: content-box;
|
||||
-moz-box-sizing: content-box;
|
||||
box-sizing: content-box;
|
||||
}
|
||||
input[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
textarea {
|
||||
overflow: auto;
|
||||
vertical-align: top;
|
||||
}
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-spacing: 0;
|
||||
}
|
||||
/* Preboot.less
|
||||
* Variables and mixins to pre-ignite any new web development project
|
||||
* ------------------------------------------------------------------ */
|
||||
@@ -113,6 +192,7 @@ aside {
|
||||
width: 940px;
|
||||
margin: 0 auto;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.container:before, .container:after {
|
||||
display: table;
|
||||
@@ -190,6 +270,7 @@ aside {
|
||||
* ------------------------------------------------------------------------------------------- */
|
||||
.row {
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
margin-left: -20px;
|
||||
}
|
||||
.row:before, .row:after {
|
||||
@@ -322,6 +403,7 @@ body {
|
||||
.container-fluid {
|
||||
padding: 0 20px;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.container-fluid:before, .container-fluid:after {
|
||||
display: table;
|
||||
@@ -349,6 +431,113 @@ a:hover {
|
||||
color: #0050a3;
|
||||
text-decoration: underline;
|
||||
}
|
||||
.btn {
|
||||
display: inline-block;
|
||||
background-color: #e6e6e6;
|
||||
background-repeat: no-repeat;
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));
|
||||
background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
|
||||
background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
|
||||
background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
|
||||
background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
|
||||
background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);
|
||||
padding: 4px 14px;
|
||||
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
|
||||
color: #333;
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
border: 1px solid #ccc;
|
||||
border-bottom-color: #bbb;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
.btn:hover {
|
||||
background-position: 0 -15px;
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
}
|
||||
.primary {
|
||||
background-color: #0064cd;
|
||||
background-repeat: repeat-x;
|
||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
|
||||
background-image: -moz-linear-gradient(#049cdb, #0064cd);
|
||||
background-image: -ms-linear-gradient(#049cdb, #0064cd);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
|
||||
background-image: -webkit-linear-gradient(#049cdb, #0064cd);
|
||||
background-image: -o-linear-gradient(#049cdb, #0064cd);
|
||||
background-image: linear-gradient(#049cdb, #0064cd);
|
||||
color: #fff;
|
||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||
border: 1px solid #004b9a;
|
||||
border-bottom-color: #003f81;
|
||||
}
|
||||
.primary:hover {
|
||||
color: #fff;
|
||||
}
|
||||
.btn {
|
||||
-webkit-transition: 0.1s linear all;
|
||||
-moz-transition: 0.1s linear all;
|
||||
transition: 0.1s linear all;
|
||||
}
|
||||
.btn.primary {
|
||||
color: #fff;
|
||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||
border-color: #0064cd #0064cd #003f81;
|
||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
||||
}
|
||||
.btn.primary:hover {
|
||||
color: #fff;
|
||||
}
|
||||
.btn.large {
|
||||
font-size: 16px;
|
||||
line-height: 28px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
.btn.small {
|
||||
padding-right: 9px;
|
||||
padding-left: 9px;
|
||||
font-size: 11px;
|
||||
}
|
||||
.btn.disabled {
|
||||
background-image: none;
|
||||
filter: alpha(opacity=65);
|
||||
-khtml-opacity: 0.65;
|
||||
-moz-opacity: 0.65;
|
||||
opacity: 0.65;
|
||||
cursor: default;
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.btn:disabled {
|
||||
background-image: none;
|
||||
filter: alpha(opacity=65);
|
||||
-khtml-opacity: 0.65;
|
||||
-moz-opacity: 0.65;
|
||||
opacity: 0.65;
|
||||
cursor: default;
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.btn:disabled.primary {
|
||||
color: #fff;
|
||||
}
|
||||
.btn:active {
|
||||
-webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
-moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
||||
padding: 0;
|
||||
border: 0;
|
||||
}
|
||||
/* Typography.less
|
||||
* Headings, body text, lists, code, and more for a versatile and durable typography system
|
||||
* ---------------------------------------------------------------------------------------- */
|
||||
@@ -471,7 +660,7 @@ em {
|
||||
line-height: inherit;
|
||||
}
|
||||
.muted {
|
||||
color: #e6e6e6;
|
||||
color: #bfbfbf;
|
||||
}
|
||||
blockquote {
|
||||
margin-bottom: 18px;
|
||||
@@ -524,7 +713,9 @@ pre {
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
white-space: pre;
|
||||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
/* Forms.less
|
||||
* Base styles for various input types, form layouts, and states
|
||||
@@ -532,11 +723,11 @@ pre {
|
||||
form {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
form fieldset {
|
||||
fieldset {
|
||||
margin-bottom: 18px;
|
||||
padding-top: 18px;
|
||||
}
|
||||
form fieldset legend {
|
||||
fieldset legend {
|
||||
display: block;
|
||||
margin-left: 150px;
|
||||
font-size: 20px;
|
||||
@@ -549,19 +740,19 @@ form fieldset legend {
|
||||
|
||||
color: #404040;
|
||||
}
|
||||
form .clearfix {
|
||||
.clearfix {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
form label,
|
||||
form input,
|
||||
form select,
|
||||
form textarea {
|
||||
label,
|
||||
input,
|
||||
select,
|
||||
textarea {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
font-weight: normal;
|
||||
line-height: normal;
|
||||
}
|
||||
form label {
|
||||
label {
|
||||
padding-top: 6px;
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
@@ -570,20 +761,19 @@ form label {
|
||||
text-align: right;
|
||||
color: #404040;
|
||||
}
|
||||
form div.input {
|
||||
div.input {
|
||||
margin-left: 150px;
|
||||
}
|
||||
form input[type=checkbox], form input[type=radio] {
|
||||
input[type=checkbox], input[type=radio] {
|
||||
cursor: pointer;
|
||||
}
|
||||
form input[type=text],
|
||||
form input[type=password],
|
||||
form textarea,
|
||||
form select,
|
||||
form .uneditable-input {
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
textarea,
|
||||
select,
|
||||
.uneditable-input {
|
||||
display: inline-block;
|
||||
width: 210px;
|
||||
margin: 0;
|
||||
padding: 4px;
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
@@ -594,14 +784,14 @@ form .uneditable-input {
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
form select, form input[type=file] {
|
||||
select, input[type=file] {
|
||||
height: 27px;
|
||||
line-height: 27px;
|
||||
}
|
||||
form textarea {
|
||||
textarea {
|
||||
height: auto;
|
||||
}
|
||||
form .uneditable-input {
|
||||
.uneditable-input {
|
||||
background-color: #eee;
|
||||
display: block;
|
||||
border-color: #ccc;
|
||||
@@ -609,16 +799,16 @@ form .uneditable-input {
|
||||
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
|
||||
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075);
|
||||
}
|
||||
form :-moz-placeholder {
|
||||
:-moz-placeholder {
|
||||
color: #bfbfbf;
|
||||
}
|
||||
form ::-webkit-input-placeholder {
|
||||
::-webkit-input-placeholder {
|
||||
color: #bfbfbf;
|
||||
}
|
||||
form input[type=text],
|
||||
form input[type=password],
|
||||
form select,
|
||||
form textarea {
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
select,
|
||||
textarea {
|
||||
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
|
||||
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
|
||||
transition: border linear 0.2s, box-shadow linear 0.2s;
|
||||
@@ -626,7 +816,7 @@ form textarea {
|
||||
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
form input[type=text]:focus, form input[type=password]:focus, form textarea:focus {
|
||||
input[type=text]:focus, input[type=password]:focus, textarea:focus {
|
||||
outline: none;
|
||||
border-color: rgba(82, 168, 236, 0.8);
|
||||
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
|
||||
@@ -661,46 +851,46 @@ form div.error .input-prepend span.add-on, form div.error .input-append span.add
|
||||
border-color: #c87872;
|
||||
color: #b9554d;
|
||||
}
|
||||
form .input-mini,
|
||||
form input.mini,
|
||||
form textarea.mini,
|
||||
form select.mini {
|
||||
.input-mini,
|
||||
input.mini,
|
||||
textarea.mini,
|
||||
select.mini {
|
||||
width: 60px;
|
||||
}
|
||||
form .input-small,
|
||||
form input.small,
|
||||
form textarea.small,
|
||||
form select.small {
|
||||
.input-small,
|
||||
input.small,
|
||||
textarea.small,
|
||||
select.small {
|
||||
width: 90px;
|
||||
}
|
||||
form .input-medium,
|
||||
form input.medium,
|
||||
form textarea.medium,
|
||||
form select.medium {
|
||||
.input-medium,
|
||||
input.medium,
|
||||
textarea.medium,
|
||||
select.medium {
|
||||
width: 150px;
|
||||
}
|
||||
form .input-large,
|
||||
form input.large,
|
||||
form textarea.large,
|
||||
form select.large {
|
||||
.input-large,
|
||||
input.large,
|
||||
textarea.large,
|
||||
select.large {
|
||||
width: 210px;
|
||||
}
|
||||
form .input-xlarge,
|
||||
form input.xlarge,
|
||||
form textarea.xlarge,
|
||||
form select.xlarge {
|
||||
.input-xlarge,
|
||||
input.xlarge,
|
||||
textarea.xlarge,
|
||||
select.xlarge {
|
||||
width: 270px;
|
||||
}
|
||||
form .input-xxlarge,
|
||||
form input.xxlarge,
|
||||
form textarea.xxlarge,
|
||||
form select.xxlarge {
|
||||
.input-xxlarge,
|
||||
input.xxlarge,
|
||||
textarea.xxlarge,
|
||||
select.xxlarge {
|
||||
width: 530px;
|
||||
}
|
||||
form textarea.xxlarge {
|
||||
textarea.xxlarge {
|
||||
overflow-y: scroll;
|
||||
}
|
||||
form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled {
|
||||
input[readonly]:focus, textarea[readonly]:focus, input.disabled {
|
||||
background: #f5f5f5;
|
||||
border-color: #ddd;
|
||||
-webkit-box-shadow: none;
|
||||
@@ -844,16 +1034,16 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled {
|
||||
.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
form.form-stacked {
|
||||
.form-stacked {
|
||||
padding-left: 20px;
|
||||
}
|
||||
form.form-stacked fieldset {
|
||||
.form-stacked fieldset {
|
||||
padding-top: 9px;
|
||||
}
|
||||
form.form-stacked legend {
|
||||
.form-stacked legend {
|
||||
margin-left: 0;
|
||||
}
|
||||
form.form-stacked label {
|
||||
.form-stacked label {
|
||||
display: block;
|
||||
float: none;
|
||||
width: auto;
|
||||
@@ -862,30 +1052,30 @@ form.form-stacked label {
|
||||
line-height: 20px;
|
||||
padding-top: 0;
|
||||
}
|
||||
form.form-stacked .clearfix {
|
||||
.form-stacked .clearfix {
|
||||
margin-bottom: 9px;
|
||||
}
|
||||
form.form-stacked .clearfix div.input {
|
||||
.form-stacked .clearfix div.input {
|
||||
margin-left: 0;
|
||||
}
|
||||
form.form-stacked .inputs-list {
|
||||
.form-stacked .inputs-list {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
form.form-stacked .inputs-list li {
|
||||
.form-stacked .inputs-list li {
|
||||
padding-top: 0;
|
||||
}
|
||||
form.form-stacked .inputs-list li label {
|
||||
.form-stacked .inputs-list li label {
|
||||
font-weight: normal;
|
||||
padding-top: 0;
|
||||
}
|
||||
form.form-stacked div.error {
|
||||
.form-stacked div.error {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
padding-left: 10px;
|
||||
margin-top: 0;
|
||||
margin-left: -10px;
|
||||
}
|
||||
form.form-stacked .actions {
|
||||
.form-stacked .actions {
|
||||
margin-left: -20px;
|
||||
padding-left: 20px;
|
||||
}
|
||||
@@ -1465,6 +1655,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
||||
margin: 0 0 20px;
|
||||
padding: 0;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.tabs:before,
|
||||
.pills:before,
|
||||
@@ -1640,6 +1831,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
||||
-moz-box-shadow: inset 0 1px 0 #ffffff;
|
||||
box-shadow: inset 0 1px 0 #ffffff;
|
||||
zoom: 1;
|
||||
margin-bottom: 18px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.modal .modal-footer:before, .modal .modal-footer:after {
|
||||
display: table;
|
||||
|
||||
Reference in New Issue
Block a user