lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1049 from mmollick/fullwidth_header

Browse Source 
Fullwidth header
This commit is contained in:
James Brooks
2015-10-22 17:12:26 +01:00
parent 974fd5015d 1271470da3
commit ffa6a8f3d6
22 changed files with 213 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/dashboard/settings/theme.blade.php
+24
View File
@@ -32,6 +32,30 @@
</div>
</div>
<hr>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.banner-background-color') }}</label>
<input type="text" class="form-control color-code" name="style.banner_background_color" value="{{ $theme_banner_background_color }}">
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label>{{ trans('forms.settings.theme.banner-padding') }}</label>
<input type="text" class="form-control" name="style.banner_padding" value="{{ $theme_banner_padding }}">
</div>
</div>
<div class="col-xs-12">
<div class="checkbox">
<label>
<input type="hidden" value="0" name="style.fullwidth_header">
<input type="checkbox" value="1" name="style.fullwidth_header" {{ Setting::get('style_fullwidth_header') ? 'checked' : null }}>
{{ trans('forms.settings.theme.fullwidth-banner') }}
</label>
</div>
</div>
</div>
<hr>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
resources/views/layout/master.blade.php
+3
View File
@@ -57,6 +57,9 @@
<script src="{{ elixir('dist/js/all.js') }}"></script>
</head>
<body class="status-page">
@include('partials.banner')
<div class="container">
@yield('content')
</div>
resources/views/partials/about-app.blade.php
+1 -13
View File
@@ -1,19 +1,7 @@
@if($bannerImage = Setting::get('app_banner'))
<div class="row app-banner">
<div class="col-md-12 text-center">
<?php $bannerType = Setting::get('app_banner_type') ?>
@if($app_url = Setting::get('app_domain'))
<a href="{{ $app_url }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
@endif
</div>
</div>
@endif
@if($about_app)
<div class="about-app">
<h1>{{ trans('cachet.about_this_site') }}</h1>
<p>{!! $about_app !!}</p>
</div>
@endif
resources/views/partials/banner.blade.php
+16
View File
@@ -0,0 +1,16 @@
@if($bannerImage = Setting::get('app_banner'))
<div @if(Setting::get('style_fullwidth_header'))class="app-banner"@endif>
<div class="container">
<div class="row app-banner-padding @if(!Setting::get('style_fullwidth_header')) app-banner @endif">
<div class="col-md-12 text-center">
<?php $bannerType = Setting::get('app_banner_type') ?>
@if($app_url = Setting::get('app_domain'))
<a href="{{ $app_url }}" class="links"><img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive"></a>
@else
<img src="data:{{ $bannerType }};base64, {{ $bannerImage}}" class="banner-image img-responsive">
@endif
</div>
</div>
</div>
</div>
@endif
resources/views/partials/stylesheet.blade.php
+14
View File
@@ -2,6 +2,9 @@
body.status-page {
background-color: {{ $theme_background_color }};
color: {{ $theme_text_color }};
@if(Setting::get('app_banner'))
padding-top: 0;
@endif
}
.reds { color: {{ $theme_reds }} !important; }
.blues { color: {{ $theme_blues }} !important; }
@@ -11,6 +14,17 @@ body.status-page {
.metrics { color: {{ $theme_metrics }} !important; }
.links { color: {{ $theme_links }} !important; }
/**
* Banner background
*/
.app-banner {
background-color: {{ $theme_banner_background_color }} !important;
}
.app-banner-padding {
padding: {{ $theme_banner_padding }} !important;
}
/**
* Alert overrides.
*/