From 20953e68d077ee86911b80fbd3334d7d57f73289 Mon Sep 17 00:00:00 2001 From: pimka <pimka@ro.ru> Date: Fri, 24 Oct 2014 21:48:38 +0400 Subject: [PATCH] Search button & group info style --- .../teacher/discipline/EditStudents.twig | 3 ++- ~dev_rating/media/css/discipline.css | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/~dev_rating/application/views/teacher/discipline/EditStudents.twig b/~dev_rating/application/views/teacher/discipline/EditStudents.twig index c8cfe60fd..116ad9443 100644 --- a/~dev_rating/application/views/teacher/discipline/EditStudents.twig +++ b/~dev_rating/application/views/teacher/discipline/EditStudents.twig @@ -50,7 +50,7 @@ <h2 class="BlueTitle">Еще студенты</h2> {% for group in GroupsAttached %} <div class="GroupContainerAttached" id="{{ group.GroupID }}"> - <div class="groupInfo">Рє. {{ group.GradeNum }}<br>Рі. {{ group.GroupNum }}</div> + <div class="groupInfo"><div class = "groupInfoAlone">{{ group.GradeNum }}.{{ group.GroupNum }}</div></div> {% for student in group.students %} {{ idx.outputStudent(student) }} {% endfor %} @@ -79,6 +79,7 @@ {% endfor %} </select> <input tupe="text" class="InputStudentName default_input_text" placeholder="Фамилия РРјСЏ Отчество" value=""> + <button class="searchBtn default_BlueButton">РџРѕРёСЃРє</button> </div> <div class="SearchResult"></div> </div> diff --git a/~dev_rating/media/css/discipline.css b/~dev_rating/media/css/discipline.css index c8e78d30e..b5f8d995c 100644 --- a/~dev_rating/media/css/discipline.css +++ b/~dev_rating/media/css/discipline.css @@ -429,6 +429,22 @@ text-align: center; } + .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; + } + + .searchBtn { + display: inline-block; + } + .StudentsList .Student { float: right; width: 880px; @@ -517,10 +533,11 @@ margin-right: 1%; } .SearchStudents .SearchSettings .InputStudentName { + display: inline-block; clear: both; margin: 0 1%; margin-top: 10px; - width: 98%; + width: 88%; } /* Прикрипление преподавателей */ -- GitLab