Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating

Conflicts: application/classes/Controller/Admin/Departaments.php application/classes/Controller/Teacher/Admin/Index.php web/application/classes/Controller/Teacher/Admin/Index.php web/application/classes/Model/Account.php

Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating
Conflicts: application/classes/Controller/Admin/Departaments.php application/classes/Controller/Teacher/Admin/Index.php web/application/classes/Controller/Teacher/Admin/Index.php web/application/classes/Model/Account.php
de03932a · Andrew Rudenets · ad959dc3 · 88ceb036 · de03932a · de03932a
Commit de03932a authored 10 years ago by Andrew Rudenets
--- a/media/css/courses_teacher.css
+++ b/media/css/courses_teacher.css
--- a/media/css/courses_teacher_var2.css
+++ b/media/css/courses_teacher_var2.css
--- a/media/css/error.css
+++ b/media/css/error.css
--- a/media/css/forms.css
+++ b/media/css/forms.css
--- a/media/css/icons/add.png
+++ b/media/css/icons/add.png
--- a/media/css/icons/add_h.png
+++ b/media/css/icons/add_h.png
--- a/media/css/icons/delete.png
+++ b/media/css/icons/delete.png
--- a/media/css/icons/delete_h.png
+++ b/media/css/icons/delete_h.png
--- a/media/css/icons/down.png
+++ b/media/css/icons/down.png
--- a/media/css/icons/down_h.png
+++ b/media/css/icons/down_h.png
--- a/media/css/icons/feedback.png
+++ b/media/css/icons/feedback.png
--- a/media/css/icons/tick.png
+++ b/media/css/icons/tick.png
--- a/media/css/icons/up.png
+++ b/media/css/icons/up.png
--- a/media/css/icons/up_h.png
+++ b/media/css/icons/up_h.png
--- a/media/css/modules.css
+++ b/media/css/modules.css
--- a/media/css/profile.css
+++ b/media/css/profile.css
--- a/media/css/results.css
+++ b/media/css/results.css
--- a/media/css/setRate.css
+++ b/media/css/setRate.css
--- a/media/css/settings.css
+++ b/media/css/settings.css
@@ -9,7 +9,8 @@
 	width: 500px;
 }
 	/* Подсказка */
-	.settingsSection p{
+	.settingsSection .help{
+		margin: 10px 0;
 		text-align: center; font-size: 15px;
 	}
 	.settingsSection .itemBlock {

--- a/media/css/sign.css
+++ b/media/css/sign.css