From dabda2479cd00edb3b06ef82d8118657b8e5c62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?=
=?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com>
Date: Fri, 24 Oct 2014 23:47:24 +0400
Subject: [PATCH] css
---
.../teacher/discipline/EditStudents.twig | 20 ++++-----
~dev_rating/media/css/discipline.css | 41 ++++++++++---------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/~dev_rating/application/views/teacher/discipline/EditStudents.twig b/~dev_rating/application/views/teacher/discipline/EditStudents.twig
index 116ad9443..b9975c911 100644
--- a/~dev_rating/application/views/teacher/discipline/EditStudents.twig
+++ b/~dev_rating/application/views/teacher/discipline/EditStudents.twig
@@ -28,18 +28,16 @@
<div class="GeneralStudentsList">
<h2 class="BlueTitle">Прикрепленные студенты</h2>
{% for group in Groups %}
- <div>
- <div class="GradeAndGroupTitle ActionShowHideGroupContainer" id="{{ group.GroupID }}">
- <span class="info">{{ group.Degree }}, РєСѓСЂСЃ {{ group.GradeNum }} РіСЂСѓРїРїР° {{ group.GroupNum }}</span>
- <span class="Action">Открыть список ▼</span>
- </div>
+ <div class="GradeAndGroupTitle ActionShowHideGroupContainer" id="{{ group.GroupID }}">
+ <span class="info">{{ group.Degree }}, РєСѓСЂСЃ {{ group.GradeNum }} РіСЂСѓРїРїР° {{ group.GroupNum }}</span>
+ <span class="Action">Открыть список ▼</span>
+ </div>
- <div class="GroupContainer">
- <div class="hideListAction"></div>
- {% for student in group.students %}
- {{ idx.outputStudent(student) }}
- {% endfor %}
- </div>
+ <div class="GroupContainer">
+ <div class="hideListAction"></div>
+ {% for student in group.students %}
+ {{ idx.outputStudent(student) }}
+ {% endfor %}
</div>
{% endfor %}
</div>
diff --git a/~dev_rating/media/css/discipline.css b/~dev_rating/media/css/discipline.css
index c3f3b8c91..d5f877cd5 100644
--- a/~dev_rating/media/css/discipline.css
+++ b/~dev_rating/media/css/discipline.css
@@ -407,6 +407,8 @@
}
.StudentsList .GroupContainer {
display: none;
+ padding-right: 4px;
+ padding-bottom: 4px;
}
.StudentsList .GroupContainer .hideListAction{
float: left;
@@ -418,28 +420,26 @@
.StudentsList .GroupContainer .hideListAction:hover{
background-color: #e1e1e1;
}
-
- .StudentsList .GroupContainerAttached .groupInfo{
- float: left;
- background: #f9f9f9;
- width: 40px;
- height: 100%;
- margin-top: 10px;
-
- text-align: center;
+ .StudentsList .GroupContainerAttached {
+ padding-right: 4px;
+ padding-bottom: 4px;
}
+ .StudentsList .GroupContainerAttached .groupInfo{
+ float: left;
+ background: #f9f9f9;
+ width: 40px;
+ margin-top: 10px;
- .groupInfoAlone {
- height: 18px;
- width: 35px;
- text-align: center;
- margin-top: 5px;
- float: right;
- background-color: #ffffff;
- border-radius: 3px 0 0 3px;
- font: 12pt sans-serif;
- color: #0183ce;
- }
+ text-align: center;
+ }
+
+ .groupInfoAlone {
+ text-align: center;
+ margin: 7px auto;
+ border-radius: 3px 0 0 3px;
+ font: 12pt sans-serif;
+ color: #0183ce;
+ }
.searchBtn {
display: inline-block;
@@ -450,6 +450,7 @@
width: 880px;
margin-top: 10px;
padding: 7px 10px;
+ box-shadow: 2px 2px 2px #DDE8F0;
}
.StudentsList .GroupContainerAttached .Student {
--
GitLab