From 4f96cd91648a4f50aa691d7c26c1fd09f66838e6 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 4 Feb 2021 23:11:55 +0000 Subject: [PATCH] Altered header to keep search box center For #2310 --- readme.md | 2 +- resources/sass/_header.scss | 5 +---- resources/views/common/header.blade.php | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/readme.md b/readme.md index dcc9de4a2..a19341ce4 100644 --- a/readme.md +++ b/readme.md @@ -122,7 +122,7 @@ Feel free to create issues to request new features or to report bugs & problems. Pull requests are welcome. Unless a small tweak or language update, It may be best to open the pull request early or create an issue for your intended change to discuss how it will fit in to the project and plan out the merge. Just because a feature request exists, or is tagged, does not mean that feature would be accepted into the core project. -Pull requests should be created from the `master` branch since they will be merged back into `master` once done. Please do not build from or request a merge into the `release` branch as this is only for publishing releases. If you are looking to alter CSS or JavaScript content please edit the source files found in `resources/assets`. Any CSS or JS files within `public` are built from these source files and therefore should not be edited directly. +Pull requests should be created from the `master` branch since they will be merged back into `master` once done. Please do not build from or request a merge into the `release` branch as this is only for publishing releases. If you are looking to alter CSS or JavaScript content please edit the source files found in `resources/`. Any CSS or JS files within `public` are built from these source files and therefore should not be edited directly. The project's code of conduct [can be found here](https://github.com/BookStackApp/BookStack/blob/master/.github/CODE_OF_CONDUCT.md). diff --git a/resources/sass/_header.scss b/resources/sass/_header.scss index 246ef4b5b..3e8c676fd 100644 --- a/resources/sass/_header.scss +++ b/resources/sass/_header.scss @@ -3,7 +3,7 @@ */ header .grid { - grid-template-columns: auto min-content auto; + grid-template-columns: minmax(max-content, 2fr) 1fr minmax(max-content, 2fr); } @include smaller-than($l) { @@ -77,9 +77,6 @@ header { } -.header-search { - display: inline-block; -} header .search-box { display: inline-block; margin-top: 10px; diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php index 80e79410a..43ac273ef 100644 --- a/resources/views/common/header.blade.php +++ b/resources/views/common/header.blade.php @@ -13,7 +13,7 @@
@icon('more')
-