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
404e4d9e
Commit
404e4d9e
authored
12 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
fix carousel and rebuild js
parent
b5af762e
3 merge requests
!5908
support for the elements that don't exist yet
,
!5866
Issue 5859
,
!5840
filter *.less.swp
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/css/bootstrap-responsive.css
+4
-1
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-carousel.js
+1
-1
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-dropdown.js
+1
-1
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap.js
+2
-2
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
js/bootstrap-carousel.js
+1
-1
js/bootstrap-carousel.js
with
10 additions
and
7 deletions
+10
-7
docs/assets/css/bootstrap-responsive.css
+
4
-
1
View file @
404e4d9e
...
...
@@ -1018,7 +1018,7 @@
position
:
static
;
top
:
auto
;
left
:
auto
;
display
:
block
;
display
:
none
;
float
:
none
;
max-width
:
none
;
padding
:
0
;
...
...
@@ -1032,6 +1032,9 @@
-moz-box-shadow
:
none
;
box-shadow
:
none
;
}
.nav-collapse
.open
>
.dropdown-menu
{
display
:
block
;
}
.nav-collapse
.dropdown-menu
:before
,
.nav-collapse
.dropdown-menu
:after
{
display
:
none
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-carousel.js
+
1
-
1
View file @
404e4d9e
...
...
@@ -168,7 +168,7 @@
$
(
document
).
on
(
'
click.carousel.data-api
'
,
'
[data-slide]
'
,
function
(
e
)
{
var
$this
=
$
(
this
),
href
,
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
=
$this
.
attr
(
'
href
'
))
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
))
//strip for ie7
,
options
=
!
$target
.
data
(
'
carousel
'
)
&&
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
,
options
=
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
$target
.
carousel
(
options
)
e
.
preventDefault
()
})
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-dropdown.js
+
1
-
1
View file @
404e4d9e
...
...
@@ -101,7 +101,7 @@
function
clearMenus
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
"
open
"
)
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
})
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
2
-
2
View file @
404e4d9e
...
...
@@ -407,7 +407,7 @@
$
(
document
).
on
(
'
click.carousel.data-api
'
,
'
[data-slide]
'
,
function
(
e
)
{
var
$this
=
$
(
this
),
href
,
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
=
$this
.
attr
(
'
href
'
))
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
))
//strip for ie7
,
options
=
!
$target
.
data
(
'
carousel
'
)
&&
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
,
options
=
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
$target
.
carousel
(
options
)
e
.
preventDefault
()
})
...
...
@@ -670,7 +670,7 @@
function
clearMenus
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
"
open
"
)
getParent
(
$
(
this
)).
removeClass
(
'
open
'
)
})
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
404e4d9e
This diff is collapsed.
Click to expand it.
js/bootstrap-carousel.js
+
1
-
1
View file @
404e4d9e
...
...
@@ -168,7 +168,7 @@
$
(
document
).
on
(
'
click.carousel.data-api
'
,
'
[data-slide]
'
,
function
(
e
)
{
var
$this
=
$
(
this
),
href
,
$target
=
$
(
$this
.
attr
(
'
data-target
'
)
||
(
href
=
$this
.
attr
(
'
href
'
))
&&
href
.
replace
(
/.*
(?=
#
[^\s]
+$
)
/
,
''
))
//strip for ie7
,
options
=
!
$target
.
data
(
'
carousel
'
)
&&
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
,
options
=
$
.
extend
({},
$target
.
data
(),
$this
.
data
())
$target
.
carousel
(
options
)
e
.
preventDefault
()
})
...
...
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