From aa2d1b3658ec31ba9da3cf7930e8842fafb3f7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A0=D1=83=D0=B4?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B5=D1=86?= <andrey.rudenets@gmail.com>
Date: Sat, 30 Aug 2014 19:19:17 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?=
=?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0?=
=?UTF-8?q?=D0=B9=D0=BB=D0=B0=20=D1=81=D0=BE=20=D1=81=D1=82=D0=B8=D0=BB?=
=?UTF-8?q?=D1=8F=D0=BC=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B3=D0=BB=D0=B0?=
=?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?=
=?UTF-8?q?=D1=86=D1=8B=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0=D0=B2?=
=?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
~dev_rating/media/css/courses_teacher.css | 310 ++++--------------
.../media/css/courses_teacher_var2.css | 106 ------
2 files changed, 67 insertions(+), 349 deletions(-)
delete mode 100644 ~dev_rating/media/css/courses_teacher_var2.css
diff --git a/~dev_rating/media/css/courses_teacher.css b/~dev_rating/media/css/courses_teacher.css
index b76e32f29..8e4c04361 100644
--- a/~dev_rating/media/css/courses_teacher.css
+++ b/~dev_rating/media/css/courses_teacher.css
@@ -1,266 +1,62 @@
-.user_courses {
- padding-top: 10px;
- margin-left: 20px;
- margin-right: 20px;
+/* =========== [TABLE WIDTH] ============ */
+.info_cell, .common_cell
+{
+ width: 180px;
+ padding: 5px;
+ font-size: 11pt;
}
-
-.courses_tittle {
- font: 14pt sans-serif;
- color: #0072c2;
- margin-top: 5px;
- text-align: center;
-}
-
-.course_table_top {
- height: 50px;
- font: 10pt sans-serif;
- color: #0183ce;
- text-align: center;
-}
-
-
-tr.course_table_top td {
- border-bottom:1pt solid;
- border-color: #ccc;
-}
-
-
-.course_content {
- text-align: center;
-}
-
-.table {
- margin-top: 10px;
+.group_block, .header_block
+{
+ text-align: center;
}
-.course_img {
- display: inline-block;
- height: 32px;
- width: 32px;
- overflow: visible;
- background-image: url(/~dev_rating/media/css/icons/tick.png);
- background-repeat:no-repeat;
+.disciplines_wrapper
+{
+ margin: 15px;
}
-.course_name_wrapper {
- margin-top: 10px;
- height: 32px;
- border-bottom: 1pt solid;
- border-color: #ccc;
-}
-.course_name {
- margin-bottom: 5px;
- display: inline-block;
- font: 11pt sans-serif;
- color: #757575;
-}
+/* ============ Заголовок дисциплины ============== */
+.discipline_header
+{}
-.course_number {
- text-align: center;
- background-color: #3298cc;
- border-radius: 3px;
- width: 50px;
- font: 11pt sans-serif;
- color: #FFFFFF;
+.discipline_header .discipline_title
+{
+ border-bottom: 1px solid #ccc;
+ padding: 3px;
+ font-weight: 700;
}
-
-
-.group_img {
- border-left: 2pt solid;
- border-color: #ccc;
- height: 32px;
- width: 32px;
+.header_block td
+{
+ padding: 10px;
+ color: #3399CC;
}
-.group_img_top {
- border-left: 2pt solid;
- border-top: 2pt solid;
- border-color: #ccc;
- height: 32px;
- width: 32px;
-}
-
-.group_img_once {
- border-left: 2pt solid;
- border-top: 2pt solid;
- border-bottom: 2pt solid;
- border-color: #ccc;
- height: 32px;
- width: 32px;
+.discipline_groups .group_table
+{
+ margin-bottom: 10px;
}
+/* ============ Настройки цвета ============== */
-.group_img_bottom {
- border-bottom:2pt solid;
- border-left: 2pt solid;
- border-color: #ccc;
- height: 32px;
- width: 32px;
-}
-
-.group_name_wrapper {
- height: 32px;
- border-bottom: 1pt solid;
- border-color: #ccc;
-}
-
-.group_name {
- border-bottom:1pt solid;
- height: 30px;
- border-color: #ccc;
- margin-top: 8px;
- display: inline-block;
- font: 11pt sans-serif;
- color: #2bbd1a;
-}
-
-
-.group_name_top {
- border-bottom:1pt solid;
- border-top: 2pt solid;
- border-color: #ccc;
- height: 30px;
- margin-top: 8px;
- display: inline-block;
- font: 11pt sans-serif;
- color: #2bbd1a;
-}
-
-.group_name_bottom {
- border-bottom:2pt solid;
- border-color: #ccc;
- height: 30px;
- margin-top: 8px;
- display: inline-block;
- font: 11pt sans-serif;
- color: #2bbd1a;
-}
-
-.group_name_once {
- border-top: 2pt solid;
- border-bottom:2pt solid;
- height: 30px;
- border-color: #ccc;
- margin-top: 8px;
- display: inline-block;
- font: 11pt sans-serif;
- color: #2bbd1a;
-}
-
-.lesson_type {
- border-bottom:1pt solid;
- border-color: #ccc;
- margin-left: 60px;
- margin-top: 8px;
- display: inline-block;
- font: 10pt sans-serif;
- color: #4fbeec;
-}
-
-
-
-.table_head {
- text-align: center;
- font: 11pt sans-serif;
- color: #4fbeec;
-}
-
-.stud_number {
- border-bottom:1pt solid;
- border-color: #ccc;
- font: 10pt sans-serif;
- color: #2bbd1a;
- text-align: center;
-}
-
-
-.stud_number_top {
- border-bottom:1pt solid;
- border-top: 2pt solid;
- border-color: #ccc;
- font: 10pt sans-serif;
- color: #2bbd1a;
- text-align: center;
-}
-
-.stud_number_bottom {
- border-bottom:2pt solid;
- border-color: #ccc;
- font: 10pt sans-serif;
- color: #2bbd1a;
- text-align: center;
-}
-
-.stud_number_once {
- border-bottom:2pt solid;
- border-top: 2pt solid;
- border-color: #ccc;
- font: 10pt sans-serif;
- color: #2bbd1a;
- text-align: center;
-}
-
-
-.control_form {
- border-bottom:1pt solid;
- border-color: #ccc;
- text-align: center;
- font: 10pt sans-serif;
- color: #2bbd1a;
-}
-
-.control_form_top {
- border-bottom:1pt solid;
- border-top: 2pt solid;
- border-color: #ccc;
- text-align: center;
- font: 10pt sans-serif;
- color: #2bbd1a;
-}
-
-
-.control_form_bottom {
- border-bottom:2pt solid;
- border-color: #ccc;
- text-align: center;
- font: 10pt sans-serif;
- color: #2bbd1a;
-}
-
-
-.control_form_once {
- border-bottom:2pt solid;
- border-top: 2pt solid;
- border-color: #ccc;
- text-align: center;
- font: 10pt sans-serif;
- color: #2bbd1a;
-}
-
-.top_btn_border {
- padding: 4px 4px;
- border-top: 2pt solid;
- border-right: 2pt solid;
- border-bottom: 2pt solid;
- border-color: #ccc;
- padding-left: 0;
- padding-right: 0;
-}
-
+.discipline_groups .group_block .td_group { color: #757575; }
+.discipline_groups .group_block .td_control { color: #757575; }
+.discipline_groups .group_block .td_teachers { color: #757575; }
+/* ============ РЈРљР” ========================== */
.show_ukd_btn {
- margin: 0 auto;
+ text-decoration: none;
+ margin: 5px auto;
display: block;
border: 0;
padding: 6px 20px;
-
- background: #757575; /*#3A84A6;*/
+ max-width: 60%;
+ background: #39973f; /*#3A84A6;*/
font-weight: bold;
font-size: 13px;
color: #ffffff;
@@ -276,7 +72,35 @@ tr.course_table_top td {
cursor: pointer;
}
-tr.course_content td {
- border-bottom:1pt solid;
- border-color: #ccc;
+/* ============ Плашка дисциплины ================= */
+
+.discipline_groups .grade_title
+{
+ color: #3399CC;
+ padding: 5px;
+ text-align: left;
}
+
+/* =========== Внутренние границы ============= */
+
+.discipline_groups .group_block .info_cell
+{
+ /* border-bottom: 1px solid;
+ border-color: #ccc; */
+}
+
+/* ============ Внешние границы ============== */
+
+
+.discipline_groups .group_block:first-child td
+{
+ border-top: 2px solid;
+ border-color: #ccc;
+}
+
+.discipline_groups .group_block:last-child td
+{
+ border-bottom: 2px solid;
+ border-color: #ccc;
+}
+
diff --git a/~dev_rating/media/css/courses_teacher_var2.css b/~dev_rating/media/css/courses_teacher_var2.css
deleted file mode 100644
index 8e4c04361..000000000
--- a/~dev_rating/media/css/courses_teacher_var2.css
+++ /dev/null
@@ -1,106 +0,0 @@
-/* =========== [TABLE WIDTH] ============ */
-.info_cell, .common_cell
-{
- width: 180px;
- padding: 5px;
- font-size: 11pt;
-}
-
-.group_block, .header_block
-{
- text-align: center;
-}
-
-.disciplines_wrapper
-{
- margin: 15px;
-}
-
-
-/* ============ Заголовок дисциплины ============== */
-
-.discipline_header
-{}
-
-.discipline_header .discipline_title
-{
- border-bottom: 1px solid #ccc;
- padding: 3px;
- font-weight: 700;
-}
-
-.header_block td
-{
- padding: 10px;
- color: #3399CC;
-}
-
-.discipline_groups .group_table
-{
- margin-bottom: 10px;
-}
-
-/* ============ Настройки цвета ============== */
-
-.discipline_groups .group_block .td_group { color: #757575; }
-.discipline_groups .group_block .td_control { color: #757575; }
-.discipline_groups .group_block .td_teachers { color: #757575; }
-
-/* ============ РЈРљР” ========================== */
-
-.show_ukd_btn {
-
- text-decoration: none;
- margin: 5px auto;
- display: block;
- border: 0;
- padding: 6px 20px;
- max-width: 60%;
- background: #39973f; /*#3A84A6;*/
- font-weight: bold;
- font-size: 13px;
- color: #ffffff;
- border-radius: 3px;
- moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- -khtml-border-radius: 3px;
-}
-
-
-.show_ukd_btn:hover {
- background: #3399CC;
- cursor: pointer;
-}
-
-/* ============ Плашка дисциплины ================= */
-
-.discipline_groups .grade_title
-{
- color: #3399CC;
- padding: 5px;
- text-align: left;
-}
-
-/* =========== Внутренние границы ============= */
-
-.discipline_groups .group_block .info_cell
-{
- /* border-bottom: 1px solid;
- border-color: #ccc; */
-}
-
-/* ============ Внешние границы ============== */
-
-
-.discipline_groups .group_block:first-child td
-{
- border-top: 2px solid;
- border-color: #ccc;
-}
-
-.discipline_groups .group_block:last-child td
-{
- border-bottom: 2px solid;
- border-color: #ccc;
-}
-
--
GitLab