Altered header to keep search box center

For #2310

diff --git a/readme.md b/readme.md
index dcc9de4a2d2b525b77a90f2d39bab391431604b8..a19341ce4e95dd7769871a137167e9fc90068ec1 100644 (file)
--- 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 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).
 
 
 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 246ef4b5bdabdfba587b93d96b363edd67407808..3e8c676fdb08bd2d3e838cb9ef7c86f4a77abcfd 100644 (file)
--- a/resources/sass/_header.scss
+++ b/resources/sass/_header.scss
@@ -3,7 +3,7 @@
  */
 
 header .grid {
  */
 
 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) {
 }
 
 @include smaller-than($l) {


@@ -77,9 +77,6 @@ header {
 }
 
 
 }
 
 

-.header-search {
-  display: inline-block;
-}

 header .search-box {
   display: inline-block;
   margin-top: 10px;
 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 80e79410a04ff3aeee9c4324ca3978e6b4eabf35..43ac273efb648bce16e451e9634bb3dcc260faa7 100644 (file)
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -13,7 +13,7 @@
             <div class="mobile-menu-toggle hide-over-l">@icon('more')</div>
         </div>
 
             <div class="mobile-menu-toggle hide-over-l">@icon('more')</div>
         </div>
 

-        <div class="header-search hide-under-l">
+        <div class="flex-container-row justify-center hide-under-l">

             @if (hasAppAccess())
             <form action="{{ url('/search') }}" method="GET" class="search-box" role="search">
                 <button id="header-search-box-button" type="submit" aria-label="{{ trans('common.search') }}" tabindex="-1">@icon('search') </button>
             @if (hasAppAccess())
             <form action="{{ url('/search') }}" method="GET" class="search-box" role="search">
                 <button id="header-search-box-button" type="submit" aria-label="{{ trans('common.search') }}" tabindex="-1">@icon('search') </button>