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
4d652035
Commit
4d652035
authored
Mar 16, 2015
by
Chris Rebert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v3.3.2 => v3.3.4
parent
66ceae7b
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
32 additions
and
32 deletions
+32
-32
README.md
README.md
+1
-1
_config.yml
_config.yml
+3
-3
bower.json
bower.json
+1
-1
docs/assets/js/src/customizer.js
docs/assets/js/src/customizer.js
+1
-1
js/affix.js
js/affix.js
+2
-2
js/alert.js
js/alert.js
+2
-2
js/button.js
js/button.js
+2
-2
js/carousel.js
js/carousel.js
+2
-2
js/collapse.js
js/collapse.js
+2
-2
js/dropdown.js
js/dropdown.js
+2
-2
js/modal.js
js/modal.js
+2
-2
js/popover.js
js/popover.js
+2
-2
js/scrollspy.js
js/scrollspy.js
+2
-2
js/tab.js
js/tab.js
+2
-2
js/tooltip.js
js/tooltip.js
+2
-2
js/transition.js
js/transition.js
+1
-1
package.js
package.js
+1
-1
package.json
package.json
+1
-1
test-infra/npm-shrinkwrap.json
test-infra/npm-shrinkwrap.json
+1
-1
No files found.
README.md
View file @
4d652035
...
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
...
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
Five quick start options are available:
Five quick start options are available:
-
[
Download the latest release
](
https://github.com/twbs/bootstrap/archive/v3.3.
2
.zip
)
.
-
[
Download the latest release
](
https://github.com/twbs/bootstrap/archive/v3.3.
4
.zip
)
.
-
Clone the repo:
`git clone https://github.com/twbs/bootstrap.git`
.
-
Clone the repo:
`git clone https://github.com/twbs/bootstrap.git`
.
-
Install with
[
Bower
](
http://bower.io
)
:
`bower install bootstrap`
.
-
Install with
[
Bower
](
http://bower.io
)
:
`bower install bootstrap`
.
-
Install with
[
npm
](
https://www.npmjs.com
)
:
`npm install bootstrap`
.
-
Install with
[
npm
](
https://www.npmjs.com
)
:
`npm install bootstrap`
.
...
...
_config.yml
View file @
4d652035
...
@@ -14,13 +14,13 @@ url: http://getbootstrap.com
...
@@ -14,13 +14,13 @@ url: http://getbootstrap.com
encoding
:
UTF-8
encoding
:
UTF-8
# Custom vars
# Custom vars
current_version
:
3.3.
2
current_version
:
3.3.
4
repo
:
https://github.com/twbs/bootstrap
repo
:
https://github.com/twbs/bootstrap
sass_repo
:
https://github.com/twbs/bootstrap-sass
sass_repo
:
https://github.com/twbs/bootstrap-sass
download
:
download
:
source
:
https://github.com/twbs/bootstrap/archive/v3.3.
2
.zip
source
:
https://github.com/twbs/bootstrap/archive/v3.3.
4
.zip
dist
:
https://github.com/twbs/bootstrap/releases/download/v3.3.
2/bootstrap-3.3.2
-dist.zip
dist
:
https://github.com/twbs/bootstrap/releases/download/v3.3.
4/bootstrap-3.3.4
-dist.zip
sass
:
https://github.com/twbs/bootstrap-sass/archive/v3.3.3.tar.gz
sass
:
https://github.com/twbs/bootstrap-sass/archive/v3.3.3.tar.gz
blog
:
http://blog.getbootstrap.com
blog
:
http://blog.getbootstrap.com
...
...
bower.json
View file @
4d652035
{
{
"name"
:
"bootstrap"
,
"name"
:
"bootstrap"
,
"description"
:
"The most popular front-end framework for developing responsive, mobile first projects on the web."
,
"description"
:
"The most popular front-end framework for developing responsive, mobile first projects on the web."
,
"version"
:
"3.3.
2
"
,
"version"
:
"3.3.
4
"
,
"keywords"
:
[
"keywords"
:
[
"css"
,
"css"
,
"js"
,
"js"
,
...
...
docs/assets/js/src/customizer.js
View file @
4d652035
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
window
.
onload
=
function
()
{
// wait for load in a dumb way because B-0
window
.
onload
=
function
()
{
// wait for load in a dumb way because B-0
'
use strict
'
;
'
use strict
'
;
var
cw
=
'
/*!
\n
'
+
var
cw
=
'
/*!
\n
'
+
'
* Bootstrap v3.3.
2
(http://getbootstrap.com)
\n
'
+
'
* Bootstrap v3.3.
4
(http://getbootstrap.com)
\n
'
+
'
* Copyright 2011-
'
+
new
Date
().
getFullYear
()
+
'
Twitter, Inc.
\n
'
+
'
* Copyright 2011-
'
+
new
Date
().
getFullYear
()
+
'
Twitter, Inc.
\n
'
+
'
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
\n
'
+
'
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
\n
'
+
'
*/
\n\n
'
'
*/
\n\n
'
...
...
js/affix.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: affix.js v3.3.
2
* Bootstrap: affix.js v3.3.
4
* http://getbootstrap.com/javascript/#affix
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
this
.
checkPosition
()
this
.
checkPosition
()
}
}
Affix
.
VERSION
=
'
3.3.
2
'
Affix
.
VERSION
=
'
3.3.
4
'
Affix
.
RESET
=
'
affix affix-top affix-bottom
'
Affix
.
RESET
=
'
affix affix-top affix-bottom
'
...
...
js/alert.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: alert.js v3.3.
2
* Bootstrap: alert.js v3.3.
4
* http://getbootstrap.com/javascript/#alerts
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
$
(
el
).
on
(
'
click
'
,
dismiss
,
this
.
close
)
$
(
el
).
on
(
'
click
'
,
dismiss
,
this
.
close
)
}
}
Alert
.
VERSION
=
'
3.3.
2
'
Alert
.
VERSION
=
'
3.3.
4
'
Alert
.
TRANSITION_DURATION
=
150
Alert
.
TRANSITION_DURATION
=
150
...
...
js/button.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: button.js v3.3.
2
* Bootstrap: button.js v3.3.
4
* http://getbootstrap.com/javascript/#buttons
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
this
.
isLoading
=
false
this
.
isLoading
=
false
}
}
Button
.
VERSION
=
'
3.3.
2
'
Button
.
VERSION
=
'
3.3.
4
'
Button
.
DEFAULTS
=
{
Button
.
DEFAULTS
=
{
loadingText
:
'
loading...
'
loadingText
:
'
loading...
'
...
...
js/carousel.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: carousel.js v3.3.
2
* Bootstrap: carousel.js v3.3.
4
* http://getbootstrap.com/javascript/#carousel
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
.
on
(
'
mouseleave.bs.carousel
'
,
$
.
proxy
(
this
.
cycle
,
this
))
.
on
(
'
mouseleave.bs.carousel
'
,
$
.
proxy
(
this
.
cycle
,
this
))
}
}
Carousel
.
VERSION
=
'
3.3.
2
'
Carousel
.
VERSION
=
'
3.3.
4
'
Carousel
.
TRANSITION_DURATION
=
600
Carousel
.
TRANSITION_DURATION
=
600
...
...
js/collapse.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: collapse.js v3.3.
2
* Bootstrap: collapse.js v3.3.
4
* http://getbootstrap.com/javascript/#collapse
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
if
(
this
.
options
.
toggle
)
this
.
toggle
()
if
(
this
.
options
.
toggle
)
this
.
toggle
()
}
}
Collapse
.
VERSION
=
'
3.3.
2
'
Collapse
.
VERSION
=
'
3.3.
4
'
Collapse
.
TRANSITION_DURATION
=
350
Collapse
.
TRANSITION_DURATION
=
350
...
...
js/dropdown.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: dropdown.js v3.3.
2
* Bootstrap: dropdown.js v3.3.
4
* http://getbootstrap.com/javascript/#dropdowns
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
$
(
element
).
on
(
'
click.bs.dropdown
'
,
this
.
toggle
)
$
(
element
).
on
(
'
click.bs.dropdown
'
,
this
.
toggle
)
}
}
Dropdown
.
VERSION
=
'
3.3.
2
'
Dropdown
.
VERSION
=
'
3.3.
4
'
Dropdown
.
prototype
.
toggle
=
function
(
e
)
{
Dropdown
.
prototype
.
toggle
=
function
(
e
)
{
var
$this
=
$
(
this
)
var
$this
=
$
(
this
)
...
...
js/modal.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: modal.js v3.3.
2
* Bootstrap: modal.js v3.3.
4
* http://getbootstrap.com/javascript/#modals
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
}
}
}
}
Modal
.
VERSION
=
'
3.3.
2
'
Modal
.
VERSION
=
'
3.3.
4
'
Modal
.
TRANSITION_DURATION
=
300
Modal
.
TRANSITION_DURATION
=
300
Modal
.
BACKDROP_TRANSITION_DURATION
=
150
Modal
.
BACKDROP_TRANSITION_DURATION
=
150
...
...
js/popover.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: popover.js v3.3.
2
* Bootstrap: popover.js v3.3.
4
* http://getbootstrap.com/javascript/#popovers
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
if
(
!
$
.
fn
.
tooltip
)
throw
new
Error
(
'
Popover requires tooltip.js
'
)
if
(
!
$
.
fn
.
tooltip
)
throw
new
Error
(
'
Popover requires tooltip.js
'
)
Popover
.
VERSION
=
'
3.3.
2
'
Popover
.
VERSION
=
'
3.3.
4
'
Popover
.
DEFAULTS
=
$
.
extend
({},
$
.
fn
.
tooltip
.
Constructor
.
DEFAULTS
,
{
Popover
.
DEFAULTS
=
$
.
extend
({},
$
.
fn
.
tooltip
.
Constructor
.
DEFAULTS
,
{
placement
:
'
right
'
,
placement
:
'
right
'
,
...
...
js/scrollspy.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.
2
* Bootstrap: scrollspy.js v3.3.
4
* http://getbootstrap.com/javascript/#scrollspy
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
this
.
process
()
this
.
process
()
}
}
ScrollSpy
.
VERSION
=
'
3.3.
2
'
ScrollSpy
.
VERSION
=
'
3.3.
4
'
ScrollSpy
.
DEFAULTS
=
{
ScrollSpy
.
DEFAULTS
=
{
offset
:
10
offset
:
10
...
...
js/tab.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: tab.js v3.3.
2
* Bootstrap: tab.js v3.3.
4
* http://getbootstrap.com/javascript/#tabs
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
this
.
element
=
$
(
element
)
this
.
element
=
$
(
element
)
}
}
Tab
.
VERSION
=
'
3.3.
2
'
Tab
.
VERSION
=
'
3.3.
4
'
Tab
.
TRANSITION_DURATION
=
150
Tab
.
TRANSITION_DURATION
=
150
...
...
js/tooltip.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: tooltip.js v3.3.
2
* Bootstrap: tooltip.js v3.3.
4
* http://getbootstrap.com/javascript/#tooltip
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
* ========================================================================
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
this
.
init
(
'
tooltip
'
,
element
,
options
)
this
.
init
(
'
tooltip
'
,
element
,
options
)
}
}
Tooltip
.
VERSION
=
'
3.3.
2
'
Tooltip
.
VERSION
=
'
3.3.
4
'
Tooltip
.
TRANSITION_DURATION
=
150
Tooltip
.
TRANSITION_DURATION
=
150
...
...
js/transition.js
View file @
4d652035
/* ========================================================================
/* ========================================================================
* Bootstrap: transition.js v3.3.
2
* Bootstrap: transition.js v3.3.
4
* http://getbootstrap.com/javascript/#transitions
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
* Copyright 2011-2015 Twitter, Inc.
...
...
package.js
View file @
4d652035
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Package
.
describe
({
Package
.
describe
({
name
:
'
twbs:bootstrap
'
,
// http://atmospherejs.com/twbs/bootstrap
name
:
'
twbs:bootstrap
'
,
// http://atmospherejs.com/twbs/bootstrap
summary
:
'
The most popular front-end framework for developing responsive, mobile first projects on the web.
'
,
summary
:
'
The most popular front-end framework for developing responsive, mobile first projects on the web.
'
,
version
:
'
3.3.
2
'
,
version
:
'
3.3.
4
'
,
git
:
'
https://github.com/twbs/bootstrap.git
'
git
:
'
https://github.com/twbs/bootstrap.git
'
});
});
...
...
package.json
View file @
4d652035
{
{
"name"
:
"bootstrap"
,
"name"
:
"bootstrap"
,
"description"
:
"The most popular front-end framework for developing responsive, mobile first projects on the web."
,
"description"
:
"The most popular front-end framework for developing responsive, mobile first projects on the web."
,
"version"
:
"3.3.
2
"
,
"version"
:
"3.3.
4
"
,
"keywords"
:
[
"keywords"
:
[
"css"
,
"css"
,
"less"
,
"less"
,
...
...
test-infra/npm-shrinkwrap.json
View file @
4d652035
{
{
"name"
:
"bootstrap"
,
"name"
:
"bootstrap"
,
"version"
:
"3.3.
2
"
,
"version"
:
"3.3.
4
"
,
"npm-shrinkwrap-version"
:
"200.1.0"
,
"npm-shrinkwrap-version"
:
"200.1.0"
,
"node-version"
:
"v0.12.0"
,
"node-version"
:
"v0.12.0"
,
"dependencies"
:
{
"dependencies"
:
{
...
...
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