diff --git a/public/partials/nav-do.html b/public/partials/nav-do.html index fd6fe26..dd9eb95 100644 --- a/public/partials/nav-do.html +++ b/public/partials/nav-do.html @@ -6,6 +6,29 @@
diff --git a/resources/scss/layout/_do.scss b/resources/scss/layout/_do.scss index 230aa7b..189e335 100644 --- a/resources/scss/layout/_do.scss +++ b/resources/scss/layout/_do.scss @@ -73,19 +73,44 @@ body.layout-do { .menu { padding: 10px 0; - .logo { - background-color: #e5e5e5; - border-radius: 3px; - width: 47px; - height: 47px; - position: relative; - margin-right: 20px; + .navbar { + padding: 0; - svg { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-45%, -50%); + .navbar-brand { + display: inline-block; + background-color: #e5e5e5; + border-radius: 3px; + width: 47px; + height: 47px; + position: relative; + margin-right: 20px; + + svg { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-45%, -50%); + } + } + + .nav-item { + font-size: 14px; + line-height: 24px; + font-weight: 600; + margin-right: 30px; + + &.active { + font-size: 24px; + font-weight: 700; + + .nav-link { + color: #99a1b3; + } + } + + .nav-link { + color: #031b4e; + } } } } diff --git a/resources/scss/vendor/_bootstrap.scss b/resources/scss/vendor/_bootstrap.scss index 2e0797c..80a0219 100644 --- a/resources/scss/vendor/_bootstrap.scss +++ b/resources/scss/vendor/_bootstrap.scss @@ -16,7 +16,7 @@ @import '../../../node_modules/bootstrap/scss/input-group'; @import '../../../node_modules/bootstrap/scss/custom-forms'; @import '../../../node_modules/bootstrap/scss/nav'; -// @import '../../../node_modules/bootstrap/scss/navbar'; +@import '../../../node_modules/bootstrap/scss/navbar'; @import '../../../node_modules/bootstrap/scss/card'; // @import '../../../node_modules/bootstrap/scss/breadcrumb'; // @import '../../../node_modules/bootstrap/scss/pagination';