Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up old toolbar usage

Browse Source
This commit is contained in:
Dan Brown 2019-04-06 17:43:44 +01:00
parent 745a0bb98d
commit 67ed4710b6
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
10 changed files with 4 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/assets/sass/_header.scss
View File

@ -284,13 +284,6 @@ header .search-box {
padding: $-s;
}
.faded-small {
color: #000;
fill: #000;
font-size: 0.9em;
background-color: $primary-faded;
}
.toolbar {
position: relative;
> .grid > div {
@ -361,6 +354,3 @@ header .search-box {
}
}
}
.faded-small .nav-tabs a {
padding: $-s $-m;
}

4
resources/assets/sass/_pages.scss
View File

@ -4,9 +4,7 @@
align-items: stretch;
overflow: hidden;
background-color: #FFF;
.faded-small {
height: auto;
}
.edit-area {
flex: 1;
flex-direction: column;

4
resources/assets/sass/print-styles.scss
View File

@ -8,10 +8,6 @@ body {
font-size: 12px;
}
.faded-small {
display: none;
}
.page-content {
margin: 0 auto;
}

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

@ -11,7 +11,7 @@
<div class="image-manager-content">
<div v-if="imageType === 'gallery'" class="container">
<div class="image-manager-header row faded-small nav-tabs">
<div class="image-manager-header primary-background-light row nav-tabs">
<div class="col-xs-4 tab-item" title="{{ trans('components.image_all_title') }}" :class="{selected: (view=='all')}" @click="setView('all')">@icon('images') {{ trans('components.image_all') }}</div>
<div class="col-xs-4 tab-item" title="{{ trans('components.image_book_title') }}" :class="{selected: (view=='book')}" @click="setView('book')">@icon('book', ['class' => 'text-book svg-icon']) {{ trans('entities.book') }}</div>
<div class="col-xs-4 tab-item" title="{{ trans('components.image_page_title') }}" :class="{selected: (view=='page')}" @click="setView('page')">@icon('page', ['class' => 'text-page svg-icon']) {{ trans('entities.page') }}</div>

2
resources/views/pages/form.blade.php
View File

@ -11,7 +11,7 @@
{{ csrf_field() }}
{{--Header Bar--}}
<div class="faded-small toolbar">
<div class="primary-background-light toolbar">
<div class="grid third v-center">
<div class="action-buttons text-left px-m py-xs">

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

@ -2,7 +2,7 @@
header, [back-to-top], .primary-background {
background-color: {{ setting('app-color') }} !important;
}
.faded-small, .primary-background-light {
.primary-background-light {
background-color: {{ setting('app-color-light') }};
}
.button-base, .button, input[type="button"], input[type="submit"] {

28
resources/views/search/entity-search-list.blade.php
View File

@ -1,28 +0,0 @@
@extends('base')
@section('content')
<div class="faded-small toolbar">
<div class="container">
<div class="row">
<div class="col-sm-12 faded">
<div class="breadcrumbs">
<a href="{{ baseUrl("/search/all?term={$searchTerm}") }}" class="text-button">@icon('search'){{ $searchTerm }}</a>
</div>
</div>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-sm-7">
<h1>{{ $title }}</h1>
@include('partials.entity-list', ['entities' => $entities, 'style' => 'detailed'])
{!! $entities->links() !!}
</div>
</div>
</div>
@stop

28
resources/views/sidebar-layout.blade.php
View File

@ -1,28 +0,0 @@
@extends('base')
@section('body-class', 'sidebar-layout')
@section('content')
<div class="toolbar px-xl py-m">
@yield('toolbar')
</div>
<div class="flex-fill flex" @yield('container-attrs') >
<div sidebar class="sidebar flex print-hidden" id="sidebar">
<div class="sidebar-toggle primary-background-light">@icon('caret-right-circle')
</div>
<div class="scroll-body px-xl">
@yield('sidebar')
</div>
</div>
<div class="mr-xl flex @yield('body-wrap-classes')">
@yield('body')
</div>
</div>
@stop

7
resources/views/simple-layout.blade.php
View File

@ -1,13 +1,7 @@
@extends('base')
@section('body-class', 'shaded')
@section('content')
<div class="toolbar-container">
@yield('toolbar')
</div>
<div class="flex-fill flex">
<div class="content flex">
<div class="scroll-body">
@ -16,5 +10,4 @@
</div>
</div>
@stop

5
resources/views/tri-layout.blade.php
View File

@ -4,11 +4,6 @@
@section('content')
{{--<div class="toolbar px-xl">--}}
{{--@yield('toolbar')--}}
{{--</div>--}}
{{--TODO - Cleanup toolbar usage--}}
<div class="tri-layout-container" tri-layout @yield('container-attrs') >
<div class="tri-layout-left print-hidden pt-m" id="sidebar">