From 34bd563778174be2124c7136322699eb44e40db6 Mon Sep 17 00:00:00 2001 From: Seth Woodworth Date: Mon, 1 Jul 2013 17:57:32 -0400 Subject: [PATCH] migrate front page to foundation4, works on ipads --- karmaworld/assets/css/course_list_table.css | 30 ++++------ karmaworld/assets/css/global.css | 19 +++--- karmaworld/templates/courses/course_list.html | 59 ++++++++++--------- 3 files changed, 52 insertions(+), 56 deletions(-) diff --git a/karmaworld/assets/css/course_list_table.css b/karmaworld/assets/css/course_list_table.css index e085054..aa65013 100644 --- a/karmaworld/assets/css/course_list_table.css +++ b/karmaworld/assets/css/course_list_table.css @@ -96,8 +96,8 @@ tr.course-row:hover { table#course_list td { font-family: "MuseoSlab-300"; font-size: 18px; - float:left; - height:80px; /* required for :hover on Table Rows (when floating td elements) */ + /*float:left;*/ + /*height:80px; [> required for :hover on Table Rows (when floating td elements) <]*/ } table#course_list tbody tr td.slim { @@ -129,21 +129,16 @@ table.dataTable td.sort_by { display:none; } -td.date { - font-size: 12px; - width: 405px; -} - td.note-count { font-size: 12px; - width: 400px; /* 100% minus td.date width -- make sure the next line wraps */ + /*width: 400px; [> 100% minus td.date width -- make sure the next line wraps <]*/ } /*************** Fat Row ***************/ td.course-name { - width: 340px; + /*width: 340px;*/ } table#course_list td div.upload { @@ -156,16 +151,6 @@ table#course_list td div.upload { margin-top: -8px; } -td.school-name { - width: 200px; /* make this the same as td.date -- line up the artificial columns */ -} - -td.instructor-name { - width:200px; -} - - - table#course_list td div.upload i { display: block; @@ -184,3 +169,10 @@ table#course_list tr:hover td div.upload { font-family: "MuseoSlab-300"; font-size: 18px; } + + +/* CSS HACKS */ +/* Makes lines look better */ +td.columns { + line-height: 1.5em; +} diff --git a/karmaworld/assets/css/global.css b/karmaworld/assets/css/global.css index 6d13b4e..0a3167c 100644 --- a/karmaworld/assets/css/global.css +++ b/karmaworld/assets/css/global.css @@ -68,6 +68,7 @@ input[type="text"]:focus, textarea:focus #logo_container img { margin-top: 10px; + height: 17px; } #browse_container @@ -624,22 +625,20 @@ ul#course_menu li a } /* New course-list homepage css */ -div#subhead + +#subhead span { - padding: 15px; - padding-left: 17px; + /*margin-left: 2em;*/ font-family: "MuseoSlab-300"; - font-size: 22px; + font-size: 19px; } -#subhead img -{ - vertical-align: middle; +.subhead-spacer { + height: 42px; } -#subhead span -{ - margin-left: 2em; +#course_list_filter { + margin: 0; } .center diff --git a/karmaworld/templates/courses/course_list.html b/karmaworld/templates/courses/course_list.html index a158458..3c9f4ee 100644 --- a/karmaworld/templates/courses/course_list.html +++ b/karmaworld/templates/courses/course_list.html @@ -97,19 +97,22 @@ $(document).ready(function() { {% block content %}