diff --git a/public/bookstack.svg b/public/bookstack.svg deleted file mode 100644 index 67c278901..000000000 --- a/public/bookstack.svg +++ /dev/null @@ -1 +0,0 @@ -BookStack \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico index d986013b8..41655ccba 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 000000000..6e14c8c8a Binary files /dev/null and b/public/logo.png differ diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index b011fe129..adc1df197 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -53,10 +53,10 @@ form.search-box { text-align: left; input { background-color: transparent; - border-radius: 0; - border: none; - border-bottom: 2px solid #EEE; + border-radius: 24px; + border: 2px solid #EEE; color: #EEE; + padding-left: $-m; padding-right: $-l; outline: 0; } @@ -64,8 +64,8 @@ form.search-box { vertical-align: top; margin-left: -$-l; color: #FFF; - top: 0; - right: 0; + top: 6px; + right: 4px; display: inline-block; position: absolute; &:hover { @@ -75,6 +75,13 @@ form.search-box { } .logo { + display: inline-block; + &:hover { + color: #FFF; + text-decoration: none; + } +} +.logo-text { display: inline-block; font-size: 1.8em; color: #fff; @@ -82,10 +89,11 @@ form.search-box { padding: $-l $-l $-l 0; vertical-align: top; line-height: 1; - &:hover { - color: #FFF; - text-decoration: none; - } +} +.logo-image { + padding: $-m $-s $-m 0; + vertical-align: top; + height: 75px; } .dropdown-container { diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 3f730ef38..39bbfee32 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -40,7 +40,10 @@