From 28a9bd514f65638c78b07380d75dfb01070cff0c Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 19 Aug 2017 15:33:22 +0100 Subject: [PATCH] Updated header design --- public/logo.png | Bin 4682 -> 5415 bytes resources/assets/sass/_buttons.scss | 1 + resources/assets/sass/_forms.scss | 11 +-- resources/assets/sass/_header.scss | 87 ++++++++++-------- resources/views/base.blade.php | 16 ++-- resources/views/books/show.blade.php | 12 +-- resources/views/chapters/show.blade.php | 12 +-- .../views/components/image-picker.blade.php | 2 +- .../views/partials/custom-styles.blade.php | 2 + 9 files changed, 74 insertions(+), 69 deletions(-) diff --git a/public/logo.png b/public/logo.png index 1803feebf53414a98b6d670e4d6746a40b444ddb..585f8895b4f26c872ac9369bd4229811e725b252 100644 GIT binary patch literal 5415 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 diff --git a/resources/assets/sass/_buttons.scss b/resources/assets/sass/_buttons.scss index 8ee7f596a..202eb935b 100644 --- a/resources/assets/sass/_buttons.scss +++ b/resources/assets/sass/_buttons.scss @@ -64,6 +64,7 @@ $button-border-radius: 2px; padding: 0; margin: 0; border: none; + user-select: none; &:focus, &:active { outline: 0; } diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index cf7ea083e..d372359cc 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -248,15 +248,14 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] { border: none; color: $primary; padding: 0; - margin: 0; cursor: pointer; - margin-left: $-s; - } - button[type="submit"] { - margin-left: -$-l; + position: absolute; + left: 7px; + top: 7px; } input { - padding-right: $-l; + display: block; + padding-left: $-l; width: 300px; max-width: 100%; } diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss index ae8dd3ff5..49bd74b07 100644 --- a/resources/assets/sass/_header.scss +++ b/resources/assets/sass/_header.scss @@ -12,7 +12,6 @@ header { padding: $-m; } border-bottom: 1px solid #DDD; - //margin-bottom: $-l; .links { display: inline-block; vertical-align: top; @@ -23,26 +22,27 @@ header { } .links a { display: inline-block; - padding: $-l; + padding: $-m $-l; color: #FFF; &:last-child { padding-right: 0; } @include smaller-than($screen-md) { - padding: $-l $-s; + padding: $-m $-s; } } .avatar, .user-name { display: inline-block; } .avatar { - //margin-top: (45px/2); width: 30px; height: 30px; } .user-name { vertical-align: top; - padding-top: $-l; + padding-top: $-m; + position: relative; + top: -3px; display: inline-block; cursor: pointer; > * { @@ -66,53 +66,57 @@ header { } } } - @include smaller-than($screen-md) { + @include smaller-than($screen-sm) { text-align: center; .float.right { float: none; } - } - @include smaller-than($screen-sm) { .links a { padding: $-s; } - form.search-box { - margin-top: 0; - } .user-name { padding-top: $-s; } } - .dropdown-container { - font-size: 0.9em; +} + +.header-search { + display: inline-block; +} +header .search-box { + display: inline-block; + margin-top: $-s; + input { + background-color: rgba(0, 0, 0, 0.2); + border: 1px solid rgba(255, 255, 255, 0.3); + color: #EEE; + } + button { + color: #EEE; + } + ::-webkit-input-placeholder { /* Chrome/Opera/Safari */ + color: #DDD; + } + ::-moz-placeholder { /* Firefox 19+ */ + color: #DDD; + } + :-ms-input-placeholder { /* IE 10+ */ + color: #DDD; + } + :-moz-placeholder { /* Firefox 18- */ + color: #DDD; + } + @include smaller-than($screen-lg) { + max-width: 250px; + } + @include smaller-than($l) { + max-width: 200px; } } -form.search-box { - margin-top: $-l *0.9; - display: inline-block; - position: relative; - text-align: left; - input { - background-color: transparent; - border-radius: 24px; - border: 2px solid #EEE; - color: #EEE; - padding-left: $-m; - padding-right: $-l; - outline: 0; - } - button { - vertical-align: top; - margin-left: -$-l; - color: #FFF; - top: 6px; - right: 4px; - display: inline-block; - position: absolute; - &:hover { - color: #FFF; - } +@include smaller-than($s) { + .header-search { + display: block; } } @@ -128,12 +132,12 @@ form.search-box { font-size: 1.8em; color: #fff; font-weight: 400; - padding: $-l $-l $-l 0; + padding: 14px $-l 14px 0; vertical-align: top; line-height: 1; } .logo-image { - margin: $-m $-s $-m 0; + margin: $-xs $-s $-xs 0; vertical-align: top; height: 43px; } @@ -227,4 +231,7 @@ form.search-box { border-bottom: 2px solid $primary; } } +} +.faded-small .nav-tabs a { + padding: $-s $-m; } \ No newline at end of file diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index b1cacf08c..1c972e4fb 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -36,7 +36,7 @@