From f2171c12820744377e0d249d007d3bfe0b9119a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D1=83=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=86?= <andrey.rudenets@gmail.com> Date: Sat, 30 Aug 2014 19:16:14 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA?= =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=20=D0=BD=D0=B0=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=BE=D0=B2=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ~dev_rating/application/views/base.twig | 1 - ~dev_rating/application/views/teacher/index.twig | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig index ba6b58915..c45820707 100644 --- a/~dev_rating/application/views/base.twig +++ b/~dev_rating/application/views/base.twig @@ -24,7 +24,6 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <title>{% block title %}{% endblock %} | {{ System.Title }}</title> {{ HTML.style('media/css/base.css')|raw }} - {{ HTML.style('media/css/actionButton.css')|raw }} {{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }} {% block media %}{% endblock %} </head> diff --git a/~dev_rating/application/views/teacher/index.twig b/~dev_rating/application/views/teacher/index.twig index 8cb9060f1..053c7abe1 100644 --- a/~dev_rating/application/views/teacher/index.twig +++ b/~dev_rating/application/views/teacher/index.twig @@ -2,7 +2,8 @@ {% block title %}Дисциплины{% endblock %} {# head -> title #} {% block media %} {# head -> css, js #} - {{ HTML.style('media/css/courses_teacher_var2.css')|raw }} + {{ HTML.style('media/css/courses_teacher.css')|raw }} + {{ HTML.style('media/css/actionButton.css')|raw }} {% endblock %} {% macro outputSubject(Subject, HTML) %} -- GitLab