diff --git a/bower.json b/bower.json index e3bfe315..527900e3 100644 --- a/bower.json +++ b/bower.json @@ -24,7 +24,7 @@ ], "devDependencies": { "jquery": "^2.2.3", - "bootstrap": "^3.4.1", + "bootstrap": "^4.3.1", "font-awesome": "fontawesome#^4.6.1", "fastclick": "^1.0.6", "nprogress": "^0.2.0", @@ -81,6 +81,7 @@ }, "resolutions": { "jquery": "^2.2.3", - "fastclick": "^1.0.6" + "fastclick": "^1.0.6", + "bootstrap": "^4.3.1" } } diff --git a/package-lock.json b/package-lock.json index 8e2817ee..9fb9a0b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1638,13 +1638,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1661,19 +1663,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1804,7 +1809,8 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1818,6 +1824,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1834,6 +1841,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1842,13 +1850,15 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1869,6 +1879,7 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1957,7 +1968,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1971,6 +1983,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2108,6 +2121,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/production/calendar.html b/production/calendar.html index b36aae81..7e018f05 100755 --- a/production/calendar.html +++ b/production/calendar.html @@ -173,99 +173,95 @@
-
- + Help + Log Out +
+ + + + + +
- @@ -412,7 +408,7 @@ - + diff --git a/production/chartjs.html b/production/chartjs.html index 3fca0f86..76c31c4d 100755 --- a/production/chartjs.html +++ b/production/chartjs.html @@ -170,99 +170,95 @@
-
- + Help + Log Out +
+ + + + + +
- @@ -472,7 +468,7 @@ - + diff --git a/production/chartjs2.html b/production/chartjs2.html index 5baa43c2..a6048ff9 100755 --- a/production/chartjs2.html +++ b/production/chartjs2.html @@ -170,99 +170,95 @@
-
- + Help + Log Out +
+ + + + + +
- @@ -470,7 +466,7 @@ - + diff --git a/production/contacts.html b/production/contacts.html index e5782cd5..b1929a4b 100755 --- a/production/contacts.html +++ b/production/contacts.html @@ -170,99 +170,95 @@
-
- + Help + Log Out +
+ + + + + +
- @@ -274,7 +270,7 @@
-
+
@@ -288,11 +284,9 @@
-
-
-
+
+ +
-
@@ -277,7 +273,7 @@
-
+
@@ -291,7 +287,7 @@
-
+

E-commerce page design

@@ -314,7 +310,7 @@
-
+
...
@@ -334,7 +330,7 @@
-
+

LOWA Men’s Renegade GTX Mid Hiking Boots Review

@@ -343,7 +339,7 @@

Available Colors

-
-
@@ -656,7 +652,7 @@ - + diff --git a/production/fixed_footer.html b/production/fixed_footer.html index 37fee869..a52c0cbd 100644 --- a/production/fixed_footer.html +++ b/production/fixed_footer.html @@ -172,100 +172,95 @@
-
- + Help + Log Out +
+ + + + + +
- -
@@ -294,7 +289,7 @@ - + diff --git a/production/fixed_sidebar.html b/production/fixed_sidebar.html index 83de7e3e..2a2d084d 100644 --- a/production/fixed_sidebar.html +++ b/production/fixed_sidebar.html @@ -173,38 +173,35 @@
-
@@ -293,7 +289,7 @@ - + diff --git a/production/form.html b/production/form.html index 0227c957..3a4b5336 100755 --- a/production/form.html +++ b/production/form.html @@ -182,99 +182,95 @@
-
- + Help + Log Out +
+ + + + + +
-
@@ -286,7 +282,7 @@
-
+
@@ -298,7 +294,7 @@
-
+

Form Design different form elements

@@ -306,11 +302,11 @@
  • - +
    • @@ -323,49 +319,49 @@
    -
    -