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
51f5b7b8
Commit
51f5b7b8
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
cleanup accordion css and add comments
parent
9372fdbf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
bootstrap.css
+3
-6
bootstrap.css
bootstrap.min.css
+2
-3
bootstrap.min.css
docs/javascript.html
+1
-1
docs/javascript.html
lib/accordion.less
+5
-6
lib/accordion.less
with
11 additions
and
16 deletions
+11
-16
bootstrap.css
+
3
-
6
View file @
51f5b7b8
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Jan 17 23:
17:49
PST 2012
* Date: Tue Jan 17 23:
24:38
PST 2012
*/
html
,
body
{
margin
:
0
;
...
...
@@ -2937,7 +2937,7 @@ a.thumbnail:hover {
background-image
:
linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
}
.accordion
{
padding
:
0
;
margin-bottom
:
18px
;
}
.accordion-group
{
background-color
:
#f5f5f5
;
...
...
@@ -2950,15 +2950,12 @@ a.thumbnail:hover {
border-bottom
:
0
;
}
.accordion-body
{
margin
:
0
0
2px
;
margin
-bottom
:
2px
;
}
.accordion-inner
{
padding
:
9px
15px
;
border-top
:
1px
solid
#e5e5e5
;
}
.accordion
.in
{
margin-bottom
:
9px
;
}
.carousel
{
position
:
relative
;
line-height
:
1
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
2
-
3
View file @
51f5b7b8
...
...
@@ -513,12 +513,11 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.progress.success.striped
.bar
{
background-color
:
#62c462
;
background-image
:
-webkit-gradient
(
linear
,
0
100%
,
100%
0
,
color-stop
(
0.25
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.25
,
transparent
),
color-stop
(
0.5
,
transparent
),
color-stop
(
0.5
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
transparent
),
to
(
transparent
));
background-image
:
-webkit-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-moz-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-ms-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-o-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);}
.progress.info
.bar
{
background-color
:
#339bb9
;
background-image
:
-khtml-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#5bc0de
),
to
(
#339bb9
));
background-image
:
-moz-linear-gradient
(
top
,
#5bc0de
,
#339bb9
);
background-image
:
-ms-linear-gradient
(
top
,
#5bc0de
,
#339bb9
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
color-stop
(
0%
,
#5bc0de
),
color-stop
(
100%
,
#339bb9
));
background-image
:
-webkit-linear-gradient
(
top
,
#5bc0de
,
#339bb9
);
background-image
:
-o-linear-gradient
(
top
,
#5bc0de
,
#339bb9
);
background-image
:
linear-gradient
(
top
,
#5bc0de
,
#339bb9
);
background-repeat
:
repeat-x
;
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#5bc0de'
,
endColorstr
=
'#339bb9'
,
GradientType
=
0
);}
.progress.info.striped
.bar
{
background-color
:
#5bc0de
;
background-image
:
-webkit-gradient
(
linear
,
0
100%
,
100%
0
,
color-stop
(
0.25
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.25
,
transparent
),
color-stop
(
0.5
,
transparent
),
color-stop
(
0.5
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
rgba
(
255
,
255
,
255
,
0.15
)),
color-stop
(
0.75
,
transparent
),
to
(
transparent
));
background-image
:
-webkit-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-moz-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-ms-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
-o-linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);
background-image
:
linear-gradient
(
-45deg
,
rgba
(
255
,
255
,
255
,
0.15
)
25%
,
transparent
25%
,
transparent
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
50%
,
rgba
(
255
,
255
,
255
,
0.15
)
75%
,
transparent
75%
,
transparent
);}
.accordion
{
padding
:
0
;}
.accordion
{
margin-bottom
:
18px
;}
.accordion-group
{
background-color
:
#f5f5f5
;
-webkit-border-radius
:
4px
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;}
.accordion-heading
{
padding
:
8px
15px
;
border-bottom
:
0
;}
.accordion-body
{
margin
:
0
0
2px
;}
.accordion-body
{
margin
-bottom
:
2px
;}
.accordion-inner
{
padding
:
9px
15px
;
border-top
:
1px
solid
#e5e5e5
;}
.accordion
.in
{
margin-bottom
:
9px
;}
.carousel
{
position
:
relative
;
line-height
:
1
;}
.carousel-inner
{
overflow
:
hidden
;
width
:
100%
;
position
:
relative
;}
.carousel
.item
{
display
:
none
;
position
:
relative
;
-webkit-transition
:
0.6s
ease-in-out
left
;
-moz-transition
:
0.6s
ease-in-out
left
;
-ms-transition
:
0.6s
ease-in-out
left
;
-o-transition
:
0.6s
ease-in-out
left
;
transition
:
0.6s
ease-in-out
left
;}
...
...
This diff is collapsed.
Click to expand it.
docs/javascript.html
+
1
-
1
View file @
51f5b7b8
...
...
@@ -1080,7 +1080,7 @@ $('#my-alert').bind('closed', function () {
<h2>
Example accordion
</h2>
<p>
Using the collapse plugin, we built a simple accordion style widget:
</p>
<div
class=
"accordion
2
"
id=
"accordion2"
>
<div
class=
"accordion"
id=
"accordion2"
>
<div
class=
"accordion-group"
>
<div
class=
"accordion-heading"
>
<a
data-toggle=
"collapse"
data-parent=
"#accordion2"
href=
"#collapseOne"
>
...
...
This diff is collapsed.
Click to expand it.
lib/accordion.less
+
5
-
6
View file @
51f5b7b8
// ACCORDION
// ---------
// Parent container
.accordion {
margin-bottom: @baseLineHeight;
}
// Group == heading + body
.accordion-group {
background-color: #f5f5f5;
.border-radius(4px);
...
...
@@ -13,16 +16,12 @@
padding: 8px 15px;
border-bottom: 0;
}
.accordion-body {
margin
: 0 0
2px;
margin
-bottom:
2px;
}
// Inner needs the styles because you can't animate properly with any styles on the element
.accordion-inner {
padding: 9px 15px;
border-top: 1px solid #e5e5e5;
}
.accordion .in {
margin-bottom: @baseLineHeight / 2;
}
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