Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to bootstrap4

This commit is contained in:
Mohamed Said 2017-12-20 21:14:56 +02:00
parent 304854c335
commit 4be558ac65
4 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -11,7 +11,8 @@
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.17", "axios": "^0.17",
"bootstrap-sass": "^3.3.7", "bootstrap": "^4.0.0-beta.2",
"popper.js": "^1.12",
"cross-env": "^5.1", "cross-env": "^5.1",
"jquery": "^3.2", "jquery": "^3.2",
"laravel-mix": "^1.0", "laravel-mix": "^1.0",

3
resources/assets/js/bootstrap.js vendored
View File

@ -1,5 +1,6 @@
window._ = require('lodash'); window._ = require('lodash');
window.Popper = require('popper.js').default;
/** /**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support * We'll load jQuery and the Bootstrap jQuery plugin which provides support
@ -10,7 +11,7 @@ window._ = require('lodash');
try { try {
window.$ = window.jQuery = require('jquery'); window.$ = window.jQuery = require('jquery');
require('bootstrap-sass'); require('bootstrap');
} catch (e) {} } catch (e) {}
/** /**

21
resources/assets/sass/_variables.scss vendored
View File

@ -2,24 +2,8 @@
// Body // Body
$body-bg: #f5f8fa; $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 // Typography
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
$font-family-sans-serif: "Raleway", sans-serif; $font-family-sans-serif: "Raleway", sans-serif;
$font-size-base: 14px;
$line-height-base: 1.6; $line-height-base: 1.6;
$text-color: #636b6f; $text-color: #636b6f;
@ -29,10 +13,5 @@ $navbar-default-bg: #fff;
// Buttons // Buttons
$btn-default-color: $text-color; $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 // Panels
$panel-default-heading-bg: #fff; $panel-default-heading-bg: #fff;

7
resources/assets/sass/app.scss vendored
View File

@ -6,4 +6,9 @@
@import "variables"; @import "variables";
// Bootstrap // 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);
}