Merge pull request #2 from openapidotvn/development

Upgrading to Bootstrap 4
RevoLabs-IO · Aug 8, 2018 · c3c87af · c3c87af
2 parents 908f0e6 + 270ef96
commit c3c87af
Show file tree

Hide file tree

Showing 61 changed files with 304 additions and 1,346 deletions.
diff --git a/bower.json b/bower.json
@@ -6,16 +6,34 @@
     "Hung Pham Do"
   ],
   "license": "MIT",
-  "homepage": "",
+  "homepage": "https://github.com/openapidotvn/vbase-html",
   "ignore": [
     "**/.*",
     "node_modules",
     "bower_components"
   ],
   "dependencies": {
-    "jquery": "2.2.4",
-    "bootstrap": "3.3.7",
-    "bootstrap-sass": "3.3.7",
-    "animate-sass": "^0.8.2"
+    "jquery": "^3.3.1",
+    "popper.js": "^1.14.3",
+    "bootstrap": "4.1.3"
+  },
+  "overrides": {
+    "jquery": {
+      "main": [
+        "dist/jquery.js"
+      ]
+    },
+    "bootstrap": {
+      "main": [
+        "js/dist/util.js",
+        "js/dist/dropdown.js",
+        "js/dist/collapse.js"
+      ]
+    },
+    "popper": {
+      "main": [
+        "dist/umd/popper.js"
+      ]
+    }
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -34,7 +34,7 @@ gulp.task('fonts', () => {
 gulp.task('icons', () => {
   return gulp.src('src/icons/**/*.svg')
     .pipe($.iconfont({
-      fontHeight: 1001, 
+      fontHeight: 1001,
       normalize: true,
       fontName: packageInfo.icons.fontName, // required
       prependUnicode: true, // recommended option

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vbase-html",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "vBase HTML",
   "main": "index.js",
   "scripts": {

diff --git a/src/fonts/vbase-icon.eot b/src/fonts/vbase-icon.eot
diff --git a/src/fonts/vbase-icon.svg b/src/fonts/vbase-icon.svg
diff --git a/src/fonts/vbase-icon.ttf b/src/fonts/vbase-icon.ttf
diff --git a/src/fonts/vbase-icon.woff b/src/fonts/vbase-icon.woff
diff --git a/src/fonts/vbase-icon.woff2 b/src/fonts/vbase-icon.woff2
diff --git a/src/icons/uEA01-about.svg b/src/icons/uEA01-about.svg
diff --git a/src/icons/uEA01-code.svg b/src/icons/uEA01-code.svg
diff --git a/src/icons/uEA02-add-user.svg b/src/icons/uEA02-add-user.svg
diff --git a/src/icons/uEA02-css3.svg b/src/icons/uEA02-css3.svg
diff --git a/src/icons/uEA03-add-white.svg b/src/icons/uEA03-add-white.svg
diff --git a/src/icons/uEA03-html5.svg b/src/icons/uEA03-html5.svg
diff --git a/src/icons/uEA04-add.svg b/src/icons/uEA04-add.svg
diff --git a/src/icons/uEA04-js.svg b/src/icons/uEA04-js.svg
diff --git a/src/icons/uEA05-angry.svg b/src/icons/uEA05-angry.svg
diff --git a/src/icons/uEA07-bell.svg b/src/icons/uEA07-bell.svg
diff --git a/src/icons/uEA08-camera.svg b/src/icons/uEA08-camera.svg
diff --git a/src/icons/uEA09-check.svg b/src/icons/uEA09-check.svg