diff --git a/public/favicon.ico b/public/favicon.ico index e69de29..21f408d 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon.png b/public/favicon.png index e69de29..84f9236 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/img/logo.png b/public/img/logo.png new file mode 100644 index 0000000..b541e47 Binary files /dev/null and b/public/img/logo.png differ diff --git a/resources/assets/less/elements/nav.less b/resources/assets/less/elements/nav.less index 9ba693f..28ddfe3 100644 --- a/resources/assets/less/elements/nav.less +++ b/resources/assets/less/elements/nav.less @@ -1,3 +1,39 @@ -nav { +nav.navbar { + background-color: @c_base; z-index: 1; + + .navbar-logo { + top: 25px; + left: 15px; + width: 150px; + height: 150px; + background-image: url('/img/logo.png'); + background-size: contain; + background-position: center center; + background-repeat: no-repeat; + } + + #navbar { + box-shadow: none; + border: none; + + ul.nav { + li { + a { + color: @c_text_light; + font-weight: bold; + text-decoration: none; + } + + &:hover a { color: @c_text; } + &.active a { color: @c_text; } + &.active a, &.active:hover a, &:hover a, &:focus a { background-color: transparent; } + } + } + } + + .navbar-toggle { + border: none; + &, &:hover, &:focus { background-color: transparent; } + } } diff --git a/resources/assets/less/var.less b/resources/assets/less/var.less index e90b3a7..6a410d4 100644 --- a/resources/assets/less/var.less +++ b/resources/assets/less/var.less @@ -4,6 +4,8 @@ | */ -@c_text: #111; // text colour -@c_base: #0088cc; // base colour -@c_accent: #f5f5f5; // accent colour +// Colours +@c_text: #111; // text +@c_text_light: #fff; // light text +@c_base: #0088cc; // base +@c_accent: #f5f5f5; // accent diff --git a/resources/views/elements/nav.blade.php b/resources/views/elements/nav.blade.php index a333a2d..9f8bccb 100644 --- a/resources/views/elements/nav.blade.php +++ b/resources/views/elements/nav.blade.php @@ -7,26 +7,13 @@ - Hypothetical Creations +