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
cb9234ba
Commit
cb9234ba
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fix warning button issue per
#2392
and add warning buttons to components
parent
7a8d6b19
1 merge request
!1952
Tabulation navigation with Typeahead
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
+1
-0
docs/assets/css/bootstrap.css
docs/components.html
+23
-0
docs/components.html
docs/templates/pages/components.mustache
+23
-0
docs/templates/pages/components.mustache
less/button-groups.less
+1
-0
less/button-groups.less
with
48 additions
and
0 deletions
+48
-0
docs/assets/bootstrap.zip
+
0
-
0
View file @
cb9234ba
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
1
-
0
View file @
cb9234ba
...
...
@@ -2222,6 +2222,7 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
filter
:
alpha
(
opacity
=
100
);
}
.btn-primary
.caret
,
.btn-warning
.caret
,
.btn-danger
.caret
,
.btn-info
.caret
,
.btn-success
.caret
,
...
...
This diff is collapsed.
Click to expand it.
docs/components.html
+
23
-
0
View file @
cb9234ba
...
...
@@ -229,6 +229,16 @@
</div>
<!-- /btn-group -->
</div>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group"
>
<a
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
>
Warning
<span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
<li><a
href=
"#"
>
Something else here
</a></li>
<li
class=
"divider"
></li>
<li><a
href=
"#"
>
Separated link
</a></li>
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<a
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
>
Success
<span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
...
...
@@ -324,6 +334,17 @@
</div>
<!-- /btn-group -->
</div>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group"
>
<a
class=
"btn btn-warning"
href=
"#"
>
Warning
</a>
<a
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
<li><a
href=
"#"
>
Something else here
</a></li>
<li
class=
"divider"
></li>
<li><a
href=
"#"
>
Separated link
</a></li>
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<a
class=
"btn btn-success"
href=
"#"
>
Success
</a>
<a
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
...
...
@@ -346,6 +367,8 @@
<li><a
href=
"#"
>
Separated link
</a></li>
</ul>
</div>
<!-- /btn-group -->
</div>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group"
>
<a
class=
"btn btn-inverse"
href=
"#"
>
Inverse
</a>
<a
class=
"btn btn-inverse dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/components.mustache
+
23
-
0
View file @
cb9234ba
...
...
@@ -153,6 +153,16 @@
</div>
<!-- /btn-group -->
</div>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group"
>
<a
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
>
{{
_i
}}
Warning
{{/
i
}}
<span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
{{
_i
}}
Action
{{/
i
}}
</a></li>
<li><a
href=
"#"
>
{{
_i
}}
Another action
{{/
i
}}
</a></li>
<li><a
href=
"#"
>
{{
_i
}}
Something else here
{{/
i
}}
</a></li>
<li
class=
"divider"
></li>
<li><a
href=
"#"
>
{{
_i
}}
Separated link
{{/
i
}}
</a></li>
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<a
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
>
{{
_i
}}
Success
{{/
i
}}
<span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
...
...
@@ -248,6 +258,17 @@
</div>
<!-- /btn-group -->
</div>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group"
>
<a
class=
"btn btn-warning"
href=
"#"
>
{{
_i
}}
Warning
{{/
i
}}
</a>
<a
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
{{
_i
}}
Action
{{/
i
}}
</a></li>
<li><a
href=
"#"
>
{{
_i
}}
Another action
{{/
i
}}
</a></li>
<li><a
href=
"#"
>
{{
_i
}}
Something else here
{{/
i
}}
</a></li>
<li
class=
"divider"
></li>
<li><a
href=
"#"
>
{{
_i
}}
Separated link
{{/
i
}}
</a></li>
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<a
class=
"btn btn-success"
href=
"#"
>
{{
_i
}}
Success
{{/
i
}}
</a>
<a
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
...
...
@@ -270,6 +291,8 @@
<li><a
href=
"#"
>
{{
_i
}}
Separated link
{{/
i
}}
</a></li>
</ul>
</div>
<!-- /btn-group -->
</div>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group"
>
<a
class=
"btn btn-inverse"
href=
"#"
>
{{
_i
}}
Inverse
{{/
i
}}
</a>
<a
class=
"btn btn-inverse dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><span
class=
"caret"
></span></a>
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
1
-
0
View file @
cb9234ba
...
...
@@ -131,6 +131,7 @@
// Account for other colors
.btn-primary,
.btn-warning,
.btn-danger,
.btn-info,
.btn-success,
...
...
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