Skip to content

Commit

Permalink
MDL-38594 Core themes changed for the new course listings styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@marinaglancy
marinaglancy committed May 3, 2013
1 parent d891aab commit 69bbd2a
Show file tree
Hide file tree
Showing 20 changed files with 170 additions and 237 deletions.
21 changes: 11 additions & 10 deletions theme/afterburner/style/afterburner_styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,20 +224,21 @@ textarea {
/*
Courses and categories lists
----------------------------*/
.coursebox .summary {
.coursebox .content .summary {
width: 100%;
float: left;
}
.coursebox .name,
.coursebox .summary,
.coursebox .coursecat,
.coursebox .teachers,
.course_category_tree .paging {
margin: 5px;
.coursebox .content .coursecat {
width: 47%;
}
.course_category_tree .category > .info .name {
padding-left: 20px;
margin: 5px;
.coursebox > .info > .name,
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile {
width: 47%;
}
#page-course-index-category .generalbox.info {
padding: 5px;
}
/*
Course Section Topic & Weekly
Expand Down
20 changes: 16 additions & 4 deletions theme/anomaly/style/general.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,30 @@ h2.tagline {
overflow: hidden;
padding-bottom: 10px;
}
.coursebox .info {
.coursebox.collapsed {
border-bottom: none;
margin: 0;
padding-bottom: 0;
}
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile,
.coursebox.remotecoursebox .remotecourseinfo {
width: 35%;
float: left;
}
.coursebox .summary {
.coursebox .content .summary,
.coursebox .content .coursecat {
width: 60%;
float: right;
}
.course_category_tree .paging.paging-morelink a {font-size:90%}

.course-content ul.section {
margin: 0;
}
#page-course-info .generalbox.info,
#page-enrol-index .generalbox.info {
border:none;
}

.course-content .headingblock.outline {
margin-top: 0;
Expand Down
17 changes: 8 additions & 9 deletions theme/arialist/style/core.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,23 +122,22 @@ h2.headingblock {
border-color: #eee;
}

.coursebox .info {
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile,
.coursebox.remotecoursebox .remotecourseinfo {
width: 35%;
}

.coursebox .info .name {
margin-bottom: 0;
.coursebox .content .summary,
.coursebox .content .coursecat {
width: 60%;
}

.coursebox .info .teachers {
.coursebox .content .teachers {
font-size: 0.9em;
color: #888;
}

.coursebox .summary {
width: 63%;
}

.course-content .section.main {
border-bottom: 1px solid #eee;
}
Expand Down
4 changes: 3 additions & 1 deletion theme/base/style/core.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ a.dimmed_text:visited,
.usersuspended a:link,
.usersuspended a:visited,
.dimmed_category,
.dimmed_category a {
.dimmed_category a,
.dimmed_category a:link,
.dimmed_category a:visited {
color: #AAA;
}
.activity.label .dimmed_text {
Expand Down
48 changes: 34 additions & 14 deletions theme/base/style/course.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.topics-format {margin-top: 8px;min-width: 763px;}

#page-course-pending .singlebutton,
#page-course-category .singlebutton,
#page-course-index .singlebutton,
#page-course-index-category .singlebutton,
#page-course-editsection .singlebutton {text-align:center;}

#coursesearch {margin-top: 1em;text-align:center;}
Expand All @@ -113,26 +114,34 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.coursebox {width: 100%;margin-bottom:15px;}
.coursebox.collapsed {margin-bottom:0}
.coursebox.collapsed > .content {display:none;}
.coursebox .name a {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;background-position: center left;}
.coursebox > .info > .name a {display:block;background-image:url([[pix:moodle|i/course]]);background-repeat: no-repeat;padding-left:21px;background-position: left top;}
.coursebox.remotehost .name a {background-image:url([[pix:moodle|i/mnethost]]);}
.coursebox .name,
.coursebox .teachers,
.coursebox > .info > .name,
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile {float:left;width:40%;clear:left;}
.coursebox .teachers li {list-style-type:none;padding:0;margin:0;}
.coursebox .content .teachers li {list-style-type:none;padding:0;margin:0;}
.coursebox .enrolmenticons {padding:3px 0;float:right;}
.coursebox .moreinfo {padding:3px 0;float:right;}
.coursebox .enrolmenticons img,
.coursebox .moreinfo img {margin:0 .2em;}
.coursebox .content {clear:both;}
.coursebox .summary,
.coursebox .coursecat {float:right;width: 55%;}
.coursebox .coursecat {text-align:right;clear:right;}
.coursebox .content {clear:both;overflow: hidden;}
.coursebox .content .summary,
.coursebox .content .coursecat {float:right;width: 55%;}
.coursebox .content .coursecat {text-align:right;clear:right;}
.coursebox.remotecoursebox .remotecourseinfo {float:left;width: 40%;}
.coursebox .content .courseimage img {max-width:100px;max-height:100px;}

.dir-rtl .coursebox .name a {padding-left:0;padding-right:21px;background-position: center right;}
.dir-rtl .coursebox .name,
.coursebox >.info >.name {margin: 5px;padding:0;}
.coursebox .content .teachers,
.coursebox .content .coursecat,
.coursebox .content .summary,
.coursebox .content .courseimage,
.coursebox .content .coursefile,
.coursebox.remotecoursebox .remotecourseinfo {margin:3px 5px;padding:0;}

.dir-rtl .coursebox > .info > .name a {padding-left:0;padding-right:21px;background-position: top right;}
.dir-rtl .coursebox > .info > .name,
.dir-rtl .coursebox .teachers,
.dir-rtl .coursebox .content .courseimage,
.dir-rtl .coursebox .content .coursefile {float:right;clear:right;}
Expand All @@ -155,12 +164,23 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
.dir-rtl .course_category_tree .category.with_children.collapsed>.info .name {background-image:url([[pix:moodle|t/collapsed_rtl]]);}
.course_category_tree .category.collapsed>.content {display:none;}

.course_category_tree .category > .info .name {padding-left:13px;}
.course_category_tree .category > .content {padding-left:16px;}
.course_category_tree .category > .info .name {padding:2px 18px;margin:3px;}
.course_category_tree .category > .content {padding-left:16px;overflow: hidden;}

.dir-rtl .course_category_tree .category > .info .name {padding-left:0;padding-right:13px;}
.dir-rtl .course_category_tree .category > .content {padding-left:0;padding-right:16px;}

.course_category_tree .subcategories > .paging,
.courses > .paging {margin:0;padding:5px;text-align:center;}

.courses > .paging.paging-morelink,
.course_category_tree .subcategories > .paging.paging-morelink {text-align:left;}

.dir-rtl .courses > .paging.paging-morelink,
.dir-rtl .course_category_tree .subcategories > .paging.paging-morelink {text-align:right;}

#page-course-info .generalbox.info,
#page-enrol-index .generalbox.info {border:none;}

.path-course .clearfloat {float:none; clear:both;height:0px;}

/* Quick edit of module name */
Expand Down
2 changes: 1 addition & 1 deletion theme/bootstrapbase/less/moodle/admin.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ img.iconsmall {
#page-admin-course-index .singlebutton,
#page-admin-course-index .addcategory,
#page-course-index .buttons,
#page-course-category .buttons,
#page-course-index-category .buttons,
#page-admin-course-category .addcategory,
#page-admin-stickyblocks .generalbox,
#page-admin-maintenance .buttons,
Expand Down
4 changes: 0 additions & 4 deletions theme/bootstrapbase/less/moodle/core.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,6 @@ img.icon-post, .dir-rtl img.icon-pre {
padding-left: 3px;
padding-right: 0;
}
.categorybox .category {
font-size: 1.2em;
font-weight: bold;
}
.boxaligncenter {
margin-left: auto;
margin-right: auto;
Expand Down
79 changes: 34 additions & 45 deletions theme/bootstrapbase/less/moodle/course.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ span.editinstructions {
/* COURSES LISTINGS AND COURSE SUMMARY */
#page-course-pending .singlebutton,
#page-course-index .singlebutton,
#page-course-index-category .singlebutton,
#page-course-editsection .singlebutton {
text-align: center;
}
Expand Down Expand Up @@ -368,32 +369,34 @@ span.editinstructions {
padding: 5px;
}

.coursebox .name a {
.coursebox > .info > .name a {
display:block;
background-image:url([[pix:moodle|i/course]]);
background-repeat: no-repeat;
padding-left:21px;
background-position: center left;
background-position: top left;
}
.coursebox.remotehost .name a {
.coursebox.remotehost > .info > .name a {
background-image:url([[pix:moodle|i/mnethost]]);
}
.coursebox .name,
.coursebox .teachers,
.coursebox > .info > .name,
.coursebox .content .teachers,
.coursebox .content .courseimage,
.coursebox .content .coursefile {
float:left;
width:40%;
clear:left;
}
.coursebox h3.name {
margin:0;
.coursebox > .info > h3.name {
margin: 5px;
font-size: 1.1em;
line-height: 1.1em;
}
.coursebox .name {
padding: 5px;
margin:0;
.coursebox > .info > .name {
margin: 5px;
padding: 0;
}
.coursebox .teachers li {
.coursebox .content .teachers li {
list-style-type:none;
padding:0;
margin:0;
Expand All @@ -413,12 +416,12 @@ span.editinstructions {
.coursebox .content {
clear:both;
}
.coursebox .summary,
.coursebox .coursecat {
.coursebox .content .summary,
.coursebox .content .coursecat {
float:right;
width: 55%;
}
.coursebox .coursecat {
.coursebox .content .coursecat {
text-align:right;
clear:right;
}
Expand All @@ -430,24 +433,22 @@ span.editinstructions {
max-width:100px;
max-height:100px;
}
.coursebox .coursecat,
.coursebox .summary,
.coursebox .courseimage,
.coursebox .coursefile,
.coursebox .teachers,
.coursebox .content .coursecat,
.coursebox .content .summary,
.coursebox .content .courseimage,
.coursebox .content .coursefile,
.coursebox .content .teachers,
.coursebox.remotecoursebox .remotecourseinfo {
padding:3px 5px;
}
.coursebox .teachers {
margin:0;
margin:3px 5px;
padding:0;
}

.dir-rtl .coursebox .name a {
.dir-rtl .coursebox > .info > .name a {
padding-left:0;
padding-right:21px;
background-position: center right;
background-position: top right;
}
.dir-rtl .coursebox .name,
.dir-rtl .coursebox > .info > .name,
.dir-rtl .coursebox .teachers,
.dir-rtl .coursebox .content .courseimage,
.dir-rtl .coursebox .content .coursefile {
Expand Down Expand Up @@ -513,7 +514,11 @@ span.editinstructions {
.course_category_tree .category>.info .name {
background-image:url([[pix:moodle|t/collapsed_empty]]);
background-repeat: no-repeat;
padding:2px 18px;
margin:3px;
background-position:center left;
font-size: 1.2em;
line-height: 1.2em;
}
.dir-rtl .course_category_tree .category>.info .name {
background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);
Expand Down Expand Up @@ -544,22 +549,10 @@ span.editinstructions {
border:none;
margin:0;
}
.course_category_tree .category >.info .name {
padding:5px 21px;
margin:0;
background-position: 3px center;
}
.dir-rtl .course_category_tree .category >.info .name {
background-position: right 3px center 0;
}
.course_category_tree .category > .content {
padding-left:16px;
}

.dir-rtl .course_category_tree .category > .info .name {
padding-left:0;
padding-right:13px;
}
.dir-rtl .course_category_tree .category > .content {
padding-left:0;
padding-right:16px;
Expand All @@ -580,23 +573,19 @@ span.editinstructions {
.course_category_tree .paging.paging-morelink a {
font-size:90%;
}
.dir-rtl .courses > .paging.paging-morelink,
.dir-rtl .course_category_tree .paging.paging-morelink {
text-align:right;
}

#page-enrol-index .generalbox.info,
#page-course-info .generalbox.info {
border:none;
}

#page-course-category .generalbox.info {
#page-course-index-category .generalbox.info {
margin-bottom: 15px;
border: 1px dotted #ddd;
.border-radius(4px);
padding: 5px;
}

#page-course-category .categorypicker {
#page-course-index-category .categorypicker {
text-align: center;
margin: 10px 0 20px;
}
5 changes: 0 additions & 5 deletions theme/bootstrapbase/less/moodle/undo.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,6 @@ img.icon-pre {
background-image: none;
}

// Homepage course listing fix
.coursebox .summary {
margin-left: 0px;
}

// Weird big margins on login page
.loginbox.twocolumns,
.loginbox.twocolumns {
Expand Down
4 changes: 2 additions & 2 deletions theme/bootstrapbase/style/moodle.css
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 69bbd2a

Please sign in to comment.