From 7da17356790e4ea35437cc0a4358a80db9add95b Mon Sep 17 00:00:00 2001 From: Zambom Date: Wed, 4 Jan 2017 18:57:51 -0200 Subject: [PATCH] CSS adjusting --- amadeus/static/css/base/amadeus.css | 43 ++++++++++++++++++++++++++++++++----------- amadeus/templates/base.html | 2 +- categories/templates/categories/list.html | 85 +++++++++++++++++++++++++++++++++++-------------------------------------------------- subjects/templates/subjects/list.html | 70 ++++++++++++++++++++++++++++------------------------------------------ subjects/templates/subjects/subject_card.html | 27 ++++++++++++--------------- 5 files changed, 108 insertions(+), 119 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 376c9df..a50b78c 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -60,31 +60,51 @@ /* category app starts */ .panel-invisible{ - background-color: #BDBDBD; + background-color: #BDBDBD; +} + +.category-panel { + background: #0277BD; +} +.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading { + padding: 2px 0px; +} + +.subject-panel { + background: #039BE5; +} + +.subject-group { + margin-left: 20px; } .category-header > h4{ - float:left; - margin-top: 0.5%; + float:left; + margin-top: 5px; + margin-bottom: 2px; } +.category-header > h4 > a:focus { + text-decoration: none; +} +.category-card-items { + padding-right: 0px; +} .category-card-items i{ font-size: 25px !important; - margin-right: 5%; - margin-top: 1%; + margin-right: 10px; + margin-top: 6px; } + .category-header i{ color: white; - font-size: 20px; float: right; - - } .category-header i:hover{ - color: #90CAF9; + color: #90CAF9; } @@ -94,6 +114,7 @@ .cat-selector { margin: 0; + top: -2px; } #create-category{ @@ -118,8 +139,8 @@ #core-subjects-options-div{ width: 100%; - margin-bottom: 2%; - height: 30px; + margin-bottom: 10px; + height: 50px; } .core-subjects-options li{ diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html index 659b2c3..25e6857 100644 --- a/amadeus/templates/base.html +++ b/amadeus/templates/base.html @@ -70,7 +70,7 @@ - + Projeto Amadeus diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html index 2b1e83e..2b0d8d7 100755 --- a/categories/templates/categories/list.html +++ b/categories/templates/categories/list.html @@ -39,7 +39,7 @@
{% for category in categories %} {% if category.visible %} -
+
@@ -48,27 +48,20 @@ {{category.name}} - {% if user.is_staff or user in category.coordinators.all %} -
-
- - -
-
- {% else %} -
-
- {% endif %}
+ {% if user.is_staff or user in category.coordinators.all %} + + + {% endif %} @@ -95,7 +88,7 @@ {% endif %} -
+
{% for subject in category.subject_category.all %} {% include "subjects/subject_card.html" %} {% endfor %} @@ -103,7 +96,7 @@
{% elif request.user in category.coordinators.all or request.user.is_staff %} -
+
@@ -112,33 +105,25 @@ {{category.name}} - {% if user.is_staff or user in category.coordinators.all %} -
-
- - -
-
- {% else %} -
-
- {% endif %} - -
- - - - -
- + +
+ {% if user.is_staff or user in category.coordinators.all %} + + + {% endif %} + + + + +
@@ -160,7 +145,7 @@ {% endif %} -
+
{% for subject in category.subject_category.all %} {% include "subjects/subject_card.html" %} {% endfor %} diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html index 6293699..5b81a91 100644 --- a/subjects/templates/subjects/list.html +++ b/subjects/templates/subjects/list.html @@ -42,7 +42,7 @@
{% for category in categories %} {% if category.visible %} -
+
@@ -51,27 +51,20 @@ {{category.name}} - {% if user.is_staff or user in category.coordinators.all %} -
-
- - -
-
- {% else %} -
-
- {% endif %}
+ {% if user.is_staff or user in category.coordinators.all %} + + + {% endif %} @@ -97,7 +90,7 @@ {% endif %} -
+
{% for subject in category.subject_category.all %} {% include "subjects/subject_card.html" %} {% endfor %} @@ -105,7 +98,7 @@
{% elif request.user in category.coordinators.all %} -
+
@@ -114,27 +107,20 @@ {{category.name}} - {% if user.is_staff or user in category.coordinators.all %} -
-
- - -
-
- {% else %} -
-
- {% endif %}
+ {% if user.is_staff or user in category.coordinators.all %} + + + {% endif %} @@ -160,7 +146,7 @@ {% endif %} -
+
{% for subject in category.subject_category.all %} {% include "subjects/subject_card.html" %} {% endfor %} diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html index ed61e63..dd237fe 100644 --- a/subjects/templates/subjects/subject_card.html +++ b/subjects/templates/subjects/subject_card.html @@ -1,6 +1,6 @@ {% load static i18n permission_tags %} -
+
@@ -9,21 +9,18 @@ {{subject.name}} - {% if request.user in subject.professor.all or request.user in category.coordinators.all %} -
-
- - -
-
- {% endif %} +
+ {% if request.user in subject.professor.all or request.user in category.coordinators.all %} + + + {% endif %} -- libgit2 0.21.2