Skip to content

Commit d43b412

Browse files
committed
improvements
1 parent 412f8e7 commit d43b412

File tree

22 files changed

+410
-595
lines changed

22 files changed

+410
-595
lines changed

AJAX_Full_Project_GULP/css/style.css

Lines changed: 44 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,15 @@
66
* @license MIT
77
*/
88
/*!
9-
* Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com)
9+
* Bootstrap v4.0.0-beta (https://getbootstrap.com)
1010
* Copyright 2011-2017 The Bootstrap Authors
1111
* Copyright 2011-2017 Twitter, Inc.
1212
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
1313
*/
1414
@media print {
1515
*,
1616
*::before,
17-
*::after,
18-
p::first-letter,
19-
div::first-letter,
20-
blockquote::first-letter,
21-
li::first-letter,
22-
p::first-line,
23-
div::first-line,
24-
blockquote::first-line,
25-
li::first-line {
17+
*::after {
2618
text-shadow: none !important;
2719
box-shadow: none !important; }
2820
a,
@@ -494,30 +486,28 @@ pre {
494486
margin-right: auto;
495487
margin-left: auto;
496488
padding-right: 15px;
497-
padding-left: 15px; }
489+
padding-left: 15px;
490+
width: 100%; }
498491
@media (min-width: 576px) {
499492
.container {
500-
width: 540px;
501-
max-width: 100%; } }
493+
max-width: 540px; } }
502494
@media (min-width: 768px) {
503495
.container {
504-
width: 720px;
505-
max-width: 100%; } }
496+
max-width: 720px; } }
506497
@media (min-width: 992px) {
507498
.container {
508-
width: 960px;
509-
max-width: 100%; } }
499+
max-width: 960px; } }
510500
@media (min-width: 1200px) {
511501
.container {
512-
width: 1140px;
513-
max-width: 100%; } }
502+
max-width: 1140px; } }
514503

515504
.container-fluid {
516505
width: 100%;
517506
margin-right: auto;
518507
margin-left: auto;
519508
padding-right: 15px;
520-
padding-left: 15px; }
509+
padding-left: 15px;
510+
width: 100%; }
521511

522512
.row {
523513
display: flex;
@@ -1718,7 +1708,8 @@ fieldset[disabled] a.btn {
17181708
.btn-link, .btn-link:active, .btn-link.active, .btn-link:disabled {
17191709
background-color: transparent; }
17201710
.btn-link, .btn-link:focus, .btn-link:active {
1721-
border-color: transparent; }
1711+
border-color: transparent;
1712+
box-shadow: none; }
17221713
.btn-link:hover {
17231714
border-color: transparent; }
17241715
.btn-link:focus, .btn-link:hover {
@@ -1793,6 +1784,10 @@ tbody.collapse.show {
17931784
.dropdown-toggle:empty::after {
17941785
margin-left: 0; }
17951786

1787+
.dropup .dropdown-menu {
1788+
margin-top: 0;
1789+
margin-bottom: 0.125rem; }
1790+
17961791
.dropup .dropdown-toggle::after {
17971792
border-top: 0;
17981793
border-bottom: 0.3em solid; }
@@ -2233,12 +2228,6 @@ tbody.collapse.show {
22332228
flex-wrap: wrap;
22342229
align-items: center;
22352230
justify-content: space-between; }
2236-
@media (max-width: 575px) {
2237-
.navbar > .container,
2238-
.navbar > .container-fluid {
2239-
width: 100%;
2240-
margin-right: 0;
2241-
margin-left: 0; } }
22422231

22432232
.navbar-brand {
22442233
display: inline-block;
@@ -2270,7 +2259,8 @@ tbody.collapse.show {
22702259
padding-bottom: 0.5rem; }
22712260

22722261
.navbar-collapse {
2273-
flex-basis: 100%; }
2262+
flex-basis: 100%;
2263+
align-items: center; }
22742264

22752265
.navbar-toggler {
22762266
padding: 0.25rem 0.75rem;
@@ -3612,6 +3602,9 @@ a.bg-light:focus, a.bg-light:hover {
36123602
a.bg-dark:focus, a.bg-dark:hover {
36133603
background-color: #151b1f !important; }
36143604

3605+
.bg-white {
3606+
background-color: #fff !important; }
3607+
36153608
.bg-transparent {
36163609
background-color: transparent !important; }
36173610

@@ -3657,6 +3650,9 @@ a.bg-dark:focus, a.bg-dark:hover {
36573650
.border-dark {
36583651
border-color: #29363d !important; }
36593652

3653+
.border-white {
3654+
border-color: #fff !important; }
3655+
36603656
.rounded {
36613657
border-radius: 0.25rem !important; }
36623658

@@ -5538,7 +5534,7 @@ a.text-dark:focus, a.text-dark:hover {
55385534
color: #151b1f !important; }
55395535

55405536
.text-muted {
5541-
color: #869fac !important; }
5537+
color: #536c79 !important; }
55425538

55435539
.text-hide {
55445540
font: 0/0 a;
@@ -7004,15 +7000,14 @@ base-chart.chart {
70047000
.dropdown-menu-lg {
70057001
width: 250px; }
70067002

7007-
.navbar-nav .dropdown-menu {
7008-
position: absolute;
7009-
float: none; }
7003+
.app-header .navbar-nav .dropdown-menu {
7004+
position: absolute; }
70107005

7011-
.dropdown-menu-right {
7006+
.app-header .navbar-nav .dropdown-menu-right {
70127007
right: 0;
70137008
left: auto; }
70147009

7015-
.dropdown-menu-left {
7010+
.app-header .navbar-nav .dropdown-menu-left {
70167011
right: auto;
70177012
left: 0; }
70187013

@@ -7255,8 +7250,8 @@ base-chart.chart {
72557250
position: relative;
72567251
flex-direction: row;
72577252
height: 55px;
7258-
margin: 0;
72597253
padding: 0;
7254+
margin: 0;
72607255
background-color: #fff;
72617256
border-bottom: 1px solid #c2cfd6; }
72627257
.app-header.navbar .navbar-brand {
@@ -7286,8 +7281,8 @@ base-chart.chart {
72867281
.app-header.navbar .nav-item .nav-link, .app-header.navbar .nav-item .dropdown-toggle {
72877282
padding-top: 0;
72887283
padding-bottom: 0;
7289-
border: 0;
7290-
background: 0; }
7284+
background: 0;
7285+
border: 0; }
72917286
.app-header.navbar .nav-item .nav-link .badge, .app-header.navbar .nav-item .dropdown-toggle .badge {
72927287
position: absolute;
72937288
top: 50%;
@@ -8429,18 +8424,18 @@ app-root {
84298424

84308425
.breadcrumb-fixed .breadcrumb {
84318426
position: fixed;
8432-
z-index: 1018;
84338427
top: 55px;
8428+
right: 0;
84348429
left: 0;
8435-
right: 0; }
8430+
z-index: 1018; }
84368431

84378432
.breadcrumb-fixed .main:nth-child(2) .breadcrumb {
8438-
left: 200px;
8439-
right: 250px; }
8433+
right: 250px;
8434+
left: 200px; }
84408435

84418436
.breadcrumb-fixed .main:first-child .breadcrumb {
8442-
left: 0;
8443-
right: 250px; }
8437+
right: 250px;
8438+
left: 0; }
84448439

84458440
.breadcrumb-fixed .main:last-child .breadcrumb {
84468441
right: 0; }
@@ -8477,23 +8472,14 @@ app-root {
84778472
.app-header {
84788473
position: fixed !important;
84798474
z-index: 1020;
8480-
width: 100%; }
8481-
.app-header .navbar-toggler {
8482-
position: absolute;
8483-
top: 0;
8484-
left: 0;
8485-
width: 70px;
8486-
height: inherit; }
8475+
width: 100%;
8476+
text-align: center; }
84878477
.app-header .navbar-toggler {
84888478
color: #536c79; }
84898479
.app-header .navbar-brand {
8490-
width: 100% !important;
8491-
margin: 0 auto !important; }
8492-
.app-header .navbar-nav {
84938480
position: absolute;
8494-
top: 0;
8495-
right: 15px;
8496-
height: inherit; }
8481+
left: 50%;
8482+
margin-left: -77.5px; }
84978483
.app-body {
84988484
margin-top: 55px; }
84998485
.sidebar {
@@ -8506,8 +8492,6 @@ app-root {
85068492
width: 220px !important; }
85078493
.main, .app-footer {
85088494
margin-left: 0 !important; }
8509-
.aside-menu {
8510-
margin-right: -250px; }
85118495
.sidebar-hidden .sidebar {
85128496
margin-left: -220px; }
85138497
.sidebar-mobile-show .sidebar {
@@ -8519,8 +8503,8 @@ app-root {
85198503
margin-right: -220px !important;
85208504
margin-left: 220px !important; }
85218505
.breadcrumb-fixed .main .breadcrumb {
8522-
left: 0 !important;
8523-
right: 0 !important; } }
8506+
right: 0 !important;
8507+
left: 0 !important; } }
85248508

85258509
hr.transparent {
85268510
border-top: 1px solid transparent; }

AJAX_Full_Project_GULP/scss/core/_dropdown.scss

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,23 @@
4747
.dropdown-menu-lg {
4848
width: 250px;
4949
}
50+
.app-header {
51+
.navbar-nav {
52+
.dropdown-menu {
53+
position: absolute;
54+
}
55+
// Menu positioning
56+
//
57+
// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown
58+
// menu with the parent.
59+
.dropdown-menu-right {
60+
right: 0;
61+
left: auto; // Reset the default from `.dropdown-menu`
62+
}
5063

51-
.navbar-nav {
52-
53-
.dropdown-menu {
54-
position: absolute;
55-
float: none;
64+
.dropdown-menu-left {
65+
right: auto;
66+
left: 0;
67+
}
5668
}
5769
}
58-
59-
// Menu positioning
60-
//
61-
// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown
62-
// menu with the parent.
63-
.dropdown-menu-right {
64-
right: 0;
65-
left: auto; // Reset the default from `.dropdown-menu`
66-
}
67-
68-
.dropdown-menu-left {
69-
right: auto;
70-
left: 0;
71-
}

AJAX_Full_Project_GULP/scss/core/_layout.scss

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77
}
88

9-
// app-dashboard and app-root are Angular2 selectors. You can add here your own selectors if you need.
9+
// app-dashboard and app-root are Angular2+ selectors. You can add here your own selectors if you need.
1010
.app,
1111
app-dashboard,
1212
app-root {
@@ -231,25 +231,25 @@ app-root {
231231

232232
.breadcrumb {
233233
position: fixed;
234-
z-index: $zindex-sticky - 2;
235234
top: $navbar-height;
236-
left: 0;
237235
right: 0;
236+
left: 0;
237+
z-index: $zindex-sticky - 2;
238238
}
239239

240240
// if sidebar + main + aside
241241
.main:nth-child(2) {
242242
.breadcrumb {
243-
left: $sidebar-width;
244243
right: $aside-menu-width;
244+
left: $sidebar-width;
245245
}
246246
}
247247

248248
// if sidebar + main
249249
.main:first-child {
250250
.breadcrumb {
251-
left: 0;
252251
right: $aside-menu-width;
252+
left: 0;
253253
}
254254
}
255255

@@ -320,14 +320,7 @@ app-root {
320320
position: fixed !important;
321321
z-index: $zindex-sticky;
322322
width: 100%;
323-
324-
.navbar-toggler {
325-
position: absolute;
326-
top: 0;
327-
left: 0;
328-
width: 70px;
329-
height: inherit;
330-
}
323+
text-align: center;
331324

332325
.navbar-toggler {
333326
@if (lightness( $navbar-brand-bg ) > 40) {
@@ -338,15 +331,9 @@ app-root {
338331
}
339332

340333
.navbar-brand {
341-
width: 100% !important;
342-
margin: 0 auto !important;
343-
}
344-
345-
.navbar-nav {
346334
position: absolute;
347-
top: 0;
348-
right: 15px;
349-
height: inherit;
335+
left: 50%;
336+
margin-left: - ($navbar-brand-width / 2);
350337
}
351338
}
352339

@@ -370,9 +357,9 @@ app-root {
370357
margin-left: 0 !important;
371358
}
372359

373-
.aside-menu {
374-
margin-right: - $aside-menu-width;
375-
}
360+
// .aside-menu {
361+
// margin-right: - $aside-menu-width;
362+
// }
376363

377364
.sidebar-hidden {
378365
.sidebar {
@@ -399,8 +386,8 @@ app-root {
399386

400387
.breadcrumb-fixed {
401388
.main .breadcrumb {
402-
left: 0 !important;
403389
right: 0 !important;
390+
left: 0 !important;
404391
}
405392
}
406393
}

0 commit comments

Comments
 (0)