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