Browse Source

Streamlined CSS & Ran Mix (in production mode) with updated packages

pull/312/head
Youri Wijnands 7 years ago
parent
commit
b5e6da4a51
  1. 4
      package.json
  2. 6193
      public/css/app.css
  3. 160
      public/js/app.js
  4. 2
      public/mix-manifest.json
  5. 26
      resources/assets/sass/_variables.scss
  6. 15
      resources/assets/sass/app.scss

4
package.json

@ -13,7 +13,9 @@
"bootstrap-sass": "^3.3.7",
"cross-env": "^5.2.0",
"jquery": "^3.2",
"laravel-mix": "^2.1.14"
"laravel-mix": "^2.1.14",
"imagemin": "^6.0.0",
"ajv": "^6.0.0"
},
"dependencies": {
"select2": "^4.0.6-rc.1"

6193
public/css/app.css

File diff suppressed because one or more lines are too long

160
public/js/app.js

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json

@ -1,4 +1,4 @@
{
"/css/app.css": "/css/app.css?id=fc4d028f7cc679d5b7bf",
"/css/app.css": "/css/app.css?id=42a76e8100656548fd41",
"/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d"
}

26
resources/assets/sass/_variables.scss

@ -1,18 +1,14 @@
$body-bg: #CCC;
$app-text: #000;
// Body
$body-bg: #cfd2d4;
$app-block-color: #B13;
$app-light-color: #874;
$app-dark-color: #222;
$app-green: #1B8;
$app-red: #D45;
$app-blue: #4AE;
$app-purple: #547;
$app-text: #2f313a;
$app-block-color: #b71234;
$app-light-color: #84764d;
$app-dark-color: #1d1d1b;
$app-green: #0eb584;
$app-red: #d64d55;
$app-blue: #47a4e9;
$app-purple: #514a77;
$table-heading: #f2f3f6;
$table-line: #cdced8;
$table-heading: #EEF;
$table-line: #CCD;

15
resources/assets/sass/app.scss

@ -5,19 +5,14 @@
// Variables
@import "variables";
// Bootstrap
@import "normalise";
// Bootstrap
@import "app";
// Plugins
@import "rune";
// Huebee
@import "huebee";
@import "select2";
@import "normalise";
// fontawesome
// FontAwesome
@import "fontawesome/fontawesome";
@import "fontawesome/fa-solid";
@import "select2";
@import "app"

Loading…
Cancel
Save