Move flatly to app.css (orgmanager#205)

Author: m1guelpf

.gitignore

@@ -10,4 +10,3 @@ Homestead.yaml
 .env.*
 !.env.example
 composer.lock
-yarn.lock

package.json

@@ -8,7 +8,6 @@
     "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": {
-    "bootstrap-sass": "^3.3.7",
     "cross-env": "^3.2.3",
     "laravel-mix": "^0.8.3",
     "lodash": "^4.17.4"

public/css/app.css

@@ -0,0 +1,2 @@
+app.css
+tmp.css

resources/assets/css/.gitignore

@@ -4,6 +4,3 @@
 
 // Variables
 @import "variables";
-
-// Bootstrap
-@import "node_modules/bootstrap-sass/assets/stylesheets/bootstrap";

public/css/flatty.min.css renamed to resources/assets/css/flatly.css

@@ -14,7 +14,7 @@
 
         <!-- Styles -->
         <link href="{{ url('/css/home.css') }}" rel="stylesheet">
-        <link href="{{ url('/css/flatty.min.css') }}" rel="stylesheet">
+        <link href="{{ url('/css/app.css') }}" rel="stylesheet">
         <link href="{{ url('/css/sweetalert.css') }}" rel="stylesheet">
         @include('layouts.code.head')
     </head>

resources/assets/sass/app.scss

@@ -11,7 +11,7 @@
         <link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
         <!-- Styles -->
     <link href="{{ url('/css/join.css') }}" rel="stylesheet">
-    <link href="{{ url('/css/flatty.min.css') }}" rel="stylesheet">
+    <link href="{{ url('/css/app.css') }}" rel="stylesheet">
     <link href="{{ url('/css/sweetalert.css') }}" rel="stylesheet">
     @include('layouts.code.head')
     <script>

resources/views/home.blade.php

@@ -11,7 +11,7 @@
     <title>{{ config('app.name', 'Laravel') }}</title>
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <!-- Styles -->
-    <link href="{{ url('/css/flatty.min.css') }}" rel="stylesheet">
+    <link href="{{ url('/css/app.css') }}" rel="stylesheet">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/font/octicons.min.css" rel="stylesheet">
     <link href="{{ url('/css/bootstrap-responsive.min.css') }}" rel="stylesheet">
     <link href="{{ url('/css/bootstrap-social.css') }}" rel="stylesheet">

resources/views/join.blade.php

@@ -12,4 +12,8 @@ const { mix } = require('laravel-mix');
  */
 
 mix.js('resources/assets/js/app.js', 'public/js')
-   .sass('resources/assets/sass/app.scss', 'public/css');
+   .sass('resources/assets/sass/app.scss', 'public/css')
+   .styles([
+	'public/css/app.css',
+	'resources/assets/css/flatly.css',
+   ], 'public/css/app.css');