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
728a5e17
Commit
728a5e17
authored
11 years ago
by
fat
Browse files
Options
Download
Plain Diff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts: dist/css/bootstrap.min.css
parents
53c80ed9
0c70744e
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
dist/css/bootstrap.css
+5
-4
dist/css/bootstrap.css
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
javascript.html
+12
-12
javascript.html
less/dropdowns.less
+6
-1
less/dropdowns.less
less/panels.less
+1
-1
less/panels.less
with
25 additions
and
19 deletions
+25
-19
dist/css/bootstrap.css
+
5
-
4
View file @
728a5e17
...
...
@@ -2473,6 +2473,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
vertical-align
:
middle
;
border-top
:
4px
solid
#000000
;
border-right
:
4px
solid
transparent
;
border-bottom
:
0
dotted
;
border-left
:
4px
solid
transparent
;
content
:
""
;
}
...
...
@@ -2591,7 +2592,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.dropup
.caret
,
.navbar-fixed-bottom
.dropdown
.caret
{
border-top
:
0
;
border-top
:
0
dotted
;
border-bottom
:
4px
solid
#000000
;
content
:
""
;
}
...
...
@@ -2726,7 +2727,7 @@ a.list-group-item:focus {
.panel-title
{
margin-top
:
0
;
margin-bottom
:
0
;
font-size
:
1
7.5
px
;
font-size
:
1
6
px
;
}
.panel-title
>
a
{
...
...
@@ -4207,12 +4208,12 @@ button.close {
}
.modal-backdrop
{
position
:
absolute
;
position
:
fixed
;
top
:
0
;
right
:
0
;
bottom
:
0
;
left
:
0
;
z-index
:
1030
;
height
:
100%
;
background-color
:
#000000
;
}
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
728a5e17
This diff is collapsed.
Click to expand it.
javascript.html
+
12
-
12
View file @
728a5e17
...
...
@@ -1415,11 +1415,11 @@ $('.nav-tabs').button()
<div
class=
"panel-group"
id=
"accordion"
>
<div
class=
"panel"
>
<div
class=
"panel-heading"
>
<h
3
class=
"panel-title"
>
<h
4
class=
"panel-title"
>
<a
class=
"accordion-toggle"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#collapseOne"
>
Collapsible Group Item #1
</a>
</h
3
>
</h
4
>
</div>
<div
id=
"collapseOne"
class=
"panel-collapse collapse in"
>
<div
class=
"panel-body"
>
...
...
@@ -1429,11 +1429,11 @@ $('.nav-tabs').button()
</div>
<div
class=
"panel"
>
<div
class=
"panel-heading"
>
<h
3
class=
"panel-title"
>
<h
4
class=
"panel-title"
>
<a
class=
"accordion-toggle"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#collapseTwo"
>
Collapsible Group Item #2
</a>
</h
3
>
</h
4
>
</div>
<div
id=
"collapseTwo"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
...
...
@@ -1443,11 +1443,11 @@ $('.nav-tabs').button()
</div>
<div
class=
"panel"
>
<div
class=
"panel-heading"
>
<h
3
class=
"panel-title"
>
<h
4
class=
"panel-title"
>
<a
class=
"accordion-toggle"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#collapseThree"
>
Collapsible Group Item #3
</a>
</h
3
>
</h
4
>
</div>
<div
id=
"collapseThree"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
...
...
@@ -1461,11 +1461,11 @@ $('.nav-tabs').button()
<div
class=
"panel-group"
id=
"accordion"
>
<div
class=
"panel"
>
<div
class=
"panel-heading"
>
<h
3
class=
"panel-title"
>
<h
4
class=
"panel-title"
>
<a
class=
"accordion-toggle"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#collapseOne"
>
Collapsible Group Item #1
</a>
</h
3
>
</h
4
>
</div>
<div
id=
"collapseOne"
class=
"panel-collapse collapse in"
>
<div
class=
"panel-body"
>
...
...
@@ -1475,11 +1475,11 @@ $('.nav-tabs').button()
</div>
<div
class=
"panel"
>
<div
class=
"panel-heading"
>
<h
3
class=
"panel-title"
>
<h
4
class=
"panel-title"
>
<a
class=
"accordion-toggle"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#collapseTwo"
>
Collapsible Group Item #2
</a>
</h
3
>
</h
4
>
</div>
<div
id=
"collapseTwo"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
...
...
@@ -1489,11 +1489,11 @@ $('.nav-tabs').button()
</div>
<div
class=
"panel"
>
<div
class=
"panel-heading"
>
<h
3
class=
"panel-title"
>
<h
4
class=
"panel-title"
>
<a
class=
"accordion-toggle"
data-toggle=
"collapse"
data-parent=
"#accordion"
href=
"#collapseThree"
>
Collapsible Group Item #3
</a>
</h
3
>
</h
4
>
</div>
<div
id=
"collapseThree"
class=
"panel-collapse collapse"
>
<div
class=
"panel-body"
>
...
...
This diff is collapsed.
Click to expand it.
less/dropdowns.less
+
6
-
1
View file @
728a5e17
...
...
@@ -13,6 +13,9 @@
border-top: @caret-width-base solid @dropdown-caret-color;
border-right: @caret-width-base solid transparent;
border-left: @caret-width-base solid transparent;
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
// we can just straight up remove this.
border-bottom: 0 dotted;
content: "";
}
...
...
@@ -161,7 +164,9 @@
.navbar-fixed-bottom .dropdown {
// Reverse the caret
.caret {
border-top: 0;
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
// gets fixed, restore `border-top: 0;`.
border-top: 0 dotted;
border-bottom: 4px solid @dropdown-caret-color;
content: "";
}
...
...
This diff is collapsed.
Click to expand it.
less/panels.less
+
1
-
1
View file @
728a5e17
...
...
@@ -59,7 +59,7 @@
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: (@font-size-base * 1.25);
font-size:
ceil(
(@font-size-base * 1.
1
25)
)
;
> a {
color: inherit;
}
...
...
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