Reworking the header, logo is always contained in the center column per the original header
This commit is contained in:
Michael Mollick
+2
-1
@@ -41,7 +41,8 @@
|
||||
"fzaninotto/faker": "^1.5",
|
||||
"graham-campbell/testbench-core": "^1.0",
|
||||
"mockery/mockery": "^0.9.4",
|
||||
"phpunit/phpunit": "^4.8"
|
||||
"phpunit/phpunit": "^4.8",
|
||||
"laravel/homestead": "dev-master"
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
|
||||
Generated
+48
-9
@@ -1,11 +1,10 @@
|
||||
{
|
||||
"_readme": [
|
||||
"This file locks the dependencies of your project to a known state",
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "6e0387e8efc04fc7cb084b6ad8c70ce3",
|
||||
"content-hash": "fb168177d45e3399c9e971831b79c3b3",
|
||||
"hash": "4424167995f5ee7e2ce91d557a1f3156",
|
||||
"packages": [
|
||||
{
|
||||
"name": "alt-three/emoji",
|
||||
@@ -1665,7 +1664,7 @@
|
||||
"name": "Jeremy Lindblom",
|
||||
"email": "jeremeamia@gmail.com",
|
||||
"homepage": "https://github.com/jeremeamia",
|
||||
"role": "Developer"
|
||||
"role": "developer"
|
||||
}
|
||||
],
|
||||
"description": "Serialize Closure objects, including their context and binding",
|
||||
@@ -3552,6 +3551,47 @@
|
||||
],
|
||||
"time": "2015-05-11 14:41:42"
|
||||
},
|
||||
{
|
||||
"name": "laravel/homestead",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/homestead.git",
|
||||
"reference": "92308796309767bbde56669b334ef4b7dd4b31e0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/homestead/zipball/92308796309767bbde56669b334ef4b7dd4b31e0",
|
||||
"reference": "92308796309767bbde56669b334ef4b7dd4b31e0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.4",
|
||||
"symfony/console": "~2.0",
|
||||
"symfony/process": "~2.0"
|
||||
},
|
||||
"bin": [
|
||||
"homestead"
|
||||
],
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Laravel\\Homestead\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Taylor Otwell",
|
||||
"email": "taylorotwell@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "A virtual machine for web artisans.",
|
||||
"time": "2015-10-19 21:21:09"
|
||||
},
|
||||
{
|
||||
"name": "mockery/mockery",
|
||||
"version": "0.9.4",
|
||||
@@ -4517,14 +4557,13 @@
|
||||
],
|
||||
"aliases": [],
|
||||
"minimum-stability": "dev",
|
||||
"stability-flags": [],
|
||||
"stability-flags": {
|
||||
"laravel/homestead": 20
|
||||
},
|
||||
"prefer-stable": true,
|
||||
"prefer-lowest": false,
|
||||
"platform": {
|
||||
"php": "^5.5.9"
|
||||
},
|
||||
"platform-dev": [],
|
||||
"platform-overrides": {
|
||||
"php": "5.5.9"
|
||||
}
|
||||
"platform-dev": []
|
||||
}
|
||||
|
||||
@@ -7,11 +7,6 @@
|
||||
|
||||
@include('partials.about-app')
|
||||
|
||||
@if(Setting::get('style_fullwidth_header'))
|
||||
</div>
|
||||
<div class="container">
|
||||
@endif
|
||||
|
||||
<div class="section-status">
|
||||
<div class="alert alert-{{ $systemStatus }}">{{ $systemMessage }}</div>
|
||||
</div>
|
||||
|
||||
@@ -57,12 +57,10 @@
|
||||
<script src="{{ elixir('dist/js/all.js') }}"></script>
|
||||
</head>
|
||||
<body class="status-page">
|
||||
@if(Setting::get('style_fullwidth_header'))
|
||||
<div class="container-fluid">
|
||||
@else
|
||||
<div class="container">
|
||||
@endif
|
||||
|
||||
@include('partials.banner')
|
||||
|
||||
<div class="container">
|
||||
@yield('content')
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,16 +1,3 @@
|
||||
@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>
|
||||
|
||||
@@ -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
|
||||
@@ -19,6 +19,9 @@ body.status-page {
|
||||
*/
|
||||
.app-banner {
|
||||
background-color: {{ $theme_banner_background_color }} !important;
|
||||
}
|
||||
|
||||
.app-banner-padding {
|
||||
padding: {{ $theme_banner_padding }} !important;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user