Move the subscribers button into footer, re-arrange top half page

This commit is contained in:
James Brooks
2015-10-17 14:18:45 +01:00
parent 49e4113159
commit 4e7d4c4581
9 changed files with 52 additions and 55 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

22
public/build/dist/js/all-36dad06cdd.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
{ {
"dist/css/all.css": "dist/css/all-72c862531a.css", "dist/css/all.css": "dist/css/all-fe92b89dca.css",
"dist/js/all.js": "dist/js/all-234abbfa32.js" "dist/js/all.js": "dist/js/all-36dad06cdd.js"
} }

View File

@@ -71,7 +71,6 @@ body.status-page {
} }
.about-app { .about-app {
margin-top: 40px;
margin-bottom: 40px; margin-bottom: 40px;
p { p {
font-size: 1.2em; font-size: 1.2em;

View File

@@ -1,11 +1,8 @@
@extends('layout.master') @extends('layout.master')
@section('content') @section('content')
<div class="pull-right"> <div class="btn-group pull-right">
@if($subscribers_enabled) <a href="/" class="btn btn-info"><i class="ion-home"></i></a>
<p><a class="btn btn-success btn-outline links" href="{{ route('subscribe.subscribe') }}">{{ trans('cachet.subscriber.button') }}</a></p>
@endif
<p><a class="btn btn-success btn-outline links" href="/"><i class="ion-home"></i></a></p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>

View File

@@ -1,14 +1,6 @@
@extends('layout.master') @extends('layout.master')
@section('content') @section('content')
@if($subscribers_enabled)
<div class="pull-right">
<p><a class="btn btn-success btn-outline" href="{{ route('subscribe.subscribe') }}">{{ trans('cachet.subscriber.button') }}</a></p>
</div>
@endif
<div class="clearfix"></div>
<div class="section-messages"> <div class="section-messages">
@include('dashboard.partials.errors') @include('dashboard.partials.errors')
</div> </div>
@@ -26,10 +18,6 @@
</div> </div>
@endif @endif
<div class="section-status">
<div class="alert alert-{{ $systemStatus }}">{{ $systemMessage }}</div>
</div>
@if($about_app) @if($about_app)
<div class="about-app"> <div class="about-app">
<h1>{{ trans('cachet.about_this_site') }}</h1> <h1>{{ trans('cachet.about_this_site') }}</h1>
@@ -37,6 +25,10 @@
</div> </div>
@endif @endif
<div class="section-status">
<div class="alert alert-{{ $systemStatus }}">{{ $systemMessage }}</div>
</div>
@if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty()) @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
<div class="section-components"> <div class="section-components">
@include('partials.components') @include('partials.components')

View File

@@ -16,6 +16,9 @@
@endif @endif
<a href="{{ route('feed.rss') }}" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a> <a href="{{ route('feed.rss') }}" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a>
<a href="{{ route('feed.atom') }}" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.atom-feed') }}</a> <a href="{{ route('feed.atom') }}" class="icon-link rss"><i class="ion-social-rss"></i> {{ trans('cachet.atom-feed') }}</a>
@if($subscribers_enabled)
<a class="icon-link" href="{{ route('subscribe.subscribe') }}">{{ trans('cachet.subscriber.button') }}</a>
@endif
</div> </div>
</div> </div>
</div> </div>