Удален default layout

This commit is contained in:
Anton Vakhrushev 2019-08-23 19:58:46 +03:00
parent 5aba83d30f
commit 8e4665fb9e
8 changed files with 68 additions and 73 deletions

View File

@ -1,5 +1,5 @@
--- ---
layout: default layout: internal
title: Страница не найдена title: Страница не найдена
description: Станица не найдена description: Станица не найдена
styles: styles:

View File

@ -7,7 +7,7 @@
&__item { &__item {
display: inline-block; display: inline-block;
margin: 0 0.5em; margin: 0.25em 0.5em;
font-size: 180%; font-size: 180%;
} }

View File

@ -1 +0,0 @@
import '../components/social.scss';

View File

@ -12,6 +12,8 @@
right: $mobile-margin; right: $mobile-margin;
} }
} }
@import '../components/social';
} }
.hello { .hello {

View File

@ -11,7 +11,7 @@
<div><!-- Этот div сдается для вашей рекламы --></div> <div><!-- Этот div сдается для вашей рекламы --></div>
{# block for main page content #} {# block for main page content #}
{% block page_conent %}{% endblock page_conent %} {% block page_content %}{% endblock page_content %}
{# Analytics counters #} {# Analytics counters #}
{% include 'counters.twig' %} {% include 'counters.twig' %}

View File

@ -1,17 +0,0 @@
{% extends 'base.html.twig' %}
{% block css %}
{{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/layout_default.css') }}">
{% endblock %}
{% block js %}
{{ parent() }}
<script async src="{{ hashed_asset('/static/layout_default.js') }}"></script>
{% endblock %}
{% block page_conent %}
<main class="content">
{% block content %}{% endblock %}
</main>
{% endblock %}

View File

@ -10,7 +10,7 @@
<script async src="{{ hashed_asset('/static/layout_internal.js') }}"></script> <script async src="{{ hashed_asset('/static/layout_internal.js') }}"></script>
{% endblock %} {% endblock %}
{% block page_conent %} {% block page_content %}
<div class="page"> <div class="page">
{% include 'navigation.twig' %} {% include 'navigation.twig' %}
{% block main %} {% block main %}

View File

@ -1,14 +1,23 @@
--- ---
layout: default layout: base
description: Личный сайт Антона Вахрушева description: Личный сайт Антона Вахрушева
use: [articles] use: [articles]
--- ---
{% block css %} {% block css %}
{{ parent() }} {{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/index.css') }}"> <link rel="stylesheet" href="{{ hashed_asset('/static/index.css') }}">
{% endblock %} {% endblock %}
{% block content %} {% block js %}
{{ parent() }}
<script async src="{{ hashed_asset('/static/index.js') }}"></script>
{% endblock %}
{% block page_content %}
<main class="content">
<h1 class="hello">Привет,</h1> <h1 class="hello">Привет,</h1>
<p class="text"> <p class="text">
@ -65,4 +74,6 @@ use: [articles]
</li> </li>
</ul> </ul>
</main>
{% endblock %} {% endblock %}