Skip to content
Snippets Groups Projects
Commit f2171c12 authored by Andrew Rudenets's avatar Andrew Rudenets
Browse files

Разрешение конфликта в наименовании классов CSS

parent 632d1c2d
Branches
Tags
No related merge requests found
......@@ -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>
......
......@@ -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) %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment