Skip to content
GitLab
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
be45a821
Commit
be45a821
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#6148
: Icons in mini buttons properly aligned
parent
cc6fda22
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+5
-0
docs/assets/css/bootstrap.css
docs/base-css.html
+5
-10
docs/base-css.html
docs/templates/pages/base-css.mustache
+5
-10
docs/templates/pages/base-css.mustache
less/buttons.less
+4
-0
less/buttons.less
with
19 additions
and
20 deletions
+19
-20
docs/assets/css/bootstrap.css
+
5
-
0
View file @
be45a821
...
...
@@ -3258,6 +3258,11 @@ button.close {
margin-top
:
0
;
}
.btn-mini
[
class
^=
"icon-"
],
.btn-mini
[
class
*=
" icon-"
]
{
margin-top
:
-1px
;
}
.btn-mini
{
padding
:
0
6px
;
font-size
:
10.5px
;
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
5
-
10
View file @
be45a821
...
...
@@ -2078,23 +2078,18 @@ For example, <code><section></code> should be wrapped as inlin
<
/div
>
</pre>
<h5>
Large button
</h5>
<h5>
Button sizes
</h5>
<div
class=
"bs-docs-example"
>
<a
class=
"btn btn-large"
href=
"#"
><i
class=
"icon-star"
></i>
Star
</a>
<a
class=
"btn btn-small"
href=
"#"
><i
class=
"icon-star"
></i>
Star
</a>
<a
class=
"btn btn-mini"
href=
"#"
><i
class=
"icon-star"
></i>
Star
</a>
</div>
<pre
class=
"prettyprint linenums"
>
<
a class="btn btn-large" href="#"
><
i class="icon-star"
><
/i
>
Star
<
/a
>
<
a class="btn btn-small" href="#"
><
i class="icon-star"
><
/i
>
Star
<
/a
>
<
a class="btn btn-mini" href="#"
><
i class="icon-star"
><
/i
>
Star
<
/a
>
</pre>
<h5>
Small button
</h5>
<div
class=
"bs-docs-example"
>
<a
class=
"btn btn-small"
href=
"#"
><i
class=
"icon-star"
></i></a>
</div>
<pre
class=
"prettyprint linenums"
>
<
a class="btn btn-small" href="#"
><
i class="icon-star"
><
/i
><
/a
>
</pre>
<h4>
Navigation
</h4>
<div
class=
"bs-docs-example"
>
<div
class=
"well"
style=
"padding: 8px 0; margin-bottom: 0;"
>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
5
-
10
View file @
be45a821
...
...
@@ -2015,23 +2015,18 @@
<
/div
>
</pre>
<h5>
{{
_i
}}
Large button
{{/
i
}}
</h5>
<h5>
{{
_i
}}
Button sizes
{{/
i
}}
</h5>
<div
class=
"bs-docs-example"
>
<a
class=
"btn btn-large"
href=
"#"
><i
class=
"icon-star"
></i>
Star
</a>
<a
class=
"btn btn-small"
href=
"#"
><i
class=
"icon-star"
></i>
Star
</a>
<a
class=
"btn btn-mini"
href=
"#"
><i
class=
"icon-star"
></i>
Star
</a>
</div>
{{! /bs-docs-example }}
<pre
class=
"prettyprint linenums"
>
<
a class="btn btn-large" href="#"
><
i class="icon-star"
><
/i
>
Star
<
/a
>
<
a class="btn btn-small" href="#"
><
i class="icon-star"
><
/i
>
Star
<
/a
>
<
a class="btn btn-mini" href="#"
><
i class="icon-star"
><
/i
>
Star
<
/a
>
</pre>
<h5>
{{
_i
}}
Small button
{{/
i
}}
</h5>
<div
class=
"bs-docs-example"
>
<a
class=
"btn btn-small"
href=
"#"
><i
class=
"icon-star"
></i></a>
</div>
{{! /bs-docs-example }}
<pre
class=
"prettyprint linenums"
>
<
a class="btn btn-small" href="#"
><
i class="icon-star"
><
/i
><
/a
>
</pre>
<h4>
{{
_i
}}
Navigation
{{/
i
}}
</h4>
<div
class=
"bs-docs-example"
>
<div
class=
"well"
style=
"padding: 8px 0; margin-bottom: 0;"
>
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
4
-
0
View file @
be45a821
...
...
@@ -86,6 +86,10 @@
.btn-small [class*=" icon-"] {
margin-top: 0;
}
.btn-mini [class^="icon-"],
.btn-mini [class*=" icon-"] {
margin-top: -1px;
}
// Mini
.btn-mini {
...
...
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