Mirrors/tabler
1
0
Fork 0
mirror of https://github.com/tabler/tabler.git synced 2026-08-11 05:42:22 +04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #170 from tabler/bootstrap-upgrade

Browse Source 
Bootstrap upgrade
This commit is contained in:
Paweł Kuna
2018-07-19 17:13:50 +02:00
committed by GitHub
parent c85498b587 6bd3852292
commit 51c63da06b
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -14,3 +14,4 @@ deploy-site
/commits.sh /commits.sh
/assets/css/ /assets/css/
/vendor/ /vendor/
/package-lock.json
Gemfile
-1
View File
@@ -3,5 +3,4 @@ source 'https://rubygems.org' do
gem 'jekyll-redirect-from' gem 'jekyll-redirect-from'
gem 'jekyll-toc' gem 'jekyll-toc'
gem 'jekyll-random' gem 'jekyll-random'
gem 'public_suffix', '3.0.0'
end end
Gemfile.lock
+13 -13
View File
@@ -8,15 +8,15 @@ GEM
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
eventmachine (1.2.5) eventmachine (1.2.7)
ffi (1.9.21) ffi (1.9.25)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
htmlbeautifier (1.3.1) htmlbeautifier (1.3.1)
htmlcompressor (0.4.0) htmlcompressor (0.4.0)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.9.5) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (3.7.2) jekyll (3.8.3)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
@@ -31,7 +31,7 @@ GEM
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-random (0.0.3) jekyll-random (0.0.3)
jekyll (~> 3.3) jekyll (~> 3.3)
jekyll-redirect-from (0.13.0) jekyll-redirect-from (0.14.0)
jekyll (~> 3.3) jekyll (~> 3.3)
jekyll-sass-converter (1.5.2) jekyll-sass-converter (1.5.2)
sass (~> 3.4) sass (~> 3.4)
@@ -39,11 +39,11 @@ GEM
htmlbeautifier htmlbeautifier
htmlcompressor htmlcompressor
jekyll jekyll
jekyll-toc (0.5.1) jekyll-toc (0.6.0)
nokogiri (~> 1.6) nokogiri (~> 1.7)
jekyll-watch (2.0.0) jekyll-watch (2.0.0)
listen (~> 3.0) listen (~> 3.0)
kramdown (1.16.2) kramdown (1.17.0)
liquid (4.0.0) liquid (4.0.0)
listen (3.1.5) listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@@ -51,18 +51,18 @@ GEM
ruby_dep (~> 1.2) ruby_dep (~> 1.2)
mercenary (0.3.6) mercenary (0.3.6)
mini_portile2 (2.3.0) mini_portile2 (2.3.0)
nokogiri (1.8.2) nokogiri (1.8.4)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
pathutil (0.16.1) pathutil (0.16.1)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (3.0.0) public_suffix (3.0.2)
rb-fsevent (0.10.2) rb-fsevent (0.10.3)
rb-inotify (0.9.10) rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2) ffi (>= 0.5.0, < 2)
rouge (3.1.1) rouge (3.1.1)
ruby_dep (1.5.0) ruby_dep (1.5.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.5.5) sass (3.5.7)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
sass-listen (4.0.0) sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@@ -76,7 +76,7 @@ DEPENDENCIES
jekyll-redirect-from! jekyll-redirect-from!
jekyll-tidy! jekyll-tidy!
jekyll-toc! jekyll-toc!
public_suffix (= 3.0.0)! public_suffix (= 3.0.2)!
BUNDLED WITH BUNDLED WITH
1.16.1 1.16.3
package.json
+1 -1
View File
@@ -39,7 +39,7 @@
"gulp-autoprefixer": "^5.0.0", "gulp-autoprefixer": "^5.0.0",
"gulp-rename": "^1.2.2", "gulp-rename": "^1.2.2",
"gulp-rtlcss": "^1.2.0", "gulp-rtlcss": "^1.2.0",
"gulp-sass": "^3.1.0", "gulp-sass": "^4.0.1",
"bootstrap": "^4.1.0", "bootstrap": "^4.1.0",
"npm-run-all": "^4.1.2" "npm-run-all": "^4.1.2"
}, },
src/cards.html
+1 -1
View File
@@ -4,8 +4,8 @@ layout: default
menu: interface.cards menu: interface.cards
--- ---
<div class="container"> <div class="container">
{% include page-title.html title="Cards" %}
<div class="row"> <div class="row">
<div class="col-md-6 col-xl-4"> <div class="col-md-6 col-xl-4">