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
930c422f
Commit
930c422f
authored
Oct 22, 2014
by
Heinrich Fenkart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
grunt
parent
e811a241
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
17 deletions
+25
-17
dist/js/bootstrap.js
dist/js/bootstrap.js
+9
-5
dist/js/bootstrap.min.js
dist/js/bootstrap.min.js
+1
-1
docs/_includes/customizer-variables.html
docs/_includes/customizer-variables.html
+3
-3
docs/assets/js/raw-files.min.js
docs/assets/js/raw-files.min.js
+2
-2
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.js
+9
-5
docs/dist/js/bootstrap.min.js
docs/dist/js/bootstrap.min.js
+1
-1
No files found.
dist/js/bootstrap.js
View file @
930c422f
...
@@ -552,17 +552,21 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -552,17 +552,21 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
Collapse
.
prototype
.
show
=
function
()
{
Collapse
.
prototype
.
show
=
function
()
{
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
var
activesData
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collapsing
'
)
if
(
actives
&&
actives
.
length
)
{
activesData
=
actives
.
data
(
'
bs.collapse
'
)
if
(
activesData
&&
activesData
.
transitioning
)
return
}
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
this
.
$element
.
trigger
(
startEvent
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
if
(
startEvent
.
isDefaultPrevented
())
return
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collapsing
'
)
if
(
actives
&&
actives
.
length
)
{
if
(
actives
&&
actives
.
length
)
{
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
if
(
hasData
&&
hasData
.
transitioning
)
return
Plugin
.
call
(
actives
,
'
hide
'
)
Plugin
.
call
(
actives
,
'
hide
'
)
ha
sData
||
actives
.
data
(
'
bs.collapse
'
,
null
)
active
sData
||
actives
.
data
(
'
bs.collapse
'
,
null
)
}
}
var
dimension
=
this
.
dimension
()
var
dimension
=
this
.
dimension
()
...
...
dist/js/bootstrap.min.js
View file @
930c422f
This diff is collapsed.
Click to expand it.
docs/_includes/customizer-variables.html
View file @
930c422f
...
@@ -621,7 +621,7 @@
...
@@ -621,7 +621,7 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"bs-customizer-input"
>
<div
class=
"bs-customizer-input"
>
<label
for=
"input-@container-tablet"
>
@container-tablet
</label>
<label
for=
"input-@container-tablet"
>
@container-tablet
</label>
<input
id=
"input-@container-tablet"
type=
"text"
value=
"(
(720px + @grid-gutter-width)
)"
data-var=
"@container-tablet"
class=
"form-control"
/>
<input
id=
"input-@container-tablet"
type=
"text"
value=
"(
720px + @grid-gutter-width
)"
data-var=
"@container-tablet"
class=
"form-control"
/>
</div>
</div>
<div
class=
"bs-customizer-input"
>
<div
class=
"bs-customizer-input"
>
<label
for=
"input-@container-sm"
>
@container-sm
</label>
<label
for=
"input-@container-sm"
>
@container-sm
</label>
...
@@ -630,7 +630,7 @@
...
@@ -630,7 +630,7 @@
</div>
</div>
<div
class=
"bs-customizer-input"
>
<div
class=
"bs-customizer-input"
>
<label
for=
"input-@container-desktop"
>
@container-desktop
</label>
<label
for=
"input-@container-desktop"
>
@container-desktop
</label>
<input
id=
"input-@container-desktop"
type=
"text"
value=
"(
(940px + @grid-gutter-width)
)"
data-var=
"@container-desktop"
class=
"form-control"
/>
<input
id=
"input-@container-desktop"
type=
"text"
value=
"(
940px + @grid-gutter-width
)"
data-var=
"@container-desktop"
class=
"form-control"
/>
</div>
</div>
<div
class=
"bs-customizer-input"
>
<div
class=
"bs-customizer-input"
>
<label
for=
"input-@container-md"
>
@container-md
</label>
<label
for=
"input-@container-md"
>
@container-md
</label>
...
@@ -639,7 +639,7 @@
...
@@ -639,7 +639,7 @@
</div>
</div>
<div
class=
"bs-customizer-input"
>
<div
class=
"bs-customizer-input"
>
<label
for=
"input-@container-large-desktop"
>
@container-large-desktop
</label>
<label
for=
"input-@container-large-desktop"
>
@container-large-desktop
</label>
<input
id=
"input-@container-large-desktop"
type=
"text"
value=
"(
(1140px + @grid-gutter-width)
)"
data-var=
"@container-large-desktop"
class=
"form-control"
/>
<input
id=
"input-@container-large-desktop"
type=
"text"
value=
"(
1140px + @grid-gutter-width
)"
data-var=
"@container-large-desktop"
class=
"form-control"
/>
</div>
</div>
<div
class=
"bs-customizer-input"
>
<div
class=
"bs-customizer-input"
>
<label
for=
"input-@container-lg"
>
@container-lg
</label>
<label
for=
"input-@container-lg"
>
@container-lg
</label>
...
...
docs/assets/js/raw-files.min.js
View file @
930c422f
This diff is collapsed.
Click to expand it.
docs/dist/js/bootstrap.js
View file @
930c422f
...
@@ -552,17 +552,21 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -552,17 +552,21 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
Collapse
.
prototype
.
show
=
function
()
{
Collapse
.
prototype
.
show
=
function
()
{
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
var
activesData
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collapsing
'
)
if
(
actives
&&
actives
.
length
)
{
activesData
=
actives
.
data
(
'
bs.collapse
'
)
if
(
activesData
&&
activesData
.
transitioning
)
return
}
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
this
.
$element
.
trigger
(
startEvent
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
if
(
startEvent
.
isDefaultPrevented
())
return
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collapsing
'
)
if
(
actives
&&
actives
.
length
)
{
if
(
actives
&&
actives
.
length
)
{
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
if
(
hasData
&&
hasData
.
transitioning
)
return
Plugin
.
call
(
actives
,
'
hide
'
)
Plugin
.
call
(
actives
,
'
hide
'
)
ha
sData
||
actives
.
data
(
'
bs.collapse
'
,
null
)
active
sData
||
actives
.
data
(
'
bs.collapse
'
,
null
)
}
}
var
dimension
=
this
.
dimension
()
var
dimension
=
this
.
dimension
()
...
...
docs/dist/js/bootstrap.min.js
View file @
930c422f
This diff is collapsed.
Click to expand it.
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