Updated the package.json versions

XetaIO · Mar 13, 2018 · ecc1035 · ecc1035
1 parent ff9c1c7
commit ecc1035
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 Homestead.json
 Homestead.yaml
 composer.lock
+package-lock.json
 studio.json
 /node_modules
 /plugins

diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "xetaio/xetaravel-mentions": "^2.0",
         "xety/breadcrumbs": "~1.0",
         "fideloper/proxy": "^4.0",
-        "laravelcollective/html": "^5.4.0",
+        "laravelcollective/html": "^5.6",
         "greggilbert/recaptcha": "~2.0",
         "kirkbushell/eloquence": "~2.0",
         "ultraware/roles": "^5.6",

diff --git a/package.json b/package.json
@@ -12,14 +12,14 @@
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "@types/node": "^7.0.31",
-    "axios": "^0.15.3",
-    "cross-env": "^3.2.3",
-    "laravel-mix": "0.*",
+    "@types/node": "^7.0.56",
+    "axios": "^0.18",
+    "cross-env": "^5.1",
+    "laravel-mix": "^2.0",
     "lodash": "^4.17.4",
     "sprintf-js": "^1.1.1",
-    "ts-loader": "^2.0.2",
-    "typescript": "^2.2.1",
-    "vue": "^2.3.3"
+    "ts-loader": "^2.3.7",
+    "typescript": "^2.7.2",
+    "vue": "^2.5.7"
   }
 }
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,13 +1,12 @@
 {
-  "/js/xetaravel.min.js": "/js/xetaravel.min.b9286fc70fc9d1f0ff90.js",
-  "/js/xetaravel.admin.min.js": "/js/xetaravel.admin.min.d5a85fbc0cbac14bbffa.js",
-  "/mix.js": "/mix.2536366bc1656b39227d.js",
-  "/css/xetaravel.min.css": "/css/xetaravel.min.7f7c6c5bd232afd21a39ff6278504ba9.css",
-  "/css/xetaravel.admin.min.css": "/css/xetaravel.admin.min.92ab0c50d4af6466823cfa8eaf4e1572.css",
-  "/css/bootstrap.min.css": "/css/bootstrap.min.9235be4b5faadc192d1b4ac4168267f4.css",
-  "/css/bootstrap.plugins.min.css": "/css/bootstrap.plugins.min.c632989f4ead591ca5b4808c01bf40ac.css",
-  "/css/font-awesome.min.css": "/css/font-awesome.min.c04ddca45ff05bd954f597e5a3d0c602.css",
-  "/css/editor-md.custom.min.css": "/css/editor-md.custom.min.d7c8eb20281bf47e62291d4c991f88d7.css",
-  "/js/lib.min.js": "/js/lib.min.d7c980ab8196d867d72cfd33d50bd5b5.js",
-  "/js/highlight.min.js": "/js/highlight.min.50228c80fa9a82afb8b411cd7b0909a9.js"
+    "/js/xetaravel.min.js": "/js/xetaravel.min.js?id=53141e554f4741a19f61",
+    "/js/xetaravel.admin.min.js": "/js/xetaravel.admin.min.js?id=b9a75c3b1ed772abfa40",
+    "/css/xetaravel.min.css": "/css/xetaravel.min.css?id=23403715817de49f82c7",
+    "/css/xetaravel.admin.min.css": "/css/xetaravel.admin.min.css?id=921fc1a732732d8d58b1",
+    "/css/bootstrap.min.css": "/css/bootstrap.min.css?id=ee72a0000e0a598c1d50",
+    "/css/bootstrap.plugins.min.css": "/css/bootstrap.plugins.min.css?id=98b7cd5355e6db84becb",
+    "/css/font-awesome.min.css": "/css/font-awesome.min.css?id=3825b2273b6ebedd109c",
+    "/css/editor-md.custom.min.css": "/css/editor-md.custom.min.css?id=aaa5dfbf3bcfc34525b9",
+    "/js/lib.min.js": "/js/lib.min.js?id=d7c980ab8196d867d72c",
+    "/js/highlight.min.js": "/js/highlight.min.js?id=50228c80fa9a82afb8b4"
 }
diff --git a/resources/assets/sass/bootstrap/_custom.scss b/resources/assets/sass/bootstrap/_custom.scss
@@ -6,11 +6,11 @@
 	font-family: "Miriam Libre";
     font-weight: normal;
     font-style: normal;
-	src: url("../fonts/MiriamLibre-Regular.eot?") format("eot"),
-		 url("../fonts/MiriamLibre-Regular.woff2") format("woff2"),
-		 url("../fonts/MiriamLibre-Regular.woff") format("woff"),
-		 url("../fonts/MiriamLibre-Regular.ttf") format("truetype"),
-		 url("../fonts/MiriamLibre-Regular.svg#MiriamLibre") format("svg");
+	src: url("../../fonts/MiriamLibre-Regular.eot") format("eot"),
+		 url("../../fonts/MiriamLibre-Regular.woff2") format("woff2"),
+		 url("../../fonts/MiriamLibre-Regular.woff") format("woff"),
+		 url("../../fonts/MiriamLibre-Regular.ttf") format("truetype"),
+		 url("../../fonts/MiriamLibre-Regular.svg") format("svg");
 }
 
 .fixed-top {

diff --git a/resources/assets/sass/font-awesome/_variables.scss b/resources/assets/sass/font-awesome/_variables.scss
@@ -1,7 +1,7 @@
 // Variables
 // --------------------------
 
-$fa-font-path:        "../fonts" !default;
+$fa-font-path:        "../../fonts" !default;
 $fa-font-size-base:   14px !default;
 $fa-line-height-base: 1 !default;
 //$fa-font-path:        "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts" !default; // for referencing Bootstrap CDN font files directly