Skip to content

Commit 6dc351d

Browse files
committed
refactor: improve layout
1 parent 985b95f commit 6dc351d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+119
-196
lines changed

src/js/colors.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ for (const element of document.querySelectorAll('.theme-color')) {
1414
table.innerHTML = `
1515
<table class="w-100">
1616
<tr>
17-
<td class="text-muted">HEX:</td>
17+
<td class="text-body-secondary">HEX:</td>
1818
<td class="font-weight-bold">${coreui.Utils.rgbToHex(color)}</td>
1919
</tr>
2020
<tr>
21-
<td class="text-muted">RGB:</td>
21+
<td class="text-body-secondary">RGB:</td>
2222
<td class="font-weight-bold">${color}</td>
2323
</tr>
2424
</table>

src/pug/_partials/header.pug

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ header.header.header-sticky.mb-4
5757
.avatar.avatar-md
5858
img.avatar-img(src="assets/img/avatars/8.jpg" alt="[email protected]")
5959
.dropdown-menu.dropdown-menu-end.pt-0
60-
.dropdown-header.bg-body-tertiary.rounded-top
61-
.fw-semibold Account
60+
.dropdown-header.bg-body-tertiary.text-body-secondary.fw-semibold.rounded-top Account
6261
a.dropdown-item(href="#")
6362
svg.icon.me-2
6463
use(xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell")
@@ -83,7 +82,7 @@ header.header.header-sticky.mb-4
8382
|
8483
| Comments
8584
span.badge.badge-sm.bg-warning.ms-2 42
86-
.dropdown-header.bg-body-tertiary
85+
.dropdown-header.bg-body-tertiary.text-body-secondary.fw-semibold.bg-body-tertiary
8786
.fw-semibold Settings
8887
a.dropdown-item(href="#")
8988
svg.icon.me-2

src/pug/_partials/sidebar.pug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.sidebar.sidebar-fixed.border-end.sidebar-dark#sidebar
22
.sidebar-header.border-bottom
33
.sidebar-brand
4-
svg.sidebar-brand-full(width="88" height="32" alt="CoreUI Logo")
4+
svg.sidebar-brand-full(width="88" height="32" alt="CoreUI Logo" style="margin-left:3px")
55
use(xlink:href="assets/brand/coreui.svg#full")
66
|
77
svg.sidebar-brand-narrow(width="32" height="32" alt="CoreUI Logo")

src/views/base/accordion.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/breadcrumb.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/cards.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/carousel.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/collapse.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/list-group.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/navs-tabs.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

src/views/base/pagination.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<div class="sidebar sidebar-fixed border-end sidebar-dark" id="sidebar">
4949
<div class="sidebar-header border-bottom">
5050
<div class="sidebar-brand">
51-
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo">
51+
<svg class="sidebar-brand-full" width="88" height="32" alt="CoreUI Logo" style="margin-left:3px">
5252
<use xlink:href="assets/brand/coreui.svg#full"></use>
5353
</svg>
5454
<svg class="sidebar-brand-narrow" width="32" height="32" alt="CoreUI Logo">
@@ -252,9 +252,7 @@
252252
<li class="nav-item dropdown"><a class="nav-link py-0" data-coreui-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
253253
<div class="avatar avatar-md"><img class="avatar-img" src="assets/img/avatars/8.jpg" alt="[email protected]"></div></a>
254254
<div class="dropdown-menu dropdown-menu-end pt-0">
255-
<div class="dropdown-header bg-body-tertiary rounded-top">
256-
<div class="fw-semibold">Account</div>
257-
</div><a class="dropdown-item" href="#">
255+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold rounded-top">Account</div><a class="dropdown-item" href="#">
258256
<svg class="icon me-2">
259257
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-bell"></use>
260258
</svg> Updates<span class="badge badge-sm bg-info ms-2">42</span></a><a class="dropdown-item" href="#">
@@ -267,7 +265,7 @@
267265
<svg class="icon me-2">
268266
<use xlink:href="node_modules/@coreui/icons/sprites/free.svg#cil-comment-square"></use>
269267
</svg> Comments<span class="badge badge-sm bg-warning ms-2">42</span></a>
270-
<div class="dropdown-header bg-body-tertiary">
268+
<div class="dropdown-header bg-body-tertiary text-body-secondary fw-semibold bg-body-tertiary">
271269
<div class="fw-semibold">Settings</div>
272270
</div><a class="dropdown-item" href="#">
273271
<svg class="icon me-2">

0 commit comments

Comments
 (0)