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

Merge fixes from branch 'v0.12'

Browse Source
This commit is contained in:
Dan Brown
2016-11-12 11:40:54 +00:00
parent ab468bac3c 2af0021c2b
commit ac80723058
13 changed files with 115 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/assets/sass/_blocks.scss
View File

@@ -135,6 +135,7 @@
border-left: 3px solid #BBB;
background-color: #EEE;
padding: $-s;
display: flex;
&:before {
font-family: 'Material-Design-Iconic-Font';
padding-right: $-s;

2
resources/assets/sass/_text.scss
View File

@@ -262,7 +262,7 @@ ul {
ol {
list-style: decimal;
padding-left: $-m * 1.3;
padding-left: $-m * 2;
overflow: hidden;
}

7
resources/views/auth/passwords/email.blade.php
View File

@@ -1,5 +1,12 @@
@extends('public')
@section('header-buttons')
<a href="{{ baseUrl("/login") }}"><i class="zmdi zmdi-sign-in"></i>Sign in</a>
@if(setting('registration-enabled'))
<a href="{{ baseUrl("/register") }}"><i class="zmdi zmdi-account-add"></i>Sign up</a>
@endif
@stop
@section('content')

7
resources/views/auth/passwords/reset.blade.php
View File

@@ -1,5 +1,12 @@
@extends('public')
@section('header-buttons')
<a href="{{ baseUrl("/login") }}"><i class="zmdi zmdi-sign-in"></i>Sign in</a>
@if(setting('registration-enabled'))
<a href="{{ baseUrl("/register") }}"><i class="zmdi zmdi-account-add"></i>Sign up</a>
@endif
@stop
@section('body-class', 'image-cover login')
@section('content')

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

@@ -23,7 +23,7 @@
@include('partials/custom-styles')
<!-- Custom user content -->
@if(setting('app-custom-head', false))
@if(setting('app-custom-head'))
{!! setting('app-custom-head') !!}
@endif
</head>

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

@@ -14,7 +14,7 @@
table {
max-width: 800px !important;
font-size: 0.8em;
width: auto !important;
width: 100% !important;
}
table td {

5
resources/views/public.blade.php
View File

@@ -17,6 +17,11 @@
<!-- Scripts -->
<script src="{{ baseUrl("/libs/jquery/jquery.min.js?version=2.1.4") }}"></script>
@include('partials/custom-styles')
<!-- Custom user content -->
@if(setting('app-custom-head'))
{!! setting('app-custom-head') !!}
@endif
</head>
<body class="@yield('body-class')" ng-app="bookStack">