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
4e5b5fd0
Commit
4e5b5fd0
authored
Nov 12, 2014
by
Thomas Park
Browse files
update bootstrap to 3.3.1
parent
fa6487a9
Changes
38
Expand all
Hide whitespace changes
Inline
Side-by-side
bower_components/bootstrap/.bower.json
View file @
4e5b5fd0
{
{
"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.
0
"
,
"version"
:
"3.3.
1
"
,
"keywords"
:
[
"keywords"
:
[
"css"
,
"css"
,
"js"
,
"js"
,
...
@@ -35,14 +35,13 @@
...
@@ -35,14 +35,13 @@
"dependencies"
:
{
"dependencies"
:
{
"jquery"
:
">= 1.9.1"
"jquery"
:
">= 1.9.1"
},
},
"_release"
:
"3.3.
0
"
,
"_release"
:
"3.3.
1
"
,
"_resolution"
:
{
"_resolution"
:
{
"type"
:
"version"
,
"type"
:
"version"
,
"tag"
:
"v3.3.
0
"
,
"tag"
:
"v3.3.
1
"
,
"commit"
:
"
16dbdbd7a2c6cfa3be4e5dcc52249e577c02c84
a"
"commit"
:
"
9a7e365c2c4360335d25246dac11afb1f577210
a"
},
},
"_source"
:
"git://github.com/twbs/bootstrap.git"
,
"_source"
:
"git://github.com/twbs/bootstrap.git"
,
"_target"
:
"~3.3.0"
,
"_target"
:
"~3.3.0"
,
"_originalSource"
:
"bootstrap"
,
"_originalSource"
:
"bootstrap"
"_direct"
:
true
}
}
\ No newline at end of file
bower_components/bootstrap/Gruntfile.js
View file @
4e5b5fd0
...
@@ -27,6 +27,13 @@ module.exports = function (grunt) {
...
@@ -27,6 +27,13 @@ module.exports = function (grunt) {
};
};
var
generateRawFiles
=
require
(
'
./grunt/bs-raw-files-generator.js
'
);
var
generateRawFiles
=
require
(
'
./grunt/bs-raw-files-generator.js
'
);
var
generateCommonJSModule
=
require
(
'
./grunt/bs-commonjs-generator.js
'
);
var
generateCommonJSModule
=
require
(
'
./grunt/bs-commonjs-generator.js
'
);
var
configBridge
=
grunt
.
file
.
readJSON
(
'
./grunt/configBridge.json
'
,
{
encoding
:
'
utf8
'
});
Object
.
keys
(
configBridge
.
paths
).
forEach
(
function
(
key
)
{
configBridge
.
paths
[
key
].
forEach
(
function
(
val
,
i
,
arr
)
{
arr
[
i
]
=
path
.
join
(
'
./docs/assets
'
,
val
);
});
});
// Project configuration.
// Project configuration.
grunt
.
initConfig
({
grunt
.
initConfig
({
...
@@ -38,21 +45,8 @@ module.exports = function (grunt) {
...
@@ -38,21 +45,8 @@ module.exports = function (grunt) {
'
* Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>
\n
'
+
'
* Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>
\n
'
+
'
* Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)
\n
'
+
'
* Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)
\n
'
+
'
*/
\n
'
,
'
*/
\n
'
,
// NOTE: This jqueryCheck/jqueryVersionCheck code is duplicated in customizer.js;
jqueryCheck
:
configBridge
.
config
.
jqueryCheck
.
join
(
'
\n
'
),
// if making changes here, be sure to update the other copy too.
jqueryVersionCheck
:
configBridge
.
config
.
jqueryVersionCheck
.
join
(
'
\n
'
),
jqueryCheck
:
[
'
if (typeof jQuery ===
\'
undefined
\'
) {
'
,
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery
\'
)
'
,
'
}
\n
'
].
join
(
'
\n
'
),
jqueryVersionCheck
:
[
'
+function ($) {
'
,
'
var version = $.fn.jquery.split(
\'
\'
)[0].split(
\'
.
\'
)
'
,
'
if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
'
,
'
throw new Error(
\'
Bootstrap
\\\'
s JavaScript requires jQuery version 1.9.1 or higher
\'
)
'
,
'
}
'
,
'
}(jQuery);
\n\n
'
].
join
(
'
\n
'
),
// Task configuration.
// Task configuration.
clean
:
{
clean
:
{
...
@@ -138,25 +132,11 @@ module.exports = function (grunt) {
...
@@ -138,25 +132,11 @@ module.exports = function (grunt) {
dest
:
'
dist/js/<%= pkg.name %>.min.js
'
dest
:
'
dist/js/<%= pkg.name %>.min.js
'
},
},
customize
:
{
customize
:
{
// NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
src
:
configBridge
.
paths
.
customizerJs
,
src
:
[
'
docs/assets/js/vendor/less.min.js
'
,
'
docs/assets/js/vendor/jszip.min.js
'
,
'
docs/assets/js/vendor/uglify.min.js
'
,
'
docs/assets/js/vendor/Blob.js
'
,
'
docs/assets/js/vendor/FileSaver.js
'
,
'
docs/assets/js/raw-files.min.js
'
,
'
docs/assets/js/src/customizer.js
'
],
dest
:
'
docs/assets/js/customize.min.js
'
dest
:
'
docs/assets/js/customize.min.js
'
},
},
docsJs
:
{
docsJs
:
{
// NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
src
:
configBridge
.
paths
.
docsJs
,
src
:
[
'
docs/assets/js/vendor/holder.js
'
,
'
docs/assets/js/vendor/ZeroClipboard.min.js
'
,
'
docs/assets/js/src/application.js
'
],
dest
:
'
docs/assets/js/docs.min.js
'
dest
:
'
docs/assets/js/docs.min.js
'
}
}
},
},
...
@@ -195,16 +175,7 @@ module.exports = function (grunt) {
...
@@ -195,16 +175,7 @@ module.exports = function (grunt) {
autoprefixer
:
{
autoprefixer
:
{
options
:
{
options
:
{
browsers
:
[
browsers
:
configBridge
.
config
.
autoprefixerBrowsers
'
Android 2.3
'
,
'
Android >= 4
'
,
'
Chrome >= 20
'
,
'
Firefox >= 24
'
,
// Firefox 24 is the latest ESR
'
Explorer >= 8
'
,
'
iOS >= 6
'
,
'
Opera >= 12
'
,
'
Safari >= 6
'
]
},
},
core
:
{
core
:
{
options
:
{
options
:
{
...
@@ -350,7 +321,6 @@ module.exports = function (grunt) {
...
@@ -350,7 +321,6 @@ module.exports = function (grunt) {
failHard
:
true
,
failHard
:
true
,
reset
:
true
,
reset
:
true
,
relaxerror
:
[
relaxerror
:
[
'
Bad value X-UA-Compatible for attribute http-equiv on element meta.
'
,
'
Element img is missing required attribute src.
'
,
'
Element img is missing required attribute src.
'
,
'
Attribute autocomplete not allowed on element input at this point.
'
,
'
Attribute autocomplete not allowed on element input at this point.
'
,
'
Attribute autocomplete not allowed on element button at this point.
'
'
Attribute autocomplete not allowed on element button at this point.
'
...
...
bower_components/bootstrap/README.md
View file @
4e5b5fd0
...
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
...
@@ -24,7 +24,7 @@ To get started, check out <http://getbootstrap.com>!
Four quick start options are available:
Four quick start options are available:
-
[
Download the latest release
](
https://github.com/twbs/bootstrap/archive/v3.3.
0
.zip
)
.
-
[
Download the latest release
](
https://github.com/twbs/bootstrap/archive/v3.3.
1
.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.org
)
:
`npm install bootstrap`
.
-
Install with
[
npm
](
https://www.npmjs.org
)
:
`npm install bootstrap`
.
...
@@ -67,7 +67,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
...
@@ -67,7 +67,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built
### Running documentation locally
### Running documentation locally
1.
If necessary,
[
install Jekyll
](
http://jekyllrb.com/docs/installation
)
(
requires
v2.
3
.x).
1.
If necessary,
[
install Jekyll
](
http://jekyllrb.com/docs/installation
)
(
requires
v2.
5
.x).
-
**Windows users:**
Read
[
this unofficial guide
](
http://jekyll-windows.juthilo.com/
)
to get Jekyll up and running without problems.
-
**Windows users:**
Read
[
this unofficial guide
](
http://jekyll-windows.juthilo.com/
)
to get Jekyll up and running without problems.
2.
Install the Ruby-based syntax highlighter,
[
Rouge
](
https://github.com/jneen/rouge
)
, with
`gem install rouge`
.
2.
Install the Ruby-based syntax highlighter,
[
Rouge
](
https://github.com/jneen/rouge
)
, with
`gem install rouge`
.
3.
From the root
`/bootstrap`
directory, run
`jekyll serve`
in the command line.
3.
From the root
`/bootstrap`
directory, run
`jekyll serve`
in the command line.
...
...
bower_components/bootstrap/bower.json
View file @
4e5b5fd0
{
{
"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.
0
"
,
"version"
:
"3.3.
1
"
,
"keywords"
:
[
"keywords"
:
[
"css"
,
"css"
,
"js"
,
"js"
,
...
...
bower_components/bootstrap/dist/css/bootstrap-theme.css
View file @
4e5b5fd0
/*!
/*!
* Bootstrap v3.3.
0
(http://getbootstrap.com)
* Bootstrap v3.3.
1
(http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
*/
...
@@ -69,28 +69,28 @@
...
@@ -69,28 +69,28 @@
background-image
:
none
;
background-image
:
none
;
}
}
.btn-primary
{
.btn-primary
{
background-image
:
-webkit-linear-gradient
(
top
,
#
428bca
0%
,
#2
d6ca2
100%
);
background-image
:
-webkit-linear-gradient
(
top
,
#
337ab7
0%
,
#2
65a88
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
428bca
0%
,
#2
d6ca2
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
337ab7
0%
,
#2
65a88
100%
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
428bca
),
to
(
#2
d6ca2
));
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
337ab7
),
to
(
#2
65a88
));
background-image
:
linear-gradient
(
to
bottom
,
#
428bca
0%
,
#2
d6ca2
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#
337ab7
0%
,
#2
65a88
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
428bca
'
,
endColorstr
=
'#ff2
d6ca2
'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
337ab7
'
,
endColorstr
=
'#ff2
65a88
'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
enabled
=
false
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
enabled
=
false
);
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
border-color
:
#2
b669a
;
border-color
:
#2
45580
;
}
}
.btn-primary
:hover
,
.btn-primary
:hover
,
.btn-primary
:focus
{
.btn-primary
:focus
{
background-color
:
#2
d6ca2
;
background-color
:
#2
65a88
;
background-position
:
0
-15px
;
background-position
:
0
-15px
;
}
}
.btn-primary
:active
,
.btn-primary
:active
,
.btn-primary.active
{
.btn-primary.active
{
background-color
:
#2
d6ca2
;
background-color
:
#2
65a88
;
border-color
:
#2
b669a
;
border-color
:
#2
45580
;
}
}
.btn-primary
:disabled
,
.btn-primary
:disabled
,
.btn-primary
[
disabled
]
{
.btn-primary
[
disabled
]
{
background-color
:
#2
d6ca2
;
background-color
:
#2
65a88
;
background-image
:
none
;
background-image
:
none
;
}
}
.btn-success
{
.btn-success
{
...
@@ -211,12 +211,12 @@
...
@@ -211,12 +211,12 @@
.dropdown-menu
>
.active
>
a
,
.dropdown-menu
>
.active
>
a
,
.dropdown-menu
>
.active
>
a
:hover
,
.dropdown-menu
>
.active
>
a
:hover
,
.dropdown-menu
>
.active
>
a
:focus
{
.dropdown-menu
>
.active
>
a
:focus
{
background-color
:
#
357ebd
;
background-color
:
#
2e6da4
;
background-image
:
-webkit-linear-gradient
(
top
,
#
428bca
0%
,
#357ebd
100%
);
background-image
:
-webkit-linear-gradient
(
top
,
#
337ab7
0%
,
#2e6da4
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
428bca
0%
,
#357ebd
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
337ab7
0%
,
#2e6da4
100%
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
428bca
),
to
(
#
357ebd
));
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
337ab7
),
to
(
#
2e6da4
));
background-image
:
linear-gradient
(
to
bottom
,
#
428bca
0%
,
#357ebd
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#
337ab7
0%
,
#2e6da4
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
428bca
'
,
endColorstr
=
'#ff
357ebd
'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
337ab7
'
,
endColorstr
=
'#ff
2e6da4
'
,
GradientType
=
0
);
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
}
}
.navbar-default
{
.navbar-default
{
...
@@ -275,6 +275,19 @@
...
@@ -275,6 +275,19 @@
.navbar-fixed-bottom
{
.navbar-fixed-bottom
{
border-radius
:
0
;
border-radius
:
0
;
}
}
@media
(
max-width
:
767px
)
{
.navbar
.navbar-nav
.open
.dropdown-menu
>
.active
>
a
,
.navbar
.navbar-nav
.open
.dropdown-menu
>
.active
>
a
:hover
,
.navbar
.navbar-nav
.open
.dropdown-menu
>
.active
>
a
:focus
{
color
:
#fff
;
background-image
:
-webkit-linear-gradient
(
top
,
#337ab7
0%
,
#2e6da4
100%
);
background-image
:
-o-linear-gradient
(
top
,
#337ab7
0%
,
#2e6da4
100%
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#337ab7
),
to
(
#2e6da4
));
background-image
:
linear-gradient
(
to
bottom
,
#337ab7
0%
,
#2e6da4
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff337ab7'
,
endColorstr
=
'#ff2e6da4'
,
GradientType
=
0
);
background-repeat
:
repeat-x
;
}
}
.alert
{
.alert
{
text-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
.2
);
text-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
.2
);
-webkit-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.25
),
0
1px
2px
rgba
(
0
,
0
,
0
,
.05
);
-webkit-box-shadow
:
inset
0
1px
0
rgba
(
255
,
255
,
255
,
.25
),
0
1px
2px
rgba
(
0
,
0
,
0
,
.05
);
...
@@ -325,11 +338,11 @@
...
@@ -325,11 +338,11 @@
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
}
}
.progress-bar
{
.progress-bar
{
background-image
:
-webkit-linear-gradient
(
top
,
#
428bca
0%
,
#3071a9
100%
);
background-image
:
-webkit-linear-gradient
(
top
,
#
337ab7
0%
,
#286090
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
428bca
0%
,
#3071a9
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
337ab7
0%
,
#286090
100%
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
428bca
),
to
(
#
3071a9
));
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
337ab7
),
to
(
#
286090
));
background-image
:
linear-gradient
(
to
bottom
,
#
428bca
0%
,
#3071a9
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#
337ab7
0%
,
#286090
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
428bca
'
,
endColorstr
=
'#ff
3071a9
'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
337ab7
'
,
endColorstr
=
'#ff
286090
'
,
GradientType
=
0
);
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
}
}
.progress-bar-success
{
.progress-bar-success
{
...
@@ -377,14 +390,14 @@
...
@@ -377,14 +390,14 @@
.list-group-item.active
,
.list-group-item.active
,
.list-group-item.active
:hover
,
.list-group-item.active
:hover
,
.list-group-item.active
:focus
{
.list-group-item.active
:focus
{
text-shadow
:
0
-1px
0
#
3071a9
;
text-shadow
:
0
-1px
0
#
286090
;
background-image
:
-webkit-linear-gradient
(
top
,
#
428bca
0%
,
#3278b3
100%
);
background-image
:
-webkit-linear-gradient
(
top
,
#
337ab7
0%
,
#2b669a
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
428bca
0%
,
#3278b3
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
337ab7
0%
,
#2b669a
100%
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
428bca
),
to
(
#
3278b3
));
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
337ab7
),
to
(
#
2b669a
));
background-image
:
linear-gradient
(
to
bottom
,
#
428bca
0%
,
#3278b3
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#
337ab7
0%
,
#2b669a
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
428bca
'
,
endColorstr
=
'#ff
3278b3
'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
337ab7
'
,
endColorstr
=
'#ff
2b669a
'
,
GradientType
=
0
);
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
border-color
:
#
3278b3
;
border-color
:
#
2b669a
;
}
}
.list-group-item.active
.badge
,
.list-group-item.active
.badge
,
.list-group-item.active
:hover
.badge
,
.list-group-item.active
:hover
.badge
,
...
@@ -404,11 +417,11 @@
...
@@ -404,11 +417,11 @@
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
}
}
.panel-primary
>
.panel-heading
{
.panel-primary
>
.panel-heading
{
background-image
:
-webkit-linear-gradient
(
top
,
#
428bca
0%
,
#357ebd
100%
);
background-image
:
-webkit-linear-gradient
(
top
,
#
337ab7
0%
,
#2e6da4
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
428bca
0%
,
#357ebd
100%
);
background-image
:
-o-linear-gradient
(
top
,
#
337ab7
0%
,
#2e6da4
100%
);
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
428bca
),
to
(
#
357ebd
));
background-image
:
-webkit-gradient
(
linear
,
left
top
,
left
bottom
,
from
(
#
337ab7
),
to
(
#
2e6da4
));
background-image
:
linear-gradient
(
to
bottom
,
#
428bca
0%
,
#357ebd
100%
);
background-image
:
linear-gradient
(
to
bottom
,
#
337ab7
0%
,
#2e6da4
100%
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
428bca
'
,
endColorstr
=
'#ff
357ebd
'
,
GradientType
=
0
);
filter
:
progid
:
DXImageTransform
.
Microsoft
.
gradient
(
startColorstr
=
'#ff
337ab7
'
,
endColorstr
=
'#ff
2e6da4
'
,
GradientType
=
0
);
background-repeat
:
repeat-x
;
background-repeat
:
repeat-x
;
}
}
.panel-success
>
.panel-heading
{
.panel-success
>
.panel-heading
{
...
...
bower_components/bootstrap/dist/css/bootstrap-theme.css.map
View file @
4e5b5fd0
This diff is collapsed.
Click to expand it.
bower_components/bootstrap/dist/css/bootstrap-theme.min.css
View file @
4e5b5fd0
This diff is collapsed.
Click to expand it.
bower_components/bootstrap/dist/css/bootstrap.css
View file @
4e5b5fd0
/*!
/*!
* Bootstrap v3.3.
0
(http://getbootstrap.com)
* Bootstrap v3.3.
1
(http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
*/
...
@@ -915,12 +915,12 @@ textarea {
...
@@ -915,12 +915,12 @@ textarea {
line-height
:
inherit
;
line-height
:
inherit
;
}
}
a
{
a
{
color
:
#
428bca
;
color
:
#
337ab7
;
text-decoration
:
none
;
text-decoration
:
none
;
}
}
a
:hover
,
a
:hover
,
a
:focus
{
a
:focus
{
color
:
#2
a6496
;
color
:
#2
3527c
;
text-decoration
:
underline
;
text-decoration
:
underline
;
}
}
a
:focus
{
a
:focus
{
...
@@ -1153,10 +1153,10 @@ mark,
...
@@ -1153,10 +1153,10 @@ mark,
color
:
#777
;
color
:
#777
;
}
}
.text-primary
{
.text-primary
{
color
:
#
428bca
;
color
:
#
337ab7
;
}
}
a
.text-primary
:hover
{
a
.text-primary
:hover
{
color
:
#
3071a9
;
color
:
#
286090
;
}
}
.text-success
{
.text-success
{
color
:
#3c763d
;
color
:
#3c763d
;
...
@@ -1184,10 +1184,10 @@ a.text-danger:hover {
...
@@ -1184,10 +1184,10 @@ a.text-danger:hover {
}
}
.bg-primary
{
.bg-primary
{
color
:
#fff
;
color
:
#fff
;
background-color
:
#
428bca
;
background-color
:
#
337ab7
;
}
}
a
.bg-primary
:hover
{
a
.bg-primary
:hover
{
background-color
:
#
3071a9
;
background-color
:
#
286090
;
}
}
.bg-success
{
.bg-success
{
background-color
:
#dff0d8
;
background-color
:
#dff0d8
;
...
@@ -2400,56 +2400,25 @@ textarea.form-control {
...
@@ -2400,56 +2400,25 @@ textarea.form-control {
input
[
type
=
"search"
]
{
input
[
type
=
"search"
]
{
-webkit-appearance
:
none
;
-webkit-appearance
:
none
;
}
}
input
[
type
=
"date"
],
@media
screen
and
(
-webkit-min-device-pixel-ratio
:
0
)
{
input
[
type
=
"time"
],
input
[
type
=
"date"
],
input
[
type
=
"datetime-local"
],
input
[
type
=
"time"
],
input
[
type
=
"month"
]
{
input
[
type
=
"datetime-local"
],
line-height
:
34px
;
input
[
type
=
"month"
]
{
line-height
:
1.42857143
\
0
;
line-height
:
34px
;
}
}
input
[
type
=
"date"
]
.input-sm
,
input
[
type
=
"date"
]
.input-sm
,
input
[
type
=
"time"
]
.input-sm
,
input
[
type
=
"time"
]
.input-sm
,
input
[
type
=
"datetime-local"
]
.input-sm
,
input
[
type
=
"datetime-local"
]
.input-sm
,
input
[
type
=
"month"
]
.input-sm
{
input
[
type
=
"month"
]
.input-sm
{
line-height
:
30px
;
line-height
:
30px
;
line-height
:
1.5
\
0
;
}
}
input
[
type
=
"date"
]
.input-lg
,
input
[
type
=
"date"
]
.input-lg
,
input
[
type
=
"time"
]
.input-lg
,
input
[
type
=
"time"
]
.input-lg
,
input
[
type
=
"datetime-local"
]
.input-lg
,
input
[
type
=
"datetime-local"
]
.input-lg
,
input
[
type
=
"month"
]
.input-lg
{
input
[
type
=
"month"
]
.input-lg
{
line-height
:
46px
;
line-height
:
46px
;
}
line-height
:
1.33
\
0
;
}
_
:-ms-fullscreen
,
:root
input
[
type
=
"date"
],
_
:-ms-fullscreen
,
:root
input
[
type
=
"time"
],
_
:-ms-fullscreen
,
:root
input
[
type
=
"datetime-local"
],
_
:-ms-fullscreen
,
:root
input
[
type
=
"month"
]
{
line-height
:
1.42857143
;
}
_
:-ms-fullscreen
.input-sm
,
:root
input
[
type
=
"date"
]
.input-sm
,
_
:-ms-fullscreen
.input-sm
,
:root
input
[
type
=
"time"
]
.input-sm
,
_
:-ms-fullscreen
.input-sm
,
:root
input
[
type
=
"datetime-local"
]
.input-sm
,
_
:-ms-fullscreen
.input-sm
,
:root
input
[
type
=
"month"
]
.input-sm
{
line-height
:
1.5
;
}
_
:-ms-fullscreen
.input-lg
,
:root
input
[
type
=
"date"
]
.input-lg
,
_
:-ms-fullscreen
.input-lg
,
:root
input
[
type
=
"time"
]
.input-lg
,
_
:-ms-fullscreen
.input-lg
,
:root
input
[
type
=
"datetime-local"
]
.input-lg
,
_
:-ms-fullscreen
.input-lg
,
:root
input
[
type
=
"month"
]
.input-lg
{
line-height
:
1.33
;
}
}
.form-group
{
.form-group
{
margin-bottom
:
15px
;
margin-bottom
:
15px
;
...
@@ -2880,8 +2849,8 @@ fieldset[disabled] .btn-default.active {
...
@@ -2880,8 +2849,8 @@ fieldset[disabled] .btn-default.active {
}
}
.btn-primary
{
.btn-primary
{
color
:
#fff
;
color
:
#fff
;
background-color
:
#
428bca
;
background-color
:
#
337ab7
;
border-color
:
#
357ebd
;
border-color
:
#
2e6da4
;
}
}
.btn-primary
:hover
,
.btn-primary
:hover
,
.btn-primary
:focus
,
.btn-primary
:focus
,
...
@@ -2890,8 +2859,8 @@ fieldset[disabled] .btn-default.active {
...
@@ -2890,8 +2859,8 @@ fieldset[disabled] .btn-default.active {
.btn-primary.active
,
.btn-primary.active
,
.open
>
.dropdown-toggle.btn-primary
{
.open
>
.dropdown-toggle.btn-primary
{
color
:
#fff
;
color
:
#fff
;
background-color
:
#
3071a9
;
background-color
:
#
286090
;
border-color
:
#2
85e8e
;
border-color
:
#2
04d74
;
}
}
.btn-primary
:active
,
.btn-primary
:active
,
.btn-primary.active
,
.btn-primary.active
,
...
@@ -2916,11 +2885,11 @@ fieldset[disabled] .btn-primary:active,
...
@@ -2916,11 +2885,11 @@ fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active
,
.btn-primary.disabled.active
,
.btn-primary
[
disabled
]
.active
,
.btn-primary
[
disabled
]
.active
,
fieldset
[
disabled
]
.btn-primary.active
{
fieldset
[
disabled
]
.btn-primary.active
{
background-color
:
#
428bca
;
background-color
:
#
337ab7
;
border-color
:
#
357ebd
;
border-color
:
#
2e6da4
;
}
}
.btn-primary
.badge
{
.btn-primary
.badge
{
color
:
#
428bca
;
color
:
#
337ab7
;
background-color
:
#fff
;
background-color
:
#fff
;
}
}
.btn-success
{
.btn-success
{
...
@@ -3105,7 +3074,7 @@ fieldset[disabled] .btn-danger.active {
...
@@ -3105,7 +3074,7 @@ fieldset[disabled] .btn-danger.active {
}
}
.btn-link
{
.btn-link
{
font-weight
:
normal
;
font-weight
:
normal
;
color
:
#
428bca
;
color
:
#
337ab7
;
border-radius
:
0
;
border-radius
:
0
;