mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-25 11:45:58 +00:00
Cleaned up old toolbar usage
This commit is contained in:
parent
745a0bb98d
commit
67ed4710b6
@ -284,13 +284,6 @@ header .search-box {
|
|||||||
padding: $-s;
|
padding: $-s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.faded-small {
|
|
||||||
color: #000;
|
|
||||||
fill: #000;
|
|
||||||
font-size: 0.9em;
|
|
||||||
background-color: $primary-faded;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toolbar {
|
.toolbar {
|
||||||
position: relative;
|
position: relative;
|
||||||
> .grid > div {
|
> .grid > div {
|
||||||
@ -361,6 +354,3 @@ header .search-box {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.faded-small .nav-tabs a {
|
|
||||||
padding: $-s $-m;
|
|
||||||
}
|
|
@ -4,9 +4,7 @@
|
|||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background-color: #FFF;
|
background-color: #FFF;
|
||||||
.faded-small {
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
.edit-area {
|
.edit-area {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
@ -8,10 +8,6 @@ body {
|
|||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.faded-small {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.page-content {
|
.page-content {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<div class="image-manager-content">
|
<div class="image-manager-content">
|
||||||
<div v-if="imageType === 'gallery'" class="container">
|
<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_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_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>
|
<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>
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
{{ csrf_field() }}
|
{{ csrf_field() }}
|
||||||
|
|
||||||
{{--Header Bar--}}
|
{{--Header Bar--}}
|
||||||
<div class="faded-small toolbar">
|
<div class="primary-background-light toolbar">
|
||||||
<div class="grid third v-center">
|
<div class="grid third v-center">
|
||||||
|
|
||||||
<div class="action-buttons text-left px-m py-xs">
|
<div class="action-buttons text-left px-m py-xs">
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
header, [back-to-top], .primary-background {
|
header, [back-to-top], .primary-background {
|
||||||
background-color: {{ setting('app-color') }} !important;
|
background-color: {{ setting('app-color') }} !important;
|
||||||
}
|
}
|
||||||
.faded-small, .primary-background-light {
|
.primary-background-light {
|
||||||
background-color: {{ setting('app-color-light') }};
|
background-color: {{ setting('app-color-light') }};
|
||||||
}
|
}
|
||||||
.button-base, .button, input[type="button"], input[type="submit"] {
|
.button-base, .button, input[type="button"], input[type="submit"] {
|
||||||
|
@ -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
|
|
@ -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
|
|
@ -1,13 +1,7 @@
|
|||||||
@extends('base')
|
@extends('base')
|
||||||
|
|
||||||
@section('body-class', 'shaded')
|
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="toolbar-container">
|
|
||||||
@yield('toolbar')
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex-fill flex">
|
<div class="flex-fill flex">
|
||||||
<div class="content flex">
|
<div class="content flex">
|
||||||
<div class="scroll-body">
|
<div class="scroll-body">
|
||||||
@ -16,5 +10,4 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@stop
|
@stop
|
||||||
|
@ -4,11 +4,6 @@
|
|||||||
|
|
||||||
@section('content')
|
@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-container" tri-layout @yield('container-attrs') >
|
||||||
|
|
||||||
<div class="tri-layout-left print-hidden pt-m" id="sidebar">
|
<div class="tri-layout-left print-hidden pt-m" id="sidebar">
|
||||||
|
Loading…
Reference in New Issue
Block a user