Skip to content
Snippets Groups Projects
Commit e4ecbd05 authored by RomanSteinberg's avatar RomanSteinberg
Browse files

Merge branch 'hotfix/ReportsPrinter' into develop

Conflicts:
	db/StoredProcedures.sql
	~dev_rating/application/classes/Controller/Handler/FileCreator.php
	~dev_rating/application/classes/Model/Teacher/Rating.php
parents f17cf9b0 36021ae9
Branches
Tags
No related merge requests found
......@@ -341,7 +341,7 @@ $(function() {
if (GroupContainer.css("display") == "none") {
$(this).children(".Action").text("Скрыть список ▲");
GroupContainer.show();
GroupContainer.css("height", GroupContainer.height());
GroupContainer.css("height", GroupContainer.height() + 3);
}
else {
$(this).children(".Action").text("Открыть список ▼");
......
......@@ -29,8 +29,8 @@
}
.StudentsList .GroupContainer .hideListAction {
float: left;
background: url("../imgicons/triangle_up.png") no-repeat center center #f9f9f9;
width: 40px;
background: url("../../../img/icons/triangle_up.png") no-repeat center center #f9f9f9;
width: 5%;
height: 100%;
margin-top: 10px;
}
......@@ -60,7 +60,7 @@
}
.StudentsList .Student {
float: right;
width: 880px;
width: 90%;
margin-top: 10px;
padding: 7px 10px;
box-shadow: 2px 2px 2px #DDE8F0;
......
@import (reference) "../../common.less";
@ImagePath: '../../../img/';
/* Прикрипление студентов */
.StudentsList {
......@@ -34,7 +35,7 @@
.StudentsList .GroupContainer .hideListAction{
float: left;
background: url(@IconTriangleUp) no-repeat center center #f9f9f9;
width: 40px;
width: 5%;
height: 100%;
margin-top: 10px;
}
......@@ -67,7 +68,7 @@
.StudentsList .Student {
float: right;
width: 880px;
width: 90%;
margin-top: 10px;
padding: 7px 10px;
box-shadow: 2px 2px 2px #DDE8F0;
......
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