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
c56e9d2d
Commit
c56e9d2d
authored
Jan 05, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
massive docs update, mostly to all our new forms, and to the buttons
parent
90e3a706
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
338 additions
and
232 deletions
+338
-232
bootstrap.css
bootstrap.css
+25
-27
bootstrap.min.css
bootstrap.min.css
+25
-25
docs/assets/css/docs.css
docs/assets/css/docs.css
+38
-6
docs/assets/js/application.js
docs/assets/js/application.js
+4
-4
docs/base-css.html
docs/base-css.html
+224
-157
lib/buttons.less
lib/buttons.less
+1
-1
lib/forms.less
lib/forms.less
+21
-11
lib/mixins.less
lib/mixins.less
+0
-1
No files found.
bootstrap.css
View file @
c56e9d2d
...
...
@@ -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 Jan 5
15:48:31
PST 2012
* Date: Thu Jan 5
21:43:09
PST 2012
*/
html
,
body
{
margin
:
0
;
...
...
@@ -261,7 +261,6 @@ a:hover {
clear
:
both
;
}
[
class
*=
"span"
]
{
display
:
inline
;
float
:
left
;
margin-left
:
20px
;
}
...
...
@@ -555,10 +554,11 @@ input,
textarea
,
select
,
.uneditable-input
{
display
:
inline-
block
;
display
:
block
;
width
:
210px
;
height
:
18px
;
padding
:
4px
;
margin-bottom
:
9px
;
font-size
:
13px
;
line-height
:
18px
;
color
:
#555555
;
...
...
@@ -670,7 +670,6 @@ input.span1,
textarea
.span1
,
select
.span1
,
.uneditable-input.span1
{
display
:
inline-block
;
float
:
none
;
width
:
50px
;
margin-left
:
0
;
...
...
@@ -679,7 +678,6 @@ input.span2,
textarea
.span2
,
select
.span2
,
.uneditable-input.span2
{
display
:
inline-block
;
float
:
none
;
width
:
130px
;
margin-left
:
0
;
...
...
@@ -688,7 +686,6 @@ input.span3,
textarea
.span3
,
select
.span3
,
.uneditable-input.span3
{
display
:
inline-block
;
float
:
none
;
width
:
210px
;
margin-left
:
0
;
...
...
@@ -697,7 +694,6 @@ input.span4,
textarea
.span4
,
select
.span4
,
.uneditable-input.span4
{
display
:
inline-block
;
float
:
none
;
width
:
290px
;
margin-left
:
0
;
...
...
@@ -706,7 +702,6 @@ input.span5,
textarea
.span5
,
select
.span5
,
.uneditable-input.span5
{
display
:
inline-block
;
float
:
none
;
width
:
370px
;
margin-left
:
0
;
...
...
@@ -715,7 +710,6 @@ input.span6,
textarea
.span6
,
select
.span6
,
.uneditable-input.span6
{
display
:
inline-block
;
float
:
none
;
width
:
450px
;
margin-left
:
0
;
...
...
@@ -724,7 +718,6 @@ input.span7,
textarea
.span7
,
select
.span7
,
.uneditable-input.span7
{
display
:
inline-block
;
float
:
none
;
width
:
530px
;
margin-left
:
0
;
...
...
@@ -733,7 +726,6 @@ input.span8,
textarea
.span8
,
select
.span8
,
.uneditable-input.span8
{
display
:
inline-block
;
float
:
none
;
width
:
610px
;
margin-left
:
0
;
...
...
@@ -742,7 +734,6 @@ input.span9,
textarea
.span9
,
select
.span9
,
.uneditable-input.span9
{
display
:
inline-block
;
float
:
none
;
width
:
690px
;
margin-left
:
0
;
...
...
@@ -751,7 +742,6 @@ input.span10,
textarea
.span10
,
select
.span10
,
.uneditable-input.span10
{
display
:
inline-block
;
float
:
none
;
width
:
770px
;
margin-left
:
0
;
...
...
@@ -760,7 +750,6 @@ input.span11,
textarea
.span11
,
select
.span11
,
.uneditable-input.span11
{
display
:
inline-block
;
float
:
none
;
width
:
850px
;
margin-left
:
0
;
...
...
@@ -769,7 +758,6 @@ input.span12,
textarea
.span12
,
select
.span12
,
.uneditable-input.span12
{
display
:
inline-block
;
float
:
none
;
width
:
930px
;
margin-left
:
0
;
...
...
@@ -778,7 +766,6 @@ input.span13,
textarea
.span13
,
select
.span13
,
.uneditable-input.span13
{
display
:
inline-block
;
float
:
none
;
width
:
1010px
;
margin-left
:
0
;
...
...
@@ -787,7 +774,6 @@ input.span14,
textarea
.span14
,
select
.span14
,
.uneditable-input.span14
{
display
:
inline-block
;
float
:
none
;
width
:
1090px
;
margin-left
:
0
;
...
...
@@ -796,7 +782,6 @@ input.span15,
textarea
.span15
,
select
.span15
,
.uneditable-input.span15
{
display
:
inline-block
;
float
:
none
;
width
:
1170px
;
margin-left
:
0
;
...
...
@@ -805,7 +790,6 @@ input.span16,
textarea
.span16
,
select
.span16
,
.uneditable-input.span16
{
display
:
inline-block
;
float
:
none
;
width
:
1250px
;
margin-left
:
0
;
...
...
@@ -890,13 +874,13 @@ textarea[readonly] {
box-shadow
:
inset
0
1px
2px
rgba
(
0
,
0
,
0
,
0.025
);
cursor
:
not-allowed
;
}
:-moz-placeholder
{
input
:-moz-placeholder
{
color
:
#999999
;
}
::-webkit-input-placeholder
{
input
::-webkit-input-placeholder
{
color
:
#999999
;
}
.help-
text
{
.help-
block
{
margin-top
:
5px
;
margin-bottom
:
0
;
color
:
#999999
;
...
...
@@ -911,11 +895,8 @@ textarea[readonly] {
display
:
inline
;
padding-left
:
5px
;
}
.help-block
{
display
:
block
;
max-width
:
600px
;
}
.input-prepend
,
.input-append
{
margin-bottom
:
5px
;
zoom
:
1
;
}
.input-prepend
:before
,
...
...
@@ -977,10 +958,27 @@ textarea[readonly] {
border-radius
:
0
3px
3px
0
;
}
.search-form
.search-query
{
padding-left
:
14px
;
padding-right
:
14px
;
-webkit-border-radius
:
14px
;
-moz-border-radius
:
14px
;
border-radius
:
14px
;
}
.search-form
input
,
.inline-form
input
,
.horizontal-form
input
,
.search-form
textarea
,
.inline-form
textarea
,
.horizontal-form
textarea
,
.search-form
select
,
.inline-form
select
,
.horizontal-form
select
,
.search-form
.uneditable-input
,
.inline-form
.uneditable-input
,
.horizontal-form
.uneditable-input
{
display
:
inline-block
;
margin-bottom
:
0
;
}
.control-group
{
margin-bottom
:
18px
;
}
...
...
@@ -2554,7 +2552,7 @@ i {
}
.btn
{
display
:
inline-block
;
padding
:
5px
1
4
px
6px
;
padding
:
5px
1
0
px
6px
;
font-size
:
13px
;
line-height
:
normal
;
color
:
#333
;
...
...
bootstrap.min.css
View file @
c56e9d2d
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.css
View file @
c56e9d2d
...
...
@@ -36,11 +36,13 @@ body > .navbar-fixed .brand:hover {
/* Space out sub-sections more
-------------------------------------------------- */
.page-header
{
margin
:
36
px
0
18px
;
margin
:
45
px
0
18px
;
border-bottom
:
1px
solid
#eee
;
}
.page-header
h1
{
margin-bottom
:
9px
;
margin-bottom
:
17px
;
font-size
:
36px
;
line-height
:
1
;
}
...
...
@@ -327,10 +329,6 @@ pre.prettyprint {
overflow
:
hidden
;
}
.well
form
{
margin-bottom
:
0
;
}
.browser-support
{
max-width
:
100%
;
}
...
...
@@ -356,6 +354,40 @@ h2 + table {
position
:
relative
;
}
/* Remove bottom margin on example forms in wells */
form
.well
{
margin-bottom
:
0
;
}
/* Tighten up spacing */
.well
hr
{
margin
:
18px
0
;
}
/* Form docs for horizontal forms */
.form-docs
{
padding-left
:
10px
;
}
.form-docs
h3
,
.form-docs
p
,
.form-docs
li
{
color
:
#777
;
}
.form-docs
hr
{
margin
:
18px
0
;
}
/* Fake the :focus state to demo it */
.focused
{
border-color
:
rgba
(
82
,
168
,
236
,
.8
);
-webkit-box-shadow
:
inset
0
1px
3px
rgba
(
0
,
0
,
0
,
.1
),
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
-moz-box-shadow
:
inset
0
1px
3px
rgba
(
0
,
0
,
0
,
.1
),
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
box-shadow
:
inset
0
1px
3px
rgba
(
0
,
0
,
0
,
.1
),
0
0
8px
rgba
(
82
,
168
,
236
,
.6
);
outline
:
0
;
}
/* Icons
------------------------- */
.the-icons
{
...
...
docs/assets/js/application.js
View file @
c56e9d2d
...
...
@@ -9,10 +9,10 @@ $(function(){
// ==============================================
// Set a timeout...
setTimeout
(
function
(){
// Hide the address bar!
window
.
scrollTo
(
0
,
1
);
},
0
);
//
setTimeout(function(){
//
// Hide the address bar!
//
window.scrollTo(0, 1);
//
}, 0);
// Docs topbar nav
...
...
docs/base-css.html
View file @
c56e9d2d
This diff is collapsed.
Click to expand it.
lib/buttons.less
View file @
c56e9d2d
...
...
@@ -35,7 +35,7 @@
.btn {
// Button Base
display: inline-block;
padding: 5px 1
4
px 6px;
padding: 5px 1
0
px 6px;
font-size: @baseFontSize;
line-height: normal;
color: #333;
...
...
lib/forms.less
View file @
c56e9d2d
...
...
@@ -42,10 +42,11 @@ input,
textarea,
select,
.uneditable-input {
display:
inline-
block;
display: block;
width: 210px;
height: @baseLineHeight;
padding: 4px;
margin-bottom: 9px;
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @gray;
...
...
@@ -177,7 +178,6 @@ select:focus {
// Grid style input sizes
// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
.formColumns(@columnSpan: 1) {
display: inline-block;
float: none;
width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
margin-left: 0;
...
...
@@ -224,6 +224,7 @@ textarea[readonly] {
// FORM FIELD FEEDBACK STATES
// --------------------------
...
...
@@ -289,10 +290,10 @@ textarea[readonly] {
}
// Placeholder text gets special styles; can't be bundled together though for some reason
:-moz-placeholder {
input
:-moz-placeholder {
color: @grayLight;
}
::-webkit-input-placeholder {
input
::-webkit-input-placeholder {
color: @grayLight;
}
...
...
@@ -301,7 +302,7 @@ textarea[readonly] {
// HELP TEXT
// ---------
.help-
text
{
.help-
block
{
margin-top: 5px;
margin-bottom: 0;
color: @grayLight;
...
...
@@ -314,12 +315,6 @@ textarea[readonly] {
padding-left: 5px;
}
// Big blocks of help text
.help-block {
display: block;
max-width: 600px;
}
// INPUT GROUPS
...
...
@@ -328,6 +323,7 @@ textarea[readonly] {
// Allow us to put symbols and text within the input field for a cleaner look
.input-prepend,
.input-append {
margin-bottom: 5px;
.clearfix(); // Clear the float to prevent wrapping
input {
.border-radius(0 3px 3px 0);
...
...
@@ -377,6 +373,8 @@ textarea[readonly] {
// -----------
.search-form .search-query {
padding-left: 14px;
padding-right: 14px;
.border-radius(14px);
}
...
...
@@ -388,6 +386,18 @@ textarea[readonly] {
// Common properties
// -----------------
.search-form,
.inline-form,
.horizontal-form {
input,
textarea,
select,
.uneditable-input {
display: inline-block;
margin-bottom: 0;
}
}
// Margin to space out fieldsets
.control-group {
margin-bottom: @baseLineHeight;
...
...
lib/mixins.less
View file @
c56e9d2d
...
...
@@ -98,7 +98,6 @@
// Necessary grid styles for every column to make them appear next to each other horizontally
.gridColumn() {
display: inline;
float: left;
margin-left: @gridGutterWidth;
}
...
...
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