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
fda5bb13
Commit
fda5bb13
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons
parent
74f51105
3 merge requests
!6060
Waits to tigger the hidden event
,
!6055
Typeahead complex source
,
!6061
Sorry, close this. I pulled to the wrong branch!
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+1
-1
docs/assets/css/bootstrap.css
docs/base-css.html
+8
-0
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
18 additions
and
2 deletions
+18
-2
docs/assets/css/bootstrap.css
+
1
-
1
View file @
fda5bb13
...
...
@@ -3238,7 +3238,7 @@ button.close {
.btn-large
[
class
^=
"icon-"
],
.btn-large
[
class
*=
" icon-"
]
{
margin-top
:
2
px
;
margin-top
:
4
px
;
}
.btn-small
{
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
8
-
0
View file @
fda5bb13
...
...
@@ -2076,6 +2076,14 @@ For example, <code><section></code> should be wrapped as inlin
<
li
><
a href="#"
><
i class="i"
><
/i
>
Make admin
<
/a
><
/li
>
<
/ul
>
<
/div
>
</pre>
<h5>
Large button
</h5>
<div
class=
"bs-docs-example"
>
<a
class=
"btn btn-large"
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
>
</pre>
<h5>
Small button
</h5>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
8
-
0
View file @
fda5bb13
...
...
@@ -2013,6 +2013,14 @@
<
li
><
a href="#"
><
i class="i"
><
/i
>
{{
_i
}}
Make admin
{{/
i
}}
<
/a
><
/li
>
<
/ul
>
<
/div
>
</pre>
<h5>
{{
_i
}}
Large button
{{/
i
}}
</h5>
<div
class=
"bs-docs-example"
>
<a
class=
"btn btn-large"
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
>
</pre>
<h5>
{{
_i
}}
Small button
{{/
i
}}
</h5>
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
1
-
1
View file @
fda5bb13
...
...
@@ -73,7 +73,7 @@
}
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
margin-top:
2
px;
margin-top:
4
px;
}
// Small
...
...
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