From b9f7aafd970956e90b3eef99c48686bd48de49b4 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 19 Jun 2012 19:01:52 +0200 Subject: [PATCH] fix borders on listings --- teleforma/static/teleforma/css/teleforma.css | 15 ++++++++++----- .../templates/teleforma/inc/conference_list.html | 8 ++++---- .../templates/teleforma/inc/document_list.html | 6 +++--- teleforma/templates/teleforma/inc/media_list.html | 10 +++++----- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index 29d1dbed..09c12f0d 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -59,7 +59,7 @@ a img { border: none; } #content { /*margin-top: 1em;*/ position: relative; - margin-left: 5%; + margin-left: 3%; margin-right: 2em; margin-bottom: 0em; } @@ -846,6 +846,12 @@ table.listing th, table.listing thead, table.listing td { border-bottom: 1px solid #dfdfdf; font-weight: normal; } + +table.listing td.border-top { + border-top: 1px solid #dfdfdf; +} + + table.listing thead { background: #fafafa; /*background: #e8eaf0*/ } table.listing thead th { font-size: 0.9em; @@ -874,7 +880,7 @@ table.listing tbody td, table.listing tbody th { font-weight: normal; } table.listing tbody td { - padding: 0.5em 0em 0.5em 0.8em; + padding: 0.5em 0em 0.5em 0em; font-weight: normal; font-size: 0.9em; } @@ -884,7 +890,7 @@ table.listing tbody td.tmp { table.listing tbody td a:hover, table.listing tbody th a:hover { background-color: transparent; } -table.listing tbody tr { border-top: 1px solid #ddd } +table.listing tbody tr { border-top: 1px solid #dfdfdf; } table.listing tbody tr.even { background-color: transparent } table.listing tbody tr.odd { background-color: transparent } table.listing tbody tr:hover { background: transparent !important } @@ -1395,7 +1401,7 @@ input,textarea{ .desk_center { float: left; width:52%; - padding: 0em 2em 0em 1em; + padding: 0em 2em 0em 2em; max-height: 550px; overflow-y: auto; } @@ -1586,4 +1592,3 @@ input,textarea{ font-size: 0.8125em; text-align: center; } - diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html index f6864fa7..43819387 100644 --- a/teleforma/templates/teleforma/inc/conference_list.html +++ b/teleforma/templates/teleforma/inc/conference_list.html @@ -10,10 +10,10 @@ {% for stream in course.livestream.all|from_course_type:type %} - {{ stream.slug }} - {% if conference.professor.user %}{{ conference.professor }}{% endif %} - {{ conference.date_begin }} - + {{ stream.slug }} + {% if conference.professor.user %}{{ conference.professor }}{% endif %} + {{ conference.date_begin }} + {% if conference.streaming %} yes {% endif %} diff --git a/teleforma/templates/teleforma/inc/document_list.html b/teleforma/templates/teleforma/inc/document_list.html index dd794cfa..6da98469 100644 --- a/teleforma/templates/teleforma/inc/document_list.html +++ b/teleforma/templates/teleforma/inc/document_list.html @@ -14,14 +14,14 @@ {% for document in course.document.all|from_course_type:type|from_doc_type:doc_type %} - {% if document.file %}{% endif %} {{ document.title }}{% if document.file %}{% endif %} + {% if document.file %}{% endif %} {{ document.title }}{% if document.file %}{% endif %} - {{ document.date_added }} - {% if document.file %}{% endif %} + {{ document.date_added }} + {% if document.file %}{% endif %} {% endfor %} diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index 660f4b1d..268d6b8e 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -11,11 +11,11 @@ {% for media in course.media.all|from_course_type:type %} {% if media.published or user.is_staff %} - {{ media.title }} - {{ media.conference.session }} - {% if media.conference.professor.user %}{{ media.conference.professor }}{% endif %} - {% if media.conference.date_begin %}{{ media.conference.date_begin }}{% endif %} - {{ media.item.approx_duration }} + {{ media.title }} + {{ media.conference.session }} + {% if media.conference.professor.user %}{{ media.conference.professor }}{% endif %} + {% if media.conference.date_begin %}{{ media.conference.date_begin }}{% endif %} + {{ media.item.approx_duration }} {% endif %} {% endfor %} -- 2.39.5