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
a57dbada
Commit
a57dbada
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
change classname from .btn-dark to .btn-inverse, change use text
parent
b8493ed8
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
+31
-3
docs/assets/css/bootstrap.css
docs/base-css.html
+5
-0
docs/base-css.html
docs/templates/pages/base-css.mustache
+4
-4
docs/templates/pages/base-css.mustache
less/button-groups.less
+1
-1
less/button-groups.less
less/buttons.less
+4
-4
less/buttons.less
with
45 additions
and
12 deletions
+45
-12
docs/assets/bootstrap.zip
+
0
-
0
View file @
a57dbada
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
31
-
3
View file @
a57dbada
...
...
@@ -1794,7 +1794,9 @@ table .span12 {
.btn-success
,
.btn-success
:hover
,
.btn-info
,
.btn-info
:hover
{
.btn-info
:hover
,
.btn-inverse
,
.btn-inverse
:hover
{
text-shadow
:
0
-1px
0
rgba
(
0
,
0
,
0
,
0.25
);
color
:
#ffffff
;
}
...
...
@@ -1802,7 +1804,8 @@ table .span12 {
.btn-warning.active
,
.btn-danger.active
,
.btn-success.active
,
.btn-info.active
{
.btn-info.active
,
.btn-dark.active
{
color
:
rgba
(
255
,
255
,
255
,
0.75
);
}
.btn-primary
{
...
...
@@ -1925,6 +1928,30 @@ table .span12 {
.btn-info
:active
,
.btn-info.active
{
background-color
:
#24748c
\
9
;
}
.btn-inverse
{
background-color
:
#393939
;
background-image
:
-moz-linear-gradient
(
top
,
#454545
,
#262626
);
background-image
:
-ms-linear-gradient
(
top
,
#454545
,
#262626
);
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
100%
,
from
(
#454545
),
to
(
#262626
));
background-image
:
-webkit-linear-gradient
(
top
,
#454545
,
#262626
);
background-image
:
-o-linear-gradient
(
top
,
#454545
,
#262626
);
background-image
:
linear-gradient
(
top
,
#454545
,
#262626
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#454545'
,
endColorstr
=
'#262626'
,
GradientType
=
0
);
border-color
:
#262626
#262626
#000000
;
border-color
:
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.1
)
rgba
(
0
,
0
,
0
,
0.25
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
enabled
=
false
);
}
.btn-inverse
:hover
,
.btn-inverse
:active
,
.btn-inverse.active
,
.btn-inverse.disabled
,
.btn-inverse
[
disabled
]
{
background-color
:
#262626
;
}
.btn-inverse
:active
,
.btn-inverse.active
{
background-color
:
#0c0c0c
\
9
;
}
button
.btn
,
input
[
type
=
"submit"
]
.btn
{
*
padding-top
:
2px
;
*
padding-bottom
:
2px
;
...
...
@@ -2057,7 +2084,8 @@ button.btn.small, input[type="submit"].btn.small {
.btn-primary
.caret
,
.btn-danger
.caret
,
.btn-info
.caret
,
.btn-success
.caret
{
.btn-success
.caret
,
.btn-inverse
.caret
{
border-top-color
:
#ffffff
;
opacity
:
0.75
;
filter
:
alpha
(
opacity
=
75
);
...
...
This diff is collapsed.
Click to expand it.
docs/base-css.html
+
5
-
0
View file @
a57dbada
...
...
@@ -1285,6 +1285,11 @@ For example, <code>section</code> should be wrapped as inline.
<td><a
class=
"btn btn-danger"
href=
"#"
>
Danger
</a></td>
<td><code>
.btn-danger
</code></td>
<td>
Indicates a dangerous or potentially negative action
</td>
</tr>
<tr>
<td><a
class=
"btn btn-inverse"
href=
"#"
>
Inverse
</a></td>
<td><code>
.btn-inverse
</code></td>
<td>
Alternate dark gray button, not tied to a semantic action or use
</td>
</tr>
</tbody>
</table>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/base-css.mustache
+
4
-
4
View file @
a57dbada
...
...
@@ -1210,10 +1210,10 @@
<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>
<td><a
class=
"btn btn-
inverse
"
href=
"#"
>
{{
_i
}}
Inverse
{{/
i
}}
</a></td>
<td><code>
.btn-
inverse
</code></td>
<td>
{{
_i
}}
Alternate dark gray button, not tied to a semantic action or use
{{/
i
}}
</td>
</tr>
</tbody>
</table>
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
1
-
1
View file @
a57dbada
...
...
@@ -134,7 +134,7 @@
.btn-danger,
.btn-info,
.btn-success,
.btn-
dark
{
.btn-
inverse
{
.caret {
border-top-color: @white;
.opacity(75);
...
...
This diff is collapsed.
Click to expand it.
less/buttons.less
+
4
-
4
View file @
a57dbada
...
...
@@ -108,8 +108,8 @@
.btn-success:hover,
.btn-info,
.btn-info:hover,
.btn-
dark
,
.btn-
dark
:hover {
.btn-
inverse
,
.btn-
inverse
:hover {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white;
}
...
...
@@ -144,8 +144,8 @@
.btn-info {
.buttonBackground(#5bc0de, #2f96b4);
}
//
Dark
appears as
black
.btn-
dark
{
//
Inverse
appears as
dark gray
.btn-
inverse
{
.buttonBackground(#454545, #262626);
}
...
...
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