Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
5b947b8a
Commit
5b947b8a
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix up padding on small buttons, add button examples
parent
f9deb801
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+4
-3
docs/assets/css/bootstrap.css
docs/base-css.html
+9
-1
docs/base-css.html
docs/templates/pages/base-css.mustache
+8
-0
docs/templates/pages/base-css.mustache
less/buttons.less
+1
-1
less/buttons.less
with
22 additions
and
5 deletions
+22
-5
docs/assets/css/bootstrap.css
+
4
-
3
View file @
5b947b8a
...
...
@@ -2037,6 +2037,7 @@ table .span24 {
display
:
inline-block
;
width
:
14px
;
height
:
14px
;
margin-top
:
1px
;
*
margin-right
:
.3em
;
line-height
:
14px
;
vertical-align
:
text-top
;
...
...
@@ -3016,17 +3017,17 @@ button.close {
}
.btn-large
[
class
^=
"icon-"
]
{
margin-top
:
1
px
;
margin-top
:
2
px
;
}
.btn-small
{
padding
:
5
px
9px
;
padding
:
3
px
9px
;
font-size
:
12px
;
line-height
:
18px
;
}
.btn-small
[
class
^=
"icon-"
]
{
margin-top
:
-1px
;
margin-top
:
0
;
}
.btn-mini
{
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
9
-
1
View file @
5b947b8a
...
...
@@ -967,7 +967,7 @@ For example, <code>section</code> should be wrapped as inline.
</pre>
<h3>
Textarea
</h3>
<p>
Form control which supports multiple lines of text. Change
<code>
row
s
</code>
attribute as necessary.
</p>
<p>
Form control which supports multiple lines of text. Change
<code>
row
</code>
attribute as necessary.
</p>
<form
class=
"bs-docs-example form-inline"
>
<textarea
rows=
"3"
></textarea>
</form>
...
...
@@ -1445,6 +1445,10 @@ For example, <code>section</code> should be wrapped as inline.
<button
type=
"button"
class=
"btn btn-large btn-primary"
>
Primary action
</button>
<button
type=
"button"
class=
"btn btn-large"
>
Action
</button>
</p>
<p>
<button
type=
"button"
class=
"btn btn-primary"
>
Primary action
</button>
<button
type=
"button"
class=
"btn"
>
Action
</button>
</p>
<p>
<button
type=
"button"
class=
"btn btn-small btn-primary"
>
Primary action
</button>
<button
type=
"button"
class=
"btn btn-small"
>
Action
</button>
...
...
@@ -1457,6 +1461,7 @@ For example, <code>section</code> should be wrapped as inline.
<pre
class=
"prettyprint linenums"
>
<
button class="btn btn-large" type="button"
>
Large button
<
/button
>
<
button class="btn btn-small" type="button"
>
Small button
<
/button
>
<
button class="btn" type="button"
>
Default button
<
/button
>
<
button class="btn btn-mini" type="button"
>
Mini button
<
/button
>
</pre>
<p>
Create block level buttons
—
those that span the full width of a parent
—
by adding
<code>
.btn-block
</code>
.
</p>
...
...
@@ -1740,6 +1745,7 @@ For example, <code>section</code> should be wrapped as inline.
<a
class=
"btn"
href=
"#"
><i
class=
"icon-align-right"
></i></a>
<a
class=
"btn"
href=
"#"
><i
class=
"icon-align-justify"
></i></a>
</div>
<br><br>
<div
class=
"btn-group"
>
<a
class=
"btn btn-primary"
href=
"#"
><i
class=
"icon-user icon-white"
></i>
User
</a>
<a
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
...
...
@@ -1751,6 +1757,8 @@ For example, <code>section</code> should be wrapped as inline.
<li><a
href=
"#"
><i
class=
"i"
></i>
Make admin
</a></li>
</ul>
</div>
<br><br>
<a
class=
"btn btn-small"
href=
"#"
><i
class=
"icon-star"
></i></a>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
8
-
0
View file @
5b947b8a
...
...
@@ -1382,6 +1382,10 @@
<button
type=
"button"
class=
"btn btn-large btn-primary"
>
{{
_i
}}
Primary action
{{/
i
}}
</button>
<button
type=
"button"
class=
"btn btn-large"
>
{{
_i
}}
Action
{{/
i
}}
</button>
</p>
<p>
<button
type=
"button"
class=
"btn btn-primary"
>
{{
_i
}}
Primary action
{{/
i
}}
</button>
<button
type=
"button"
class=
"btn"
>
{{
_i
}}
Action
{{/
i
}}
</button>
</p>
<p>
<button
type=
"button"
class=
"btn btn-small btn-primary"
>
{{
_i
}}
Primary action
{{/
i
}}
</button>
<button
type=
"button"
class=
"btn btn-small"
>
{{
_i
}}
Action
{{/
i
}}
</button>
...
...
@@ -1394,6 +1398,7 @@
<pre
class=
"prettyprint linenums"
>
<
button class="btn btn-large" type="button"
>
{{
_i
}}
Large button
{{/
i
}}
<
/button
>
<
button class="btn btn-small" type="button"
>
{{
_i
}}
Small button
{{/
i
}}
<
/button
>
<
button class="btn" type="button"
>
{{
_i
}}
Default button
{{/
i
}}
<
/button
>
<
button class="btn btn-mini" type="button"
>
{{
_i
}}
Mini button
{{/
i
}}
<
/button
>
</pre>
<p>
{{
_i
}}
Create block level buttons
—
those that span the full width of a parent
—
by adding
<code>
.btn-block
</code>
.
{{/
i
}}
</p>
...
...
@@ -1677,6 +1682,7 @@
<a
class=
"btn"
href=
"#"
><i
class=
"icon-align-right"
></i></a>
<a
class=
"btn"
href=
"#"
><i
class=
"icon-align-justify"
></i></a>
</div>
<br><br>
<div
class=
"btn-group"
>
<a
class=
"btn btn-primary"
href=
"#"
><i
class=
"icon-user icon-white"
></i>
{{
_i
}}
User
{{/
i
}}
</a>
<a
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
...
...
@@ -1688,6 +1694,8 @@
<li><a
href=
"#"
><i
class=
"i"
></i>
{{
_i
}}
Make admin
{{/
i
}}
</a></li>
</ul>
</div>
<br><br>
<a
class=
"btn btn-small"
href=
"#"
><i
class=
"icon-star"
></i></a>
</div>
</div>
{{! /bs-docs-example }}
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
1
-
1
View file @
5b947b8a
...
...
@@ -84,7 +84,7 @@
// Small
.btn-small {
padding:
5
px 9px;
padding:
3
px 9px;
font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 2px;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets