Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
masonstrap
Commits
3111a85f
Commit
3111a85f
authored
Nov 24, 2015
by
Thomas Park
Browse files
update bootstrap to 3.3.6
parent
ffda96bc
Changes
100
Hide whitespace changes
Inline
Side-by-side
bower_components/bootstrap/js/button.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: button.js v3.3.
5
* Bootstrap: button.js v3.3.
6
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -19,7 +19,7 @@
this
.
isLoading
=
false
}
Button
.
VERSION
=
'
3.3.
5
'
Button
.
VERSION
=
'
3.3.
6
'
Button
.
DEFAULTS
=
{
loadingText
:
'
loading...
'
...
...
bower_components/bootstrap/js/carousel.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: carousel.js v3.3.
5
* Bootstrap: carousel.js v3.3.
6
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -30,7 +30,7 @@
.
on
(
'
mouseleave.bs.carousel
'
,
$
.
proxy
(
this
.
cycle
,
this
))
}
Carousel
.
VERSION
=
'
3.3.
5
'
Carousel
.
VERSION
=
'
3.3.
6
'
Carousel
.
TRANSITION_DURATION
=
600
...
...
bower_components/bootstrap/js/collapse.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: collapse.js v3.3.
5
* Bootstrap: collapse.js v3.3.
6
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -29,7 +29,7 @@
if
(
this
.
options
.
toggle
)
this
.
toggle
()
}
Collapse
.
VERSION
=
'
3.3.
5
'
Collapse
.
VERSION
=
'
3.3.
6
'
Collapse
.
TRANSITION_DURATION
=
350
...
...
bower_components/bootstrap/js/dropdown.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: dropdown.js v3.3.
5
* Bootstrap: dropdown.js v3.3.
6
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -19,7 +19,7 @@
$
(
element
).
on
(
'
click.bs.dropdown
'
,
this
.
toggle
)
}
Dropdown
.
VERSION
=
'
3.3.
5
'
Dropdown
.
VERSION
=
'
3.3.
6
'
function
getParent
(
$this
)
{
var
selector
=
$this
.
attr
(
'
data-target
'
)
...
...
@@ -51,7 +51,7 @@
if
(
e
.
isDefaultPrevented
())
return
$this
.
attr
(
'
aria-expanded
'
,
'
false
'
)
$parent
.
removeClass
(
'
open
'
).
trigger
(
'
hidden.bs.dropdown
'
,
relatedTarget
)
$parent
.
removeClass
(
'
open
'
).
trigger
(
$
.
Event
(
'
hidden.bs.dropdown
'
,
relatedTarget
)
)
})
}
...
...
@@ -85,7 +85,7 @@
$parent
.
toggleClass
(
'
open
'
)
.
trigger
(
'
shown.bs.dropdown
'
,
relatedTarget
)
.
trigger
(
$
.
Event
(
'
shown.bs.dropdown
'
,
relatedTarget
)
)
}
return
false
...
...
bower_components/bootstrap/js/modal.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: modal.js v3.3.
5
* Bootstrap: modal.js v3.3.
6
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -33,7 +33,7 @@
}
}
Modal
.
VERSION
=
'
3.3.
5
'
Modal
.
VERSION
=
'
3.3.
6
'
Modal
.
TRANSITION_DURATION
=
300
Modal
.
BACKDROP_TRANSITION_DURATION
=
150
...
...
bower_components/bootstrap/js/popover.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: popover.js v3.3.
5
* Bootstrap: popover.js v3.3.
6
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -19,7 +19,7 @@
if
(
!
$
.
fn
.
tooltip
)
throw
new
Error
(
'
Popover requires tooltip.js
'
)
Popover
.
VERSION
=
'
3.3.
5
'
Popover
.
VERSION
=
'
3.3.
6
'
Popover
.
DEFAULTS
=
$
.
extend
({},
$
.
fn
.
tooltip
.
Constructor
.
DEFAULTS
,
{
placement
:
'
right
'
,
...
...
bower_components/bootstrap/js/scrollspy.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: scrollspy.js v3.3.
5
* Bootstrap: scrollspy.js v3.3.
6
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -28,7 +28,7 @@
this
.
process
()
}
ScrollSpy
.
VERSION
=
'
3.3.
5
'
ScrollSpy
.
VERSION
=
'
3.3.
6
'
ScrollSpy
.
DEFAULTS
=
{
offset
:
10
...
...
bower_components/bootstrap/js/tab.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: tab.js v3.3.
5
* Bootstrap: tab.js v3.3.
6
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
@@ -19,7 +19,7 @@
// jscs:enable requireDollarBeforejQueryAssignment
}
Tab
.
VERSION
=
'
3.3.
5
'
Tab
.
VERSION
=
'
3.3.
6
'
Tab
.
TRANSITION_DURATION
=
150
...
...
bower_components/bootstrap/js/tooltip.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: tooltip.js v3.3.
5
* Bootstrap: tooltip.js v3.3.
6
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
...
...
@@ -26,7 +26,7 @@
this
.
init
(
'
tooltip
'
,
element
,
options
)
}
Tooltip
.
VERSION
=
'
3.3.
5
'
Tooltip
.
VERSION
=
'
3.3.
6
'
Tooltip
.
TRANSITION_DURATION
=
150
...
...
bower_components/bootstrap/js/transition.js
View file @
3111a85f
/* ========================================================================
* Bootstrap: transition.js v3.3.
5
* Bootstrap: transition.js v3.3.
6
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
...
...
bower_components/bootstrap/less/bootstrap.less
View file @
3111a85f
/*!
* Bootstrap v3.3.
5
(http://getbootstrap.com)
* Bootstrap v3.3.
6
(http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
...
...
bower_components/bootstrap/less/button-groups.less
View file @
3111a85f
...
...
@@ -173,12 +173,12 @@
border-radius: 0;
}
&:first-child:not(:last-child) {
border-top-
right-
radius
:
@btn-border-radius-base;
.
border-top-radius
(
@btn-border-radius-base
)
;
.border-bottom-radius(0);
}
&:last-child:not(:first-child) {
border-bottom-left-radius: @btn-border-radius-base;
.border-top-radius(0);
.border-bottom-radius(@btn-border-radius-base);
}
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
...
...
bower_components/bootstrap/less/carousel.less
View file @
3111a85f
...
...
@@ -101,6 +101,7 @@
color: @carousel-control-color;
text-align: center;
text-shadow: @carousel-text-shadow;
background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
// We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation.
...
...
@@ -240,18 +241,18 @@
.glyphicon-chevron-right,
.icon-prev,
.icon-next {
width:
30px
;
height:
30px
;
margin-top:
-15px
;
font-size:
30px
;
width:
(@carousel-control-font-size * 1.5)
;
height:
(@carousel-control-font-size * 1.5)
;
margin-top:
(@carousel-control-font-size / -2)
;
font-size:
(@carousel-control-font-size * 1.5)
;
}
.glyphicon-chevron-left,
.icon-prev {
margin-left:
-15px
;
margin-left:
(@carousel-control-font-size / -2)
;
}
.glyphicon-chevron-right,
.icon-next {
margin-right:
-15px
;
margin-right:
(@carousel-control-font-size / -2)
;
}
}
...
...
bower_components/bootstrap/less/forms.less
View file @
3111a85f
...
...
@@ -132,6 +132,12 @@ output {
// Placeholder
.placeholder();
// Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand {
border: 0;
background-color: transparent;
}
// Disabled and read-only inputs
//
// HTML5 says that controls under a fieldset > legend:first-child won't be
...
...
@@ -433,10 +439,10 @@ input[type="checkbox"] {
.has-feedback label {
& ~ .form-control-feedback {
top: (@line-height-computed + 5); // Height of the `label` and its margin
top: (@line-height-computed + 5); // Height of the `label` and its margin
}
&.sr-only ~ .form-control-feedback {
top: 0;
top: 0;
}
}
...
...
@@ -591,7 +597,7 @@ input[type="checkbox"] {
.form-group-lg {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top:
(
(@padding-large-vertical
* @line-height-large)
+ 1);
padding-top: (@padding-large-vertical + 1);
font-size: @font-size-large;
}
}
...
...
bower_components/bootstrap/less/glyphicons.less
View file @
3111a85f
...
...
@@ -32,8 +32,8 @@
}
// Individual icons
.glyphicon-asterisk { &:before { content: "\2a"; } }
.glyphicon-plus { &:before { content: "\2b"; } }
.glyphicon-asterisk { &:before { content: "\
00
2a"; } }
.glyphicon-plus { &:before { content: "\
00
2b"; } }
.glyphicon-euro,
.glyphicon-eur { &:before { content: "\20ac"; } }
.glyphicon-minus { &:before { content: "\2212"; } }
...
...
bower_components/bootstrap/less/input-groups.less
View file @
3111a85f
...
...
@@ -29,6 +29,10 @@
width: 100%;
margin-bottom: 0;
&:focus {
z-index: 3;
}
}
}
...
...
@@ -79,18 +83,18 @@
text-align: center;
background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;
border-radius: @border-radius
-base
;
border-radius: @
input-
border-radius;
// Sizing
&.input-sm {
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
border-radius: @border-radius-small;
border-radius: @
input-
border-radius-small;
}
&.input-lg {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
border-radius: @border-radius-large;
border-radius: @
input-
border-radius-large;
}
// Nuke default margins from checkboxes and radios to vertically center within.
...
...
bower_components/bootstrap/less/jumbotron.less
View file @
3111a85f
...
...
@@ -28,6 +28,8 @@
.container &,
.container-fluid & {
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
padding-left: (@grid-gutter-width / 2);
padding-right: (@grid-gutter-width / 2);
}
.container {
...
...
bower_components/bootstrap/less/mixins/buttons.less
View file @
3111a85f
...
...
@@ -42,12 +42,9 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&.focus,
&:active,
&.active {
&.focus {
background-color: @background;
border-color: @border;
}
...
...
bower_components/bootstrap/less/mixins/grid.less
View file @
3111a85f
...
...
@@ -6,8 +6,8 @@
.container-fixed(@gutter: @grid-gutter-width) {
margin-right: auto;
margin-left: auto;
padding-left: (@gutter / 2);
padding-right: (@gutter / 2);
padding-left:
floor(
(@gutter / 2)
)
;
padding-right:
ceil(
(@gutter / 2)
)
;
&:extend(.clearfix all);
}
...
...
bower_components/bootstrap/less/mixins/hide-text.less
View file @
3111a85f
...
...
@@ -6,7 +6,7 @@
//
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
// Deprecated as of v3.0.1 (
will
be removed in v4)
// Deprecated as of v3.0.1 (
has
be
en
removed in v4)
.hide-text() {
font: ~"0/0" a;
color: transparent;
...
...
Prev
1
2
3
4
5
Next
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