Skip to content

Commit c7c8e91

Browse files
committed
minor improve in style
1 parent 79f42ae commit c7c8e91

File tree

7 files changed

+135
-67
lines changed

7 files changed

+135
-67
lines changed

public/css/app.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11270,6 +11270,13 @@ a.text-dark:focus {
1127011270
}
1127111271
}
1127211272

11273+
@media (min-width: 992px) {
11274+
.sidebar-minimized .sidebar .sidebar-nav {
11275+
overflow-x: hidden;
11276+
overflow-y: auto;
11277+
}
11278+
}
11279+
1127311280
.app-header {
1127411281
padding: 0;
1127511282
}
@@ -11283,3 +11290,11 @@ a.text-dark:focus {
1128311290
border-bottom: 1px solid #e9ecef;
1128411291
}
1128511292

11293+
.input-group-text {
11294+
background-color: transparent;
11295+
}
11296+
11297+
.card-header {
11298+
background-color: transparent;
11299+
}
11300+

public/js/app.js

Lines changed: 90 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -13879,13 +13879,14 @@ module.exports = Cancel;
1387913879
/***/ (function(module, exports, __webpack_require__) {
1388013880

1388113881
__webpack_require__(12);
13882-
module.exports = __webpack_require__(45);
13882+
module.exports = __webpack_require__(44);
1388313883

1388413884

1388513885
/***/ }),
1388613886
/* 12 */
13887-
/***/ (function(module, exports, __webpack_require__) {
13887+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
1388813888

13889+
"use strict";
1388913890

1389013891
/**
1389113892
* First we will load all of this project's JavaScript dependencies which
@@ -13903,7 +13904,7 @@ window.Vue = __webpack_require__(38);
1390313904
* or customize the JavaScript scaffolding to fit your unique needs.
1390413905
*/
1390513906

13906-
Vue.component('example-component', __webpack_require__(41));
13907+
Vue.component('example-component', __webpack_require__(74));
1390713908

1390813909
var app = new Vue({
1390913910
el: '#app'
@@ -49291,53 +49292,7 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
4929149292
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(1), __webpack_require__(6)))
4929249293

4929349294
/***/ }),
49294-
/* 41 */
49295-
/***/ (function(module, exports, __webpack_require__) {
49296-
49297-
var disposed = false
49298-
var normalizeComponent = __webpack_require__(42)
49299-
/* script */
49300-
var __vue_script__ = __webpack_require__(43)
49301-
/* template */
49302-
var __vue_template__ = __webpack_require__(44)
49303-
/* template functional */
49304-
var __vue_template_functional__ = false
49305-
/* styles */
49306-
var __vue_styles__ = null
49307-
/* scopeId */
49308-
var __vue_scopeId__ = null
49309-
/* moduleIdentifier (server only) */
49310-
var __vue_module_identifier__ = null
49311-
var Component = normalizeComponent(
49312-
__vue_script__,
49313-
__vue_template__,
49314-
__vue_template_functional__,
49315-
__vue_styles__,
49316-
__vue_scopeId__,
49317-
__vue_module_identifier__
49318-
)
49319-
Component.options.__file = "resources/js/components/ExampleComponent.vue"
49320-
49321-
/* hot reload */
49322-
if (false) {(function () {
49323-
var hotAPI = require("vue-hot-reload-api")
49324-
hotAPI.install(require("vue"), false)
49325-
if (!hotAPI.compatible) return
49326-
module.hot.accept()
49327-
if (!module.hot.data) {
49328-
hotAPI.createRecord("data-v-299e239e", Component.options)
49329-
} else {
49330-
hotAPI.reload("data-v-299e239e", Component.options)
49331-
}
49332-
module.hot.dispose(function (data) {
49333-
disposed = true
49334-
})
49335-
})()}
49336-
49337-
module.exports = Component.exports
49338-
49339-
49340-
/***/ }),
49295+
/* 41 */,
4934149296
/* 42 */
4934249297
/***/ (function(module, exports) {
4934349298

@@ -49447,7 +49402,90 @@ module.exports = function normalizeComponent (
4944749402

4944849403

4944949404
/***/ }),
49450-
/* 43 */
49405+
/* 43 */,
49406+
/* 44 */
49407+
/***/ (function(module, exports) {
49408+
49409+
// removed by extract-text-webpack-plugin
49410+
49411+
/***/ }),
49412+
/* 45 */,
49413+
/* 46 */,
49414+
/* 47 */,
49415+
/* 48 */,
49416+
/* 49 */,
49417+
/* 50 */,
49418+
/* 51 */,
49419+
/* 52 */,
49420+
/* 53 */,
49421+
/* 54 */,
49422+
/* 55 */,
49423+
/* 56 */,
49424+
/* 57 */,
49425+
/* 58 */,
49426+
/* 59 */,
49427+
/* 60 */,
49428+
/* 61 */,
49429+
/* 62 */,
49430+
/* 63 */,
49431+
/* 64 */,
49432+
/* 65 */,
49433+
/* 66 */,
49434+
/* 67 */,
49435+
/* 68 */,
49436+
/* 69 */,
49437+
/* 70 */,
49438+
/* 71 */,
49439+
/* 72 */,
49440+
/* 73 */,
49441+
/* 74 */
49442+
/***/ (function(module, exports, __webpack_require__) {
49443+
49444+
var disposed = false
49445+
var normalizeComponent = __webpack_require__(42)
49446+
/* script */
49447+
var __vue_script__ = __webpack_require__(75)
49448+
/* template */
49449+
var __vue_template__ = __webpack_require__(76)
49450+
/* template functional */
49451+
var __vue_template_functional__ = false
49452+
/* styles */
49453+
var __vue_styles__ = null
49454+
/* scopeId */
49455+
var __vue_scopeId__ = null
49456+
/* moduleIdentifier (server only) */
49457+
var __vue_module_identifier__ = null
49458+
var Component = normalizeComponent(
49459+
__vue_script__,
49460+
__vue_template__,
49461+
__vue_template_functional__,
49462+
__vue_styles__,
49463+
__vue_scopeId__,
49464+
__vue_module_identifier__
49465+
)
49466+
Component.options.__file = "resources/js/components/ExampleComponent.vue"
49467+
49468+
/* hot reload */
49469+
if (false) {(function () {
49470+
var hotAPI = require("vue-hot-reload-api")
49471+
hotAPI.install(require("vue"), false)
49472+
if (!hotAPI.compatible) return
49473+
module.hot.accept()
49474+
if (!module.hot.data) {
49475+
hotAPI.createRecord("data-v-299e239e", Component.options)
49476+
} else {
49477+
hotAPI.reload("data-v-299e239e", Component.options)
49478+
}
49479+
module.hot.dispose(function (data) {
49480+
disposed = true
49481+
})
49482+
})()}
49483+
49484+
module.exports = Component.exports
49485+
49486+
49487+
/***/ }),
49488+
/* 75 */
4945149489
/***/ (function(module, __webpack_exports__, __webpack_require__) {
4945249490

4945349491
"use strict";
@@ -49476,7 +49514,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
4947649514
});
4947749515

4947849516
/***/ }),
49479-
/* 44 */
49517+
/* 76 */
4948049518
/***/ (function(module, exports, __webpack_require__) {
4948149519

4948249520
var render = function() {
@@ -49518,11 +49556,5 @@ if (false) {
4951849556
}
4951949557
}
4952049558

49521-
/***/ }),
49522-
/* 45 */
49523-
/***/ (function(module, exports) {
49524-
49525-
// removed by extract-text-webpack-plugin
49526-
4952749559
/***/ })
4952849560
/******/ ]);

resources/sass/_styles.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
}
55
}
66

7+
@media (min-width: 992px) {
8+
.sidebar-minimized .sidebar .sidebar-nav {
9+
overflow-x: hidden;
10+
overflow-y: auto;
11+
}
12+
}
13+
714
.app-header {
815
padding: 0;
916
.dropdown-menu {
@@ -14,3 +21,11 @@
1421
}
1522
}
1623
}
24+
25+
.input-group-text {
26+
background-color: transparent;
27+
}
28+
29+
.card-header {
30+
background-color: transparent;
31+
}

resources/views/auth/login.blade.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<div class="row justify-content-center">
77
<div class="col-md-8">
88
<div class="card-group">
9-
<div class="card p-4">
10-
<div class="card-body">
9+
<div class="card">
10+
<div class="card-body p-5">
1111
<div class="text-center d-lg-none">
1212
<img src="svg/modulr.svg" class="mb-5" width="150" alt="Modulr Logo">
1313
</div>
@@ -62,12 +62,14 @@
6262
{{ __('Forgot Your Password?') }}
6363
</a>
6464
</div>
65-
<div class="col-12 text-right mt-3 d-lg-none">
66-
<a class="btn btn-outline-primary btn-block mt-3" href="{{ route('register') }}">{{ __('Register') }}</a>
67-
</div>
6865
</div>
6966
</form>
7067
</div>
68+
<div class="card-footer p-4 d-lg-none">
69+
<div class="col-12 text-right">
70+
<a class="btn btn-outline-primary btn-block mt-3" href="{{ route('register') }}">{{ __('Register') }}</a>
71+
</div>
72+
</div>
7173
</div>
7274
<div class="card text-white bg-primary py-5 d-md-down-none">
7375
<div class="card-body text-center">

resources/views/home.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@section('content')
1212
<div class="py-4">
1313
<div class="row justify-content-center">
14-
<div class="col-md-8">
14+
<div class="col-md-12">
1515
<div class="card">
1616
<div class="card-header">Dashboard</div>
1717

resources/views/layouts/header.blade.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
</button>
1212
<ul class="nav navbar-nav ml-auto mr-2">
1313
<li class="nav-item dropdown">
14-
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
15-
<img class="img-avatar" src="img/avatars/1.jpg" alt="{{ Auth::user()->name }}">
14+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
15+
<img class="img-avatar" src="img/avatars/1.jpg">
1616
</a>
1717
<div class="dropdown-menu dropdown-menu-right shadow mt-2">
18+
<a class="dropdown-item">
19+
{{ Auth::user()->name }}<br>
20+
<small class="text-muted">{{ Auth::user()->email }}</small>
21+
</a>
1822
<a class="dropdown-item" href="#">
1923
<i class="fas fa-user"></i> Profile
2024
</a>

resources/views/layouts/sidebar.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<nav class="sidebar-nav">
33
<ul class="nav">
44
<li class="nav-item">
5-
<a class="nav-link" href="#">
5+
<a class="nav-link active" href="#">
66
<i class="nav-icon icon-speedometer"></i> Dashboard
77
</a>
88
</li>

0 commit comments

Comments
 (0)