Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
2881269e
Commit
2881269e
authored
Apr 16, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lots of property ordering
parent
a3ec868a
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
137 additions
and
144 deletions
+137
-144
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+77
-79
less/buttons.less
less/buttons.less
+8
-12
less/close.less
less/close.less
+1
-1
less/code.less
less/code.less
+4
-4
less/component-animations.less
less/component-animations.less
+3
-3
less/dropdowns.less
less/dropdowns.less
+7
-7
less/forms.less
less/forms.less
+18
-18
less/mixins.less
less/mixins.less
+6
-7
less/sprites.less
less/sprites.less
+1
-1
less/tables.less
less/tables.less
+6
-6
less/type.less
less/type.less
+6
-6
No files found.
docs/assets/css/bootstrap.css
View file @
2881269e
This diff is collapsed.
Click to expand it.
less/buttons.less
View file @
2881269e
...
@@ -13,23 +13,19 @@
...
@@ -13,23 +13,19 @@
margin-bottom: 0; // For input.btn
margin-bottom: 0; // For input.btn
font-size: @baseFontSize;
font-size: @baseFontSize;
line-height: @baseLineHeight;
line-height: @baseLineHeight;
*line-height: 20px;
color: @grayDark;
color: @grayDark;
text-align: center;
text-align: center;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
text-shadow: 0 1px 1px rgba(255,255,255,.75);
vertical-align: middle;
vertical-align: middle;
cursor: pointer;
.buttonBackground(@btnBackground, @btnBackgroundHighlight);
.buttonBackground(@btnBackground, @btnBackgroundHighlight);
border: 1px solid @btnBorder;
border: 1px solid @btnBorder;
*border: 0; // Remove the border to prevent IE7's black border on input:focus
border-bottom-color: darken(@btnBorder, 10%);
border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px);
.border-radius(4px);
.ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
cursor: pointer;
// Give IE7 some love
.ie7-restore-left-whitespace();
/* Remove the border to prevent IE7's black border on input:focus */
*border: 0;
*line-height: 20px;
}
}
// Hover state
// Hover state
...
@@ -53,19 +49,19 @@
...
@@ -53,19 +49,19 @@
// Active state
// Active state
.btn.active,
.btn.active,
.btn:active {
.btn:active {
background-image: none;
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
background-color: darken(@white, 10%);
background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9");
background-color: darken(@white, 15%) e("\9");
background-image: none;
outline: 0;
outline: 0;
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
}
}
// Disabled state
// Disabled state
.btn.disabled,
.btn.disabled,
.btn[disabled] {
.btn[disabled] {
cursor: default;
cursor: default;
background-image: none;
background-color: darken(@white, 10%);
background-color: darken(@white, 10%);
background-image: none;
.opacity(65);
.opacity(65);
.box-shadow(none);
.box-shadow(none);
}
}
...
@@ -120,8 +116,8 @@
...
@@ -120,8 +116,8 @@
.btn-info:hover,
.btn-info:hover,
.btn-inverse,
.btn-inverse,
.btn-inverse:hover {
.btn-inverse:hover {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white;
color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
}
// Provide *some* extra contrast for those who can get it
// Provide *some* extra contrast for those who can get it
.btn-primary.active,
.btn-primary.active,
...
...
less/close.less
View file @
2881269e
...
@@ -12,8 +12,8 @@
...
@@ -12,8 +12,8 @@
&:hover {
&:hover {
color: @black;
color: @black;
text-decoration: none;
text-decoration: none;
.opacity(40);
cursor: pointer;
cursor: pointer;
.opacity(40);
}
}
}
}
...
...
less/code.less
View file @
2881269e
...
@@ -27,14 +27,14 @@ pre {
...
@@ -27,14 +27,14 @@ pre {
margin: 0 0 @baseLineHeight / 2;
margin: 0 0 @baseLineHeight / 2;
font-size: @baseFontSize * .925; // 13px to 12px
font-size: @baseFontSize * .925; // 13px to 12px
line-height: @baseLineHeight;
line-height: @baseLineHeight;
word-break: break-all;
word-wrap: break-word;
white-space: pre;
white-space: pre-wrap;
background-color: #f5f5f5;
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid rgba(0,0,0,.15);
border: 1px solid rgba(0,0,0,.15);
.border-radius(4px);
.border-radius(4px);
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
// Make prettyprint styles more spaced out for readability
// Make prettyprint styles more spaced out for readability
&.prettyprint {
&.prettyprint {
...
...
less/component-animations.less
View file @
2881269e
...
@@ -2,18 +2,18 @@
...
@@ -2,18 +2,18 @@
// --------------------
// --------------------
.fade {
.fade {
.transition(opacity .15s linear);
opacity: 0;
opacity: 0;
.transition(opacity .15s linear);
&.in {
&.in {
opacity: 1;
opacity: 1;
}
}
}
}
.collapse {
.collapse {
.transition(height .35s ease);
position:relative;
position:relative;
overflow:hidden;
height: 0;
height: 0;
overflow:hidden;
.transition(height .35s ease);
&.in {
&.in {
height: auto;
height: auto;
}
}
...
...
less/dropdowns.less
View file @
2881269e
...
@@ -22,11 +22,11 @@
...
@@ -22,11 +22,11 @@
width: 0;
width: 0;
height: 0;
height: 0;
vertical-align: top;
vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid @black;
border-top: 4px solid @black;
.opacity(30);
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
content: "";
.opacity(30);
}
}
// Place the caret
// Place the caret
...
@@ -46,8 +46,8 @@
...
@@ -46,8 +46,8 @@
top: 100%;
top: 100%;
left: 0;
left: 0;
z-index: @zindexDropdown;
z-index: @zindexDropdown;
float: left;
display: none; // none by default, but block on "open" of the menu
display: none; // none by default, but block on "open" of the menu
float: left;
min-width: 160px;
min-width: 160px;
padding: 4px 0;
padding: 4px 0;
margin: 1px 0 0; // override default ul
margin: 1px 0 0; // override default ul
...
@@ -55,13 +55,13 @@
...
@@ -55,13 +55,13 @@
background-color: @dropdownBackground;
background-color: @dropdownBackground;
border: 1px solid #ccc;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.2);
border: 1px solid rgba(0,0,0,.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
.border-radius(5px);
.border-radius(5px);
.box-shadow(0 5px 10px rgba(0,0,0,.2));
.box-shadow(0 5px 10px rgba(0,0,0,.2));
-webkit-background-clip: padding-box;
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
-moz-background-clip: padding;
background-clip: padding-box;
background-clip: padding-box;
*border-right-width: 2px;
*border-bottom-width: 2px;
// Aligns the dropdown menu to right
// Aligns the dropdown menu to right
&.pull-right {
&.pull-right {
...
@@ -111,8 +111,8 @@
...
@@ -111,8 +111,8 @@
// Right aligned dropdowns
// Right aligned dropdowns
// ---------------------------
// ---------------------------
.pull-right .dropdown-menu {
.pull-right .dropdown-menu {
left: auto;
right: 0;
right: 0;
left: auto;
}
}
// Allow for dropdowns to go bottom up (aka, dropup-menu)
// Allow for dropdowns to go bottom up (aka, dropup-menu)
...
...
less/forms.less
View file @
2881269e
...
@@ -98,8 +98,8 @@ input[type="radio"] {
...
@@ -98,8 +98,8 @@ input[type="radio"] {
*margin-top: 0; /* IE7 */
*margin-top: 0; /* IE7 */
line-height: normal;
line-height: normal;
cursor: pointer;
cursor: pointer;
.border-radius(0);
border: 0 \9; /* IE9 and down */
border: 0 \9; /* IE9 and down */
.border-radius(0);
}
}
input[type="image"] {
input[type="image"] {
border: 0;
border: 0;
...
@@ -110,9 +110,9 @@ input[type="file"] {
...
@@ -110,9 +110,9 @@ input[type="file"] {
width: auto;
width: auto;
padding: initial;
padding: initial;
line-height: initial;
line-height: initial;
border: initial;
background-color: @inputBackground;
background-color: @inputBackground;
background-color: initial;
background-color: initial;
border: initial;
.box-shadow(none);
.box-shadow(none);
}
}
...
@@ -172,8 +172,8 @@ input[type="hidden"] {
...
@@ -172,8 +172,8 @@ input[type="hidden"] {
// Indent the labels to position radios/checkboxes as hanging
// Indent the labels to position radios/checkboxes as hanging
.radio,
.radio,
.checkbox {
.checkbox {
overflow: auto; // clear the floating input if there is no label text
padding-left: 18px;
padding-left: 18px;
overflow: auto; // clear the floating input if there is no label text
}
}
.radio input[type="radio"],
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
.checkbox input[type="checkbox"] {
...
@@ -215,16 +215,16 @@ textarea {
...
@@ -215,16 +215,16 @@ textarea {
input:focus,
input:focus,
textarea:focus {
textarea:focus {
border-color: rgba(82,168,236,.8);
border-color: rgba(82,168,236,.8);
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
outline: 0;
outline: 0;
outline: thin dotted \9; /* IE6-9 */
outline: thin dotted \9; /* IE6-9 */
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
}
}
input[type="file"]:focus,
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus,
input[type="checkbox"]:focus,
select:focus {
select:focus {
.box-shadow(none); // override for file inputs
.tab-focus();
.tab-focus();
.box-shadow(none); // override for file inputs
}
}
...
@@ -274,9 +274,9 @@ textarea[disabled],
...
@@ -274,9 +274,9 @@ textarea[disabled],
input[readonly],
input[readonly],
select[readonly],
select[readonly],
textarea[readonly] {
textarea[readonly] {
cursor: not-allowed;
background-color: @inputDisabledBackground;
background-color: @inputDisabledBackground;
border-color: #ddd;
border-color: #ddd;
cursor: not-allowed;
}
}
...
@@ -327,13 +327,12 @@ select:focus:required:invalid {
...
@@ -327,13 +327,12 @@ select:focus:required:invalid {
// For text that needs to appear as an input but should not be an input
// For text that needs to appear as an input but should not be an input
.uneditable-input {
.uneditable-input {
overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
white-space: nowrap;
cursor: not-allowed;
background-color: @inputBackground;
background-color: @inputBackground;
border-color: #eee;
border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
cursor: not-allowed;
// prevent text from wrapping, but still cut it off like an input does
overflow: hidden;
white-space: nowrap;
}
}
// Placeholder text gets special styles; can't be bundled together though for some reason
// Placeholder text gets special styles; can't be bundled together though for some reason
...
@@ -389,8 +388,8 @@ select:focus:required:invalid {
...
@@ -389,8 +388,8 @@ select:focus:required:invalid {
.add-on {
.add-on {
display: inline-block;
display: inline-block;
width: auto;
width: auto;
min-width: 16px;
height: @baseLineHeight;
height: @baseLineHeight;
min-width: 16px;
padding: 4px 5px;
padding: 4px 5px;
font-weight: normal;
font-weight: normal;
line-height: @baseLineHeight;
line-height: @baseLineHeight;
...
@@ -427,8 +426,8 @@ select:focus:required:invalid {
...
@@ -427,8 +426,8 @@ select:focus:required:invalid {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
}
.uneditable-input {
.uneditable-input {
border-left-color: #eee;
border-right-color: #ccc;
border-right-color: #ccc;
border-left-color: #eee;
}
}
.add-on:last-child,
.add-on:last-child,
.btn:last-child {
.btn:last-child {
...
@@ -460,10 +459,10 @@ select:focus:required:invalid {
...
@@ -460,10 +459,10 @@ select:focus:required:invalid {
// -----------
// -----------
.search-query {
.search-query {
padding-left: 14px;
padding-right: 14px;
padding-right: 14px;
padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
padding-right: 4px \9;
padding-right: 4px \9;
padding-left: 14px;
padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
margin-bottom: 0; // remove the default margin on all inputs
margin-bottom: 0; // remove the default margin on all inputs
.border-radius(14px);
.border-radius(14px);
}
}
...
@@ -521,8 +520,8 @@ select:focus:required:invalid {
...
@@ -521,8 +520,8 @@ select:focus:required:invalid {
.form-inline .radio input[type="radio"],
.form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] {
.form-inline .checkbox input[type="checkbox"] {
float: left;
float: left;
margin-left: 0;
margin-right: 3px;
margin-right: 3px;
margin-left: 0;
}
}
...
@@ -555,11 +554,12 @@ legend + .control-group {
...
@@ -555,11 +554,12 @@ legend + .control-group {
}
}
// Move over all input controls and content
// Move over all input controls and content
.controls {
.controls {
margin-left: 160px;
// Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
//
Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
don't inherit the margin of the parent, in this case .controls
// don't inherit the margin of the parent, in this case .controls
*display: inline-block;
*display: inline-block;
*margin-left: 0;
*padding-left: 20px;
*padding-left: 20px;
margin-left: 160px;
*margin-left: 0;
&:first-child {
&:first-child {
*padding-left: 160px;
*padding-left: 160px;
}
}
...
...
less/mixins.less
View file @
2881269e
...
@@ -417,18 +417,17 @@
...
@@ -417,18 +417,17 @@
// -------------------------
// -------------------------
// Dividers (basically an hr) within dropdowns and nav lists
// Dividers (basically an hr) within dropdowns and nav lists
.nav-divider() {
.nav-divider() {
height: 1px;
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid @white;
// IE7 needs a set width since we gave a height. Restricting just
// IE7 needs a set width since we gave a height. Restricting just
// to IE7 to keep the 1px left/right space in other browsers.
// to IE7 to keep the 1px left/right space in other browsers.
// It is unclear where IE is getting the extra space that we need
// It is unclear where IE is getting the extra space that we need
// to negative-margin away, but so it goes.
// to negative-margin away, but so it goes.
*width: 100%;
*width: 100%;
height: 1px;
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
*margin: -5px 0 5px;
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid @white;
}
}
// Button backgrounds
// Button backgrounds
...
@@ -436,8 +435,8 @@
...
@@ -436,8 +435,8 @@
.buttonBackground(@startColor, @endColor) {
.buttonBackground(@startColor, @endColor) {
// gradientBar will set the background to a pleasing blend of these, to support IE<=9
// gradientBar will set the background to a pleasing blend of these, to support IE<=9
.gradientBar(@startColor, @endColor);
.gradientBar(@startColor, @endColor);
.reset-filter();
*background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
*background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
.reset-filter();
// in these cases the gradient won't cover the background, so we override
// in these cases the gradient won't cover the background, so we override
&:hover, &:active, &.active, &.disabled, &[disabled] {
&:hover, &:active, &.active, &.disabled, &[disabled] {
...
...
less/sprites.less
View file @
2881269e
...
@@ -19,13 +19,13 @@
...
@@ -19,13 +19,13 @@
display: inline-block;
display: inline-block;
width: 14px;
width: 14px;
height: 14px;
height: 14px;
.ie7-restore-right-whitespace();
line-height: 14px;
line-height: 14px;
vertical-align: text-top;
vertical-align: text-top;
background-image: url("@{iconSpritePath}");
background-image: url("@{iconSpritePath}");
background-position: 14px 14px;
background-position: 14px 14px;
background-repeat: no-repeat;
background-repeat: no-repeat;
.ie7-restore-right-whitespace();
}
}
.icon-white {
.icon-white {
background-image: url("@{iconWhiteSpritePath}");
background-image: url("@{iconWhiteSpritePath}");
...
...
less/tables.less
View file @
2881269e
...
@@ -9,9 +9,9 @@
...
@@ -9,9 +9,9 @@
table {
table {
max-width: 100%;
max-width: 100%;
background-color: @tableBackground;
border-collapse: collapse;
border-collapse: collapse;
border-spacing: 0;
border-spacing: 0;
background-color: @tableBackground;
}
}
// BASELINE STYLES
// BASELINE STYLES
...
@@ -69,9 +69,9 @@ table {
...
@@ -69,9 +69,9 @@ table {
.table-bordered {
.table-bordered {
border: 1px solid @tableBorder;
border: 1px solid @tableBorder;
border-left: 0;
border-collapse: separate; // Done so we can round those corners!
border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapsed; // IE7 can't round corners anyway
*border-collapse: collapsed; // IE7 can't round corners anyway
border-left: 0;
.border-radius(4px);
.border-radius(4px);
th,
th,
td {
td {
...
@@ -93,28 +93,28 @@ table {
...
@@ -93,28 +93,28 @@ table {
thead:first-child tr:first-child th:first-child,
thead:first-child tr:first-child th:first-child,
tbody:first-child tr:first-child td:first-child {
tbody:first-child tr:first-child td:first-child {
-webkit-border-top-left-radius: 4px;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
border-top-left-radius: 4px;
border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
}
}
thead:first-child tr:first-child th:last-child,
thead:first-child tr:first-child th:last-child,
tbody:first-child tr:first-child td:last-child {
tbody:first-child tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px;
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px;
border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
}
}
// For first th or td in the first row in the first thead or tbody
// For first th or td in the first row in the first thead or tbody
thead:last-child tr:last-child th:first-child,
thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child {
tbody:last-child tr:last-child td:first-child {
.border-radius(0 0 0 4px);
.border-radius(0 0 0 4px);
-webkit-border-bottom-left-radius: 4px;
-webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
}
}
thead:last-child tr:last-child th:last-child,
thead:last-child tr:last-child th:last-child,
tbody:last-child tr:last-child td:last-child {
tbody:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
}
}
}
}
...
...
less/type.less
View file @
2881269e
...
@@ -135,11 +135,11 @@ dd {
...
@@ -135,11 +135,11 @@ dd {
// Horizontal layout (like forms)
// Horizontal layout (like forms)
.dl-horizontal {
.dl-horizontal {
dt {
dt {
.text-overflow();
float: left;
float: left;
clear: left;
width: 120px;
width: 120px;
clear: left;
text-align: right;
text-align: right;
.text-overflow();
}
}
dd {
dd {
margin-left: 130px;
margin-left: 130px;
...
@@ -170,8 +170,8 @@ em {
...
@@ -170,8 +170,8 @@ em {
// Abbreviations and acronyms
// Abbreviations and acronyms
abbr[title] {
abbr[title] {
border-bottom: 1px dotted #ddd;
cursor: help;
cursor: help;
border-bottom: 1px dotted #ddd;
}
}
abbr.initialism {
abbr.initialism {
font-size: 90%;
font-size: 90%;
...
@@ -199,10 +199,10 @@ blockquote {
...
@@ -199,10 +199,10 @@ blockquote {
// Float right with text-align: right
// Float right with text-align: right
&.pull-right {
&.pull-right {
float: right;
float: right;
padding-left: 0;
padding-right: 15px;
padding-right: 15px;
border
-left: 0;
padding
-left: 0;
border-right: 5px solid @grayLighter;
border-right: 5px solid @grayLighter;
border-left: 0;
p,
p,
small {
small {
text-align: right;
text-align: right;
...
@@ -222,8 +222,8 @@ blockquote:after {
...
@@ -222,8 +222,8 @@ blockquote:after {
address {
address {
display: block;
display: block;
margin-bottom: @baseLineHeight;
margin-bottom: @baseLineHeight;
line-height: @baseLineHeight;
font-style: normal;
font-style: normal;
line-height: @baseLineHeight;
}
}
// Misc
// Misc
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment