Skip to content

Commit

Permalink
Remove Yii Bulma, logo file + simplify HTML and CSS (#227)
Browse files Browse the repository at this point in the history
  • Loading branch information
vjik committed Feb 3, 2022
1 parent fc80837 commit 24e7afc
Show file tree
Hide file tree
Showing 8 changed files with 206 additions and 157 deletions.
1 change: 0 additions & 1 deletion composer.json
Expand Up @@ -48,7 +48,6 @@
"yiisoft/router": "^1.0",
"yiisoft/router-fastroute": "^1.0",
"yiisoft/view": "^4.0",
"yiisoft/yii-bulma": "@dev",
"yiisoft/yii-console": "^1.0",
"yiisoft/yii-debug": "^3.0@dev",
"yiisoft/yii-event": "^1.0",
Expand Down
Binary file removed public/images/yii-logo.jpg
Binary file not shown.
87 changes: 68 additions & 19 deletions resources/assets/css/site.css
@@ -1,36 +1,85 @@
.hero-footer {
padding: 1rem 1.5rem 1rem !important;
html, body {
margin: 0;
padding: 0;
}
html {
height: 100%;
}
body {
display: flex;
flex-direction: column;
height: 100%;
font: 16px/24px "Trebuchet MS", Helvetica, sans-serif;
background: #f8f8f8;
color: #4b4b4b;
}

.hero-footer a {
color: #fff;
.header {
margin: 12px 12px;
padding: 12px;
border-radius: 12px;
background: #fff;
color: #888;
box-shadow: 0 0 24px #f4f4f4;
text-align: center;
}
.header svg {
height: 48px;
}

a:hover, a:active {
text-decoration: underline;
color: #72dcff;
.content {
flex-grow: 1;
display: flex;
align-items: center;
}
.content_i {
flex-grow: 1;
padding: 24px 5%;
}
.content a {
color: #00617b;
}
.content a:hover {
color: #1191b3;
}

.footer {
border-top: 1px solid #e6e8ec;
margin: 24px 24px 0;
padding: 24px;
text-align: center;
}

.hero.is-light a.navbar-item.is-active {
background-color: transparent !important;
.footer_copyright a {
color: #838b99;
text-decoration: none;
}

.footer_copyright a:hover {
color: #0b7794;
text-decoration: underline;
}

.navbar-item.is-active {
color: #3273dc !important;
.footer_icons {
padding-top: 16px;
display: flex;
justify-content: center;
}

.input::-moz-placeholder, .textarea::-moz-placeholder, .select select::-moz-placeholder {
color: hsl(0, 0%, 40%);
.footer_icons a {
margin: 0 12px;
text-decoration: none;
}

.input::-webkit-input-placeholder, .textarea::-webkit-input-placeholder, .select select::-webkit-input-placeholder {
color: hsl(0, 0%, 40%);
.footer_icons svg {
height: 32px;
fill: #838b99;
}

.input:-moz-placeholder, .textarea:-moz-placeholder, .select select:-moz-placeholder {
color: hsl(0, 0%, 40%);
.footer_icons a:hover svg {
fill: #0b7794;
}

.input:-ms-input-placeholder, .textarea:-ms-input-placeholder, .select select:-ms-input-placeholder {
color: hsl(0, 0%, 40%);
.text-center {
text-align: center;
}
179 changes: 98 additions & 81 deletions resources/views/layout/main.php

Large diffs are not rendered by default.

53 changes: 30 additions & 23 deletions resources/views/site/404.php
@@ -1,31 +1,38 @@
<?php

declare(strict_types=1);

use Yiisoft\Html\Html;

/** @var Yiisoft\View\WebView $this */
/** @var Yiisoft\Router\UrlGeneratorInterface $urlGenerator */
/** @var Yiisoft\Router\CurrentRoute $currentRoute */
/**
* @var Yiisoft\View\WebView $this
* @var App\ApplicationParameters $applicationParameters
* @var Yiisoft\Router\UrlGeneratorInterface $urlGenerator
* @var Yiisoft\Router\CurrentRoute $currentRoute
*/

$this->setTitle('404');
?>

<h1 class="is-size-1">
<b>404</b>
</h1>

<p class="has-text-danger">
The page
<strong><?= Html::encode($currentRoute->getUri()->getPath()) ?></strong>
not found.
</p>

<p class="has-text-grey">
The above error occurred while the Web server was processing your request.<br/>
Please contact us if you think this is a server error. Thank you.
</p>

<hr class="mb-2">

<a class ="button is-danger mt-5" href="<?= $urlGenerator->generate('home') ?>">
Go Back Home
</a>
<div class="text-center">
<h1>
404
</h1>

<p>
The page
<strong><?= Html::encode($currentRoute->getUri()->getPath()) ?></strong>
not found.
</p>

<p>
The above error occurred while the Web server was processing your request.<br/>
Please contact us if you think this is a server error. Thank you.
</p>

<p>
<a href="<?= $urlGenerator->generate('home') ?>">
Go Back Home
</a>
</p>
</div>
16 changes: 9 additions & 7 deletions resources/views/site/index.php
Expand Up @@ -10,12 +10,14 @@
$this->setTitle($applicationParameters->getName());
?>

<h1 class="title">Hello!</h1>
<div class="text-center">
<h1>Hello!</h1>

<p class="subtitle">Let's start something great with <strong>Yii3</strong>!</p>
<p>Let's start something great with <strong>Yii3</strong>!</p>

<p class="subtitle is-italic">
<a href="https://github.com/yiisoft/docs/tree/master/guide/en" target="_blank" rel="noopener">
Don't forget to check the guide.
</a>
</p>
<p>
<a href="https://github.com/yiisoft/docs/tree/master/guide/en" target="_blank" rel="noopener">
<i>Don't forget to check the guide.</i>
</a>
</p>
</div>
11 changes: 1 addition & 10 deletions src/Asset/AppAsset.php
Expand Up @@ -5,11 +5,8 @@
namespace App\Asset;

use Yiisoft\Assets\AssetBundle;
use Yiisoft\Yii\Bulma\Asset\BulmaAsset;
use Yiisoft\Yii\Bulma\Asset\BulmaHelpersAsset;
use Yiisoft\Yii\Bulma\Asset\BulmaJsAsset;

class AppAsset extends AssetBundle
final class AppAsset extends AssetBundle
{
public ?string $basePath = '@assets';
public ?string $baseUrl = '@assetsUrl';
Expand All @@ -18,10 +15,4 @@ class AppAsset extends AssetBundle
public array $css = [
'site.css',
];

public array $depends = [
BulmaAsset::class,
BulmaHelpersAsset::class,
BulmaJsAsset::class,
];
}
16 changes: 0 additions & 16 deletions src/Asset/CdnFontAwesomeAsset.php

This file was deleted.

0 comments on commit 24e7afc

Please sign in to comment.