Merge pull request #1055 from cachethq/footer

Make footer simpler
This commit is contained in:
Graham Campbell
2015-10-24 22:32:48 +01:00
8 changed files with 68 additions and 61 deletions

19
public/build/dist/css/all-48fb677074.css vendored Executable file

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

16
public/build/dist/js/all-c220680259.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-fe92b89dca.css",
"dist/js/all.js": "dist/js/all-36dad06cdd.js"
"dist/css/all.css": "dist/css/all-48fb677074.css",
"dist/js/all.js": "dist/js/all-c220680259.js"
}

View File

@@ -316,12 +316,17 @@ body.status-page {
width: 100%;
bottom: 0;
height: 60px;
padding: 40px 0 60px 0;
padding: 30px 0 60px 0;
border-top: 1px solid $cachet_gray_light;
background-color: lighten($cachet_gray_light, 5%);
color: $cachet-gray-darker;
font-size: 13px;
line-height: 30px;
text-align: center;
text-shadow: 0 1px 0 rgba(255,255,255,0.5);
.btn {
text-shadow: none;
}
.icons {
a.icon-link {

View File

@@ -1,27 +1,35 @@
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-sm-6">
<div class="col-sm-5">
@if(Setting::get('show_support'))
<p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}<br>{{ Setting::get('app_timezone') }}</p>
<p>{!! trans('cachet.powered_by', ['app' => Setting::get('app_name')]) !!}</p>
@endif
</div>
<div class="col-sm-6">
<div class="btn-group">
<div class="col-sm-7 text-right">
<ul class="list-inline">
@if($current_user || Setting::get('dashboard_login_link'))
<a href="/dashboard" class="btn btn-info"><i class="ion-levels"></i> {{ trans('dashboard.dashboard') }}</a>
<li>
<a class="btn btn-link" href="/dashboard"><i class="ion-levels"></i> {{ trans('dashboard.dashboard') }}</a>
</li>
@endif
@if($current_user)
<a href="/auth/logout" class="btn btn-info"><i class="ion-android-exit"></i> {{ trans('dashboard.logout') }}</a>
<li>
<a class="btn btn-link" href="/auth/logout"><i class="ion-android-exit"></i> {{ trans('dashboard.logout') }}</a>
</li>
@endif
</div>
<div class="btn-group">
<a href="{{ route('feed.rss') }}" class="btn btn-warning rss"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a>
<a href="{{ route('feed.atom') }}" class="btn btn-warning rss"><i class="ion-social-rss"></i> {{ trans('cachet.atom-feed') }}</a>
</div>
@if($subscribers_enabled)
<a class="btn btn-success" href="{{ route('subscribe.subscribe') }}"><i class="ion-email"></i> {{ trans('cachet.subscriber.button') }}</a>
@endif
<li>
<a class="btn btn-link" href="{{ route('feed.rss') }}"><i class="ion-social-rss"></i> {{ trans('cachet.rss-feed') }}</a>
</li>
<li>
<a class="btn btn-link" href="{{ route('feed.atom') }}"><i class="ion-social-rss"></i> {{ trans('cachet.atom-feed') }}</a>
</li>
@if($subscribers_enabled)
<li>
<a class="btn btn-success" href="{{ route('subscribe.subscribe') }}"><i class="ion-email"></i> {{ trans('cachet.subscriber.button') }}</a>
</li>
@endif
</ul>
</div>
</div>
</div>

View File

@@ -103,7 +103,7 @@ body.status-page {
border-left-color: {{ $theme_background_fills }};
border-right-color: {{ $theme_background_fills }};
}
.footer {
background-color: {{ $theme_background_fills }};
.footer a {
color: {{ $theme_text_color }};
}
</style>