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
b8493ed8
Commit
b8493ed8
authored
13 years ago
by
Mark Otto
Browse files
Options
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
docs/templates/pages/base-css.mustache
+5
-0
docs/templates/pages/base-css.mustache
less/button-groups.less
+2
-1
less/button-groups.less
less/buttons.less
+9
-2
less/buttons.less
with
16 additions
and
3 deletions
+16
-3
docs/templates/pages/base-css.mustache
+
5
-
0
View file @
b8493ed8
...
@@ -1209,6 +1209,11 @@
...
@@ -1209,6 +1209,11 @@
<td><a
class=
"btn btn-danger"
href=
"#"
>
{{
_i
}}
Danger
{{/
i
}}
</a></td>
<td><a
class=
"btn btn-danger"
href=
"#"
>
{{
_i
}}
Danger
{{/
i
}}
</a></td>
<td><code>
.btn-danger
</code></td>
<td><code>
.btn-danger
</code></td>
<td>
{{
_i
}}
Indicates a dangerous or potentially negative action
{{/
i
}}
</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>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
2
-
1
View file @
b8493ed8
...
@@ -133,7 +133,8 @@
...
@@ -133,7 +133,8 @@
.btn-primary,
.btn-primary,
.btn-danger,
.btn-danger,
.btn-info,
.btn-info,
.btn-success {
.btn-success,
.btn-dark {
.caret {
.caret {
border-top-color: @white;
border-top-color: @white;
.opacity(75);
.opacity(75);
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
9
-
2
View file @
b8493ed8
...
@@ -107,7 +107,9 @@
...
@@ -107,7 +107,9 @@
.btn-success,
.btn-success,
.btn-success:hover,
.btn-success:hover,
.btn-info,
.btn-info,
.btn-info:hover {
.btn-info:hover,
.btn-dark,
.btn-dark:hover {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white;
color: @white;
}
}
...
@@ -116,7 +118,8 @@
...
@@ -116,7 +118,8 @@
.btn-warning.active,
.btn-warning.active,
.btn-danger.active,
.btn-danger.active,
.btn-success.active,
.btn-success.active,
.btn-info.active {
.btn-info.active,
.btn-dark.active {
color: rgba(255,255,255,.75);
color: rgba(255,255,255,.75);
}
}
...
@@ -141,6 +144,10 @@
...
@@ -141,6 +144,10 @@
.btn-info {
.btn-info {
.buttonBackground(#5bc0de, #2f96b4);
.buttonBackground(#5bc0de, #2f96b4);
}
}
// Dark appears as black
.btn-dark {
.buttonBackground(#454545, #262626);
}
// Cross-browser Jank
// Cross-browser Jank
...
...
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