Skip to content

Commit

Permalink
Minor Fix
Browse files Browse the repository at this point in the history
- Fixed Force HTTPS Scheme
- Change Bootstrap from BOWER to NPM
- Session encrypt default is false
  • Loading branch information
drolean committed Oct 21, 2017
1 parent 9a24e6f commit 835d86d
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public function boot()
{
//
Schema::defaultStringLength(191);
\URL::forceScheme('https');
}

/**
Expand Down
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"tests"
],
"dependencies": {
"bootstrap": "v4.0.0-beta",
"font-awesome": "^4.7.0",
"jquery": "^3.1.1",
"jquery-ujs": "^1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion config/session.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
|
*/

'encrypt' => true,
'encrypt' => false,

/*
|--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion resources/assets/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $link-hover-decoration: none !default;
$font-family-base: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
$font-size-base: 0.8125rem !default;
$body-color: rgba(0, 0, 0, 0.7);
@import '../../../bower_components/bootstrap/scss/bootstrap';
@import "~bootstrap/scss/bootstrap";

// Font Awesome
$fa-font-path: '/static/fonts/font-awesome' !default;
Expand Down
3 changes: 2 additions & 1 deletion webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ mix.autoload({})

// Base Directories
var bower = 'bower_components/';
var npm = 'node_modules/';

// Copiando Fontes
mix.copy('bower_components/font-awesome/fonts', 'public/static/fonts/font-awesome/');
Expand All @@ -26,7 +27,7 @@ mix.sass('resources/assets/sass/app.scss', 'public/static/css/app.css').version(
mix.scripts([
bower + 'jquery/dist/jquery.min.js',
bower + 'popper.js/dist/umd/popper.js',
bower + 'bootstrap/dist/js/bootstrap.min.js',
npm + 'bootstrap/dist/js/bootstrap.bundle.js',
bower + 'jquery-ujs/src/rails.js',
bower + 'jquery-mask-plugin/src/jquery.mask.js',
bower + 'alertifyjs/src/js/alertify.js',
Expand Down

0 comments on commit 835d86d

Please sign in to comment.