Merge pull request #108 from sebnitu/feat/badges

Feat/badges
sebnitu · Oct 17, 2017 · 478f8f6 · 478f8f6
2 parents de9e861 + 486cb3b
commit 478f8f6
Show file tree

Hide file tree

Showing 113 changed files with 7,258 additions and 9,174 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -21,8 +21,8 @@ GEM
     ffi (1.9.18)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    github-pages (160)
-      activesupport (= 4.2.8)
+    github-pages (163)
+      activesupport (= 4.2.9)
       github-pages-health-check (= 1.3.5)
       jekyll (= 3.5.2)
       jekyll-avatar (= 0.5.0)
@@ -36,7 +36,7 @@ GEM
       jekyll-paginate (= 1.1.0)
       jekyll-readme-index (= 0.1.0)
       jekyll-redirect-from (= 0.12.1)
-      jekyll-relative-links (= 0.4.1)
+      jekyll-relative-links (= 0.5.0)
       jekyll-sass-converter (= 1.5.0)
       jekyll-seo-tag (= 2.3.0)
       jekyll-sitemap (= 1.1.1)
@@ -55,7 +55,7 @@ GEM
       jekyll-theme-tactile (= 0.1.0)
       jekyll-theme-time-machine (= 0.1.0)
       jekyll-titles-from-headings (= 0.4.0)
-      jemoji (= 0.8.0)
+      jemoji (= 0.8.1)
       kramdown (= 1.13.2)
       liquid (= 4.0.0)
       listen (= 3.0.6)
@@ -69,7 +69,7 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 2.0)
       typhoeus (~> 0.7)
-    html-pipeline (2.7.0)
+    html-pipeline (2.7.1)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     i18n (0.8.6)
@@ -109,7 +109,7 @@ GEM
       jekyll (~> 3.0)
     jekyll-redirect-from (0.12.1)
       jekyll (~> 3.3)
-    jekyll-relative-links (0.4.1)
+    jekyll-relative-links (0.5.0)
       jekyll (~> 3.3)
     jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
@@ -162,8 +162,8 @@ GEM
       jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jemoji (0.8.0)
-      activesupport (~> 4.0)
+    jemoji (0.8.1)
+      activesupport (~> 4.0, >= 4.2.9)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
@@ -174,25 +174,25 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
     mercenary (0.3.6)
-    mini_portile2 (2.2.0)
+    mini_portile2 (2.3.0)
     minima (2.1.1)
       jekyll (~> 3.3)
     minitest (5.10.3)
     multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.14.0)
+    pathutil (0.16.0)
       forwardable-extended (~> 2.6)
     public_suffix (2.0.5)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rouge (1.11.1)
     safe_yaml (1.0.4)
-    sass (3.5.1)
+    sass (3.5.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -213,7 +213,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages (= 160)
+  github-pages (= 163)
   jekyll-github-metadata
   json
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![BaseWeb](https://d3vv6lp55qjaqc.cloudfront.net/items/3N173I3s2s211E1q1e1N/baseweb-logo-readme.svg)](http://getbaseweb.com)
 
-Currently v2.6.4
+Currently v3.0.0
 
 [![npm version](https://img.shields.io/npm/v/baseweb.svg)](https://www.npmjs.com/package/baseweb)
 [![devDependency Status](https://img.shields.io/david/dev/sebnitu/baseweb.svg)](https://david-dm.org/sebnitu/baseweb?type=dev)
@@ -14,3 +14,4 @@ Documentation can be found at [http://getbaseweb.com/](http://getbaseweb.com/).
 ## Copyright and License
 
 BaseWeb and BaseWeb documentation copyright (c) 2017 [Sebastian Nitu](http://sebnitu.com). BaseWeb is released under the [MIT license](https://github.com/sebnitu/BaseWeb/blob/master/LICENSE) and BaseWeb documentation is released under [Creative Commons](https://github.com/sebnitu/BaseWeb/blob/master/docs/LICENSE).
+# y-shaped-stick