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
961687e4
Commit
961687e4
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
run grunt dist
parent
0a955844
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dist/css/bootstrap.css
+13
-13
dist/css/bootstrap.css
dist/css/bootstrap.css.map
+0
-0
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
dist/js/bootstrap.js
+32
-32
dist/js/bootstrap.js
with
46 additions
and
46 deletions
+46
-46
dist/css/bootstrap.css
+
13
-
13
View file @
961687e4
...
@@ -3762,16 +3762,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
...
@@ -3762,16 +3762,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
display
:
none
;
display
:
none
;
}
}
}
}
.navbar
-
nav
{
.navbar
.
nav
{
margin
:
7.5px
-15px
;
margin
:
7.5px
-15px
;
}
}
.navbar
-
nav
>
li
>
a
{
.navbar
.
nav
>
li
>
a
{
padding-top
:
10px
;
padding-top
:
10px
;
padding-bottom
:
10px
;
padding-bottom
:
10px
;
line-height
:
20px
;
line-height
:
20px
;
}
}
@media
(
max-width
:
767px
)
{
@media
(
max-width
:
767px
)
{
.navbar
-
nav
.open
.dropdown-menu
{
.navbar
.
nav
.open
.dropdown-menu
{
position
:
static
;
position
:
static
;
float
:
none
;
float
:
none
;
width
:
auto
;
width
:
auto
;
...
@@ -3780,31 +3780,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
...
@@ -3780,31 +3780,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
border
:
0
;
border
:
0
;
box-shadow
:
none
;
box-shadow
:
none
;
}
}
.navbar
-
nav
.open
.dropdown-menu
>
li
>
a
,
.navbar
.
nav
.open
.dropdown-menu
>
li
>
a
,
.navbar
-
nav
.open
.dropdown-menu
.dropdown-header
{
.navbar
.
nav
.open
.dropdown-menu
.dropdown-header
{
padding
:
5px
15px
5px
25px
;
padding
:
5px
15px
5px
25px
;
}
}
.navbar
-
nav
.open
.dropdown-menu
>
li
>
a
{
.navbar
.
nav
.open
.dropdown-menu
>
li
>
a
{
line-height
:
20px
;
line-height
:
20px
;
}
}
.navbar
-
nav
.open
.dropdown-menu
>
li
>
a
:hover
,
.navbar
.
nav
.open
.dropdown-menu
>
li
>
a
:hover
,
.navbar
-
nav
.open
.dropdown-menu
>
li
>
a
:focus
{
.navbar
.
nav
.open
.dropdown-menu
>
li
>
a
:focus
{
background-image
:
none
;
background-image
:
none
;
}
}
}
}
@media
(
min-width
:
768px
)
{
@media
(
min-width
:
768px
)
{
.navbar
-
nav
{
.navbar
.
nav
{
float
:
left
;
float
:
left
;
margin
:
0
;
margin
:
0
;
}
}
.navbar
-
nav
>
li
{
.navbar
.
nav
>
li
{
float
:
left
;
float
:
left
;
}
}
.navbar
-
nav
>
li
>
a
{
.navbar
.
nav
>
li
>
a
{
padding-top
:
15px
;
padding-top
:
15px
;
padding-bottom
:
15px
;
padding-bottom
:
15px
;
}
}
.navbar
-
nav.navbar-right
:last-child
{
.navbar
.
nav.navbar-right
:last-child
{
margin-right
:
-15px
;
margin-right
:
-15px
;
}
}
}
}
...
@@ -4094,7 +4094,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
...
@@ -4094,7 +4094,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
border-radius
:
4px
;
border-radius
:
4px
;
}
}
.breadcrumb
>
li
{
.breadcrumb
>
li
{
display
:
inline
-block
;
display
:
inline
;
}
}
.breadcrumb
>
li
+
li
:before
{
.breadcrumb
>
li
+
li
:before
{
padding
:
0
5px
;
padding
:
0
5px
;
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.css.map
+44 bytes (+0%)
View file @
961687e4
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
961687e4
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.js
+
32
-
32
View file @
961687e4
...
@@ -35,10 +35,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -35,10 +35,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
var
el
=
document
.
createElement
(
'
bootstrap
'
)
var
el
=
document
.
createElement
(
'
bootstrap
'
)
var
transEndEventNames
=
{
var
transEndEventNames
=
{
'
WebkitTransition
'
:
'
webkitTransitionEnd
'
'
WebkitTransition
'
:
'
webkitTransitionEnd
'
,
,
'
MozTransition
'
:
'
transitionend
'
'
MozTransition
'
:
'
transitionend
'
,
,
'
OTransition
'
:
'
oTransitionEnd otransitionend
'
'
OTransition
'
:
'
oTransitionEnd otransitionend
'
,
,
'
transition
'
:
'
transitionend
'
'
transition
'
:
'
transitionend
'
}
}
for
(
var
name
in
transEndEventNames
)
{
for
(
var
name
in
transEndEventNames
)
{
...
@@ -319,9 +319,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -319,9 +319,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
}
}
Carousel
.
DEFAULTS
=
{
Carousel
.
DEFAULTS
=
{
interval
:
5000
interval
:
5000
,
,
pause
:
'
hover
'
pause
:
'
hover
'
,
,
wrap
:
true
wrap
:
true
}
}
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
Carousel
.
prototype
.
cycle
=
function
(
e
)
{
...
@@ -826,8 +826,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -826,8 +826,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$
(
document
)
$
(
document
)
.
on
(
'
click.bs.dropdown.data-api
'
,
clearMenus
)
.
on
(
'
click.bs.dropdown.data-api
'
,
clearMenus
)
.
on
(
'
click.bs.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.bs.dropdown.data-api
'
,
'
.dropdown form
'
,
function
(
e
)
{
e
.
stopPropagation
()
})
.
on
(
'
click.bs.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
click.bs.dropdown.data-api
'
,
toggle
,
Dropdown
.
prototype
.
toggle
)
.
on
(
'
keydown.bs.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
.
on
(
'
keydown.bs.dropdown.data-api
'
,
toggle
+
'
, [role=menu]
'
,
Dropdown
.
prototype
.
keydown
)
}(
jQuery
);
}(
jQuery
);
...
@@ -866,9 +866,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -866,9 +866,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
}
}
Modal
.
DEFAULTS
=
{
Modal
.
DEFAULTS
=
{
backdrop
:
true
backdrop
:
true
,
,
keyboard
:
true
keyboard
:
true
,
,
show
:
true
show
:
true
}
}
Modal
.
prototype
.
toggle
=
function
(
_relatedTarget
)
{
Modal
.
prototype
.
toggle
=
function
(
_relatedTarget
)
{
...
@@ -1115,15 +1115,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -1115,15 +1115,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
}
}
Tooltip
.
DEFAULTS
=
{
Tooltip
.
DEFAULTS
=
{
animation
:
true
animation
:
true
,
,
placement
:
'
top
'
placement
:
'
top
'
,
,
selector
:
false
selector
:
false
,
,
template
:
'
<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>
'
template
:
'
<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>
'
,
,
trigger
:
'
hover focus
'
trigger
:
'
hover focus
'
,
,
title
:
''
title
:
''
,
,
delay
:
0
delay
:
0
,
,
html
:
false
html
:
false
,
,
container
:
false
container
:
false
}
}
Tooltip
.
prototype
.
init
=
function
(
type
,
element
,
options
)
{
Tooltip
.
prototype
.
init
=
function
(
type
,
element
,
options
)
{
...
@@ -1162,8 +1162,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -1162,8 +1162,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if
(
options
.
delay
&&
typeof
options
.
delay
==
'
number
'
)
{
if
(
options
.
delay
&&
typeof
options
.
delay
==
'
number
'
)
{
options
.
delay
=
{
options
.
delay
=
{
show
:
options
.
delay
show
:
options
.
delay
,
,
hide
:
options
.
delay
hide
:
options
.
delay
}
}
}
}
...
@@ -1374,8 +1374,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -1374,8 +1374,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
Tooltip
.
prototype
.
getPosition
=
function
()
{
Tooltip
.
prototype
.
getPosition
=
function
()
{
var
el
=
this
.
$element
[
0
]
var
el
=
this
.
$element
[
0
]
return
$
.
extend
({},
(
typeof
el
.
getBoundingClientRect
==
'
function
'
)
?
el
.
getBoundingClientRect
()
:
{
return
$
.
extend
({},
(
typeof
el
.
getBoundingClientRect
==
'
function
'
)
?
el
.
getBoundingClientRect
()
:
{
width
:
el
.
offsetWidth
width
:
el
.
offsetWidth
,
,
height
:
el
.
offsetHeight
height
:
el
.
offsetHeight
},
this
.
$element
.
offset
())
},
this
.
$element
.
offset
())
}
}
...
@@ -1495,11 +1495,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -1495,11 +1495,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
if
(
!
$
.
fn
.
tooltip
)
throw
new
Error
(
'
Popover requires tooltip.js
'
)
if
(
!
$
.
fn
.
tooltip
)
throw
new
Error
(
'
Popover requires tooltip.js
'
)
Popover
.
DEFAULTS
=
$
.
extend
({}
,
$
.
fn
.
tooltip
.
Constructor
.
DEFAULTS
,
{
Popover
.
DEFAULTS
=
$
.
extend
({},
$
.
fn
.
tooltip
.
Constructor
.
DEFAULTS
,
{
placement
:
'
right
'
placement
:
'
right
'
,
,
trigger
:
'
click
'
trigger
:
'
click
'
,
,
content
:
''
content
:
''
,
,
template
:
'
<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>
'
template
:
'
<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>
'
})
})
...
@@ -1796,8 +1796,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
...
@@ -1796,8 +1796,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
this
.
activate
(
$this
.
parent
(
'
li
'
),
$ul
)
this
.
activate
(
$this
.
parent
(
'
li
'
),
$ul
)
this
.
activate
(
$target
,
$target
.
parent
(),
function
()
{
this
.
activate
(
$target
,
$target
.
parent
(),
function
()
{
$this
.
trigger
({
$this
.
trigger
({
type
:
'
shown.bs.tab
'
type
:
'
shown.bs.tab
'
,
,
relatedTarget
:
previous
relatedTarget
:
previous
})
})
})
})
}
}
...
...
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