mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

Merge pull request #20267 from twbs/master-deps

Browse Source 
Update devDependencies and gems.
This commit is contained in:
XhmikosR
2016-07-11 02:33:38 +03:00
committed by GitHub
parent c3c089b895 c2f1bf7414
commit 6b3e08420f
14 changed files with 243 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
-1
View File
@@ -17,7 +17,6 @@ before_install:
install: install:
- bundle install --deployment --jobs=1 - bundle install --deployment --jobs=1
- cp grunt/npm-shrinkwrap.json ./ - cp grunt/npm-shrinkwrap.json ./
- npm install -g grunt-cli
- npm install - npm install
cache: cache:
directories: directories:
Gemfile
+1 -1
View File
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
group :development, :test do group :development, :test do
gem 'jekyll', '~> 3.1.2' gem 'jekyll', '~> 3.1.2'
gem 'jekyll-sitemap', '~> 0.10.0' gem 'jekyll-sitemap', '~> 0.11.0'
end end
Gemfile.lock
+5 -3
View File
@@ -1,8 +1,9 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.4.0)
colorator (0.1) colorator (0.1)
ffi (1.9.10-x64-mingw32) ffi (1.9.13-x64-mingw32)
jekyll (3.1.6) jekyll (3.1.6)
colorator (~> 0.1) colorator (~> 0.1)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 1.0)
@@ -14,7 +15,8 @@ GEM
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-sass-converter (1.4.0) jekyll-sass-converter (1.4.0)
sass (~> 3.4) sass (~> 3.4)
jekyll-sitemap (0.10.0) jekyll-sitemap (0.11.0)
addressable (~> 2.4.0)
jekyll-watch (1.4.0) jekyll-watch (1.4.0)
listen (~> 3.0, < 3.1) listen (~> 3.0, < 3.1)
kramdown (1.11.1) kramdown (1.11.1)
@@ -35,7 +37,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
jekyll (~> 3.1.2) jekyll (~> 3.1.2)
jekyll-sitemap (~> 0.10.0) jekyll-sitemap (~> 0.11.0)
BUNDLED WITH BUNDLED WITH
1.12.5 1.12.5
dist/css/bootstrap.css
-3
View File
@@ -1106,7 +1106,6 @@ a:focus {
text-decoration: underline; text-decoration: underline;
} }
a:focus { a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@@ -2537,7 +2536,6 @@ select[size] {
input[type="file"]:focus, input[type="file"]:focus,
input[type="radio"]:focus, input[type="radio"]:focus,
input[type="checkbox"]:focus { input[type="checkbox"]:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@@ -3029,7 +3027,6 @@ select[multiple].input-lg {
.btn.focus, .btn.focus,
.btn:active.focus, .btn:active.focus,
.btn.active.focus { .btn.active.focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
-3
View File
@@ -1106,7 +1106,6 @@ a:focus {
text-decoration: underline; text-decoration: underline;
} }
a:focus { a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@@ -2537,7 +2536,6 @@ select[size] {
input[type="file"]:focus, input[type="file"]:focus,
input[type="radio"]:focus, input[type="radio"]:focus,
input[type="checkbox"]:focus { input[type="checkbox"]:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
@@ -3029,7 +3027,6 @@ select[multiple].input-lg {
.btn.focus, .btn.focus,
.btn:active.focus, .btn:active.focus,
.btn.active.focus { .btn.active.focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
} }
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
grunt/npm-shrinkwrap.json
Generated
+228 -796
View File
File diff suppressed because it is too large Load Diff
package.json
+2 -2
View File
@@ -32,7 +32,7 @@
"devDependencies": { "devDependencies": {
"btoa": "~1.1.2", "btoa": "~1.1.2",
"glob": "~7.0.3", "glob": "~7.0.3",
"grunt": "~0.4.5", "grunt": "~1.0.1",
"grunt-autoprefixer": "~3.0.4", "grunt-autoprefixer": "~3.0.4",
"grunt-contrib-clean": "~1.0.0", "grunt-contrib-clean": "~1.0.0",
"grunt-contrib-compress": "~1.3.0", "grunt-contrib-compress": "~1.3.0",
@@ -53,7 +53,7 @@
"grunt-html": "~8.0.1", "grunt-html": "~8.0.1",
"grunt-jekyll": "~0.4.4", "grunt-jekyll": "~0.4.4",
"grunt-jscs": "~3.0.1", "grunt-jscs": "~3.0.1",
"grunt-saucelabs": "~8.6.2", "grunt-saucelabs": "~9.0.0",
"load-grunt-tasks": "~3.5.0", "load-grunt-tasks": "~3.5.0",
"markdown-it": "^7.0.0", "markdown-it": "^7.0.0",
"shelljs": "^0.7.0", "shelljs": "^0.7.0",