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
b8493ed8
Commit
b8493ed8
authored
Feb 12, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.0.1-wip' of
https://github.com/simonfranz/bootstrap
into simonfranz-2.0.1-wip
parents
1b32e982
d9eff8ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
docs/templates/pages/base-css.mustache
docs/templates/pages/base-css.mustache
+5
-0
less/button-groups.less
less/button-groups.less
+2
-1
less/buttons.less
less/buttons.less
+9
-2
No files found.
docs/templates/pages/base-css.mustache
View file @
b8493ed8
...
...
@@ -1209,6 +1209,11 @@
<td><a
class=
"btn btn-danger"
href=
"#"
>
{{
_i
}}
Danger
{{/
i
}}
</a></td>
<td><code>
.btn-danger
</code></td>
<td>
{{
_i
}}
Indicates a dangerous or potentially negative action
{{/
i
}}
</td>
</tr>
<tr>
<td><a
class=
"btn btn-dark"
href=
"#"
>
{{
_i
}}
Dark
{{/
i
}}
</a></td>
<td><code>
.btn-dark
</code></td>
<td>
{{
_i
}}
Indicates a potential abort or black magic
{{/
i
}}
</td>
</tr>
</tbody>
</table>
...
...
less/button-groups.less
View file @
b8493ed8
...
...
@@ -133,7 +133,8 @@
.btn-primary,
.btn-danger,
.btn-info,
.btn-success {
.btn-success,
.btn-dark {
.caret {
border-top-color: @white;
.opacity(75);
...
...
less/buttons.less
View file @
b8493ed8
...
...
@@ -107,7 +107,9 @@
.btn-success,
.btn-success:hover,
.btn-info,
.btn-info:hover {
.btn-info:hover,
.btn-dark,
.btn-dark:hover {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white;
}
...
...
@@ -116,7 +118,8 @@
.btn-warning.active,
.btn-danger.active,
.btn-success.active,
.btn-info.active {
.btn-info.active,
.btn-dark.active {
color: rgba(255,255,255,.75);
}
...
...
@@ -141,6 +144,10 @@
.btn-info {
.buttonBackground(#5bc0de, #2f96b4);
}
// Dark appears as black
.btn-dark {
.buttonBackground(#454545, #262626);
}
// Cross-browser Jank
...
...
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