webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-06 12:02:45 +03:00
Code Activity

Updated header design

Browse Source
This commit is contained in:
Dan Brown
2017-08-19 15:33:22 +01:00
parent 666c86b108
commit 28a9bd514f
9 changed files with 74 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/views/base.blade.php
View File

@@ -36,7 +36,7 @@
<header id="header">
<div class="container">
<div class="row">
<div class="col-lg-4 col-sm-4" ng-non-bindable>
<div class="col-sm-4" ng-non-bindable>
<a href="{{ baseUrl('/') }}" class="logo">
@if(setting('app-logo', '') !== 'none')
<img class="logo-image" src="{{ setting('app-logo', '') === '' ? baseUrl('/logo.png') : baseUrl(setting('app-logo', '')) }}" alt="Logo">
@@ -46,14 +46,14 @@
@endif
</a>
</div>
<div class="col-lg-4 col-sm-3 text-center">
<form action="{{ baseUrl('/search') }}" method="GET" class="search-box">
<input id="header-search-box-input" type="text" name="term" tabindex="2" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
<button id="header-search-box-button" type="submit" class="text-button"><i class="zmdi zmdi-search"></i></button>
</form>
</div>
<div class="col-lg-4 col-sm-5">
<div class="col-sm-8">
<div class="float right">
<div class="header-search">
<form action="{{ baseUrl('/search') }}" method="GET" class="search-box">
<button id="header-search-box-button" type="submit"><i class="zmdi zmdi-search"></i> </button>
<input id="header-search-box-input" type="text" name="term" tabindex="2" placeholder="{{ trans('common.search') }}" value="{{ isset($searchTerm) ? $searchTerm : '' }}">
</form>
</div>
<div class="links text-center">
<a href="{{ baseUrl('/books') }}"><i class="zmdi zmdi-book"></i>{{ trans('entities.books') }}</a>
@if(signedInUser() && userCan('settings-manage'))

12
resources/views/books/show.blade.php
View File

@@ -111,13 +111,11 @@
</p>
@endif
<div class="search-box">
<form v-on:submit.prevent="searchBook">
<input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.books_search_this') }}">
<button type="submit"><i class="zmdi zmdi-search"></i></button>
<button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
</form>
</div>
<form v-on:submit.prevent="searchBook" class="search-box">
<input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.books_search_this') }}">
<button type="submit"><i class="zmdi zmdi-search"></i></button>
<button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
</form>
<div class="activity">
<h3>{{ trans('entities.recent_activity') }}</h3>

12
resources/views/chapters/show.blade.php
View File

@@ -115,13 +115,11 @@
</div>
@endif
<div class="search-box">
<form v-on:submit.prevent="searchBook">
<input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.chapters_search_this') }}">
<button type="submit"><i class="zmdi zmdi-search"></i></button>
<button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
</form>
</div>
<form v-on:submit.prevent="searchBook" class="search-box">
<input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.chapters_search_this') }}">
<button type="submit"><i class="zmdi zmdi-search"></i></button>
<button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
</form>
@include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree])

2
resources/views/components/image-picker.blade.php
View File

@@ -43,7 +43,7 @@
}
if (action === 'show-image-manager') {
window.ImageManager.showExternal((image) => {
window.ImageManager.show((image) => {
if (!resize) {
setImage(image);
return;

2
resources/views/partials/custom-styles.blade.php
View File

@@ -1,4 +1,5 @@
<style id="custom-styles" data-color="{{ setting('app-color') }}" data-color-light="{{ setting('app-color-light') }}">
@if(setting('app-color'))
header, [back-to-top], .primary-background {
background-color: {{ setting('app-color') }} !important;
}
@@ -17,4 +18,5 @@
.text-primary, p.primary, p .primary, span.primary:hover, .text-primary:hover, a, a:hover, a:focus, .text-button, .text-button:hover, .text-button:focus {
color: {{ setting('app-color') }};
}
@endif
</style>