switch to bootstrap4
This commit is contained in:
3
resources/assets/js/bootstrap.js
vendored
3
resources/assets/js/bootstrap.js
vendored
@@ -1,5 +1,6 @@
|
||||
|
||||
window._ = require('lodash');
|
||||
window.Popper = require('popper.js').default;
|
||||
|
||||
/**
|
||||
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
|
||||
@@ -10,7 +11,7 @@ window._ = require('lodash');
|
||||
try {
|
||||
window.$ = window.jQuery = require('jquery');
|
||||
|
||||
require('bootstrap-sass');
|
||||
require('bootstrap');
|
||||
} catch (e) {}
|
||||
|
||||
/**
|
||||
|
||||
21
resources/assets/sass/_variables.scss
vendored
21
resources/assets/sass/_variables.scss
vendored
@@ -2,24 +2,8 @@
|
||||
// Body
|
||||
$body-bg: #f5f8fa;
|
||||
|
||||
// Borders
|
||||
$laravel-border-color: darken($body-bg, 10%);
|
||||
$list-group-border: $laravel-border-color;
|
||||
$navbar-default-border: $laravel-border-color;
|
||||
$panel-default-border: $laravel-border-color;
|
||||
$panel-inner-border: $laravel-border-color;
|
||||
|
||||
// Brands
|
||||
$brand-primary: #3097D1;
|
||||
$brand-info: #8eb4cb;
|
||||
$brand-success: #2ab27b;
|
||||
$brand-warning: #cbb956;
|
||||
$brand-danger: #bf5329;
|
||||
|
||||
// Typography
|
||||
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
|
||||
$font-family-sans-serif: "Raleway", sans-serif;
|
||||
$font-size-base: 14px;
|
||||
$line-height-base: 1.6;
|
||||
$text-color: #636b6f;
|
||||
|
||||
@@ -29,10 +13,5 @@ $navbar-default-bg: #fff;
|
||||
// Buttons
|
||||
$btn-default-color: $text-color;
|
||||
|
||||
// Inputs
|
||||
$input-border: lighten($text-color, 40%);
|
||||
$input-border-focus: lighten($brand-primary, 25%);
|
||||
$input-color-placeholder: lighten($text-color, 30%);
|
||||
|
||||
// Panels
|
||||
$panel-default-heading-bg: #fff;
|
||||
|
||||
7
resources/assets/sass/app.scss
vendored
7
resources/assets/sass/app.scss
vendored
@@ -6,4 +6,9 @@
|
||||
@import "variables";
|
||||
|
||||
// Bootstrap
|
||||
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
|
||||
@import '~bootstrap/scss/bootstrap';
|
||||
|
||||
.navbar-laravel{
|
||||
background-color: #fff;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user