Merge branch 'wip-MDL-39064-master' of git://github.com/marinaglancy/moodle
Conflicts: theme/bootstrap/style/generated.css
This commit is contained in:
Damyon Wiese
@@ -1,4 +1,5 @@
|
||||
/* course.less */
|
||||
/* COURSE CONTENT */
|
||||
.section_add_menus {
|
||||
text-align: right;
|
||||
}
|
||||
@@ -263,244 +264,10 @@ ul.weeks h3.sectionname {
|
||||
width: 80px;
|
||||
}
|
||||
|
||||
#page-course-enrol .generalbox,
|
||||
#page-course-enrol .coursebox {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#page-course-pending .singlebutton,
|
||||
#page-course-category #renameform,
|
||||
#page-course-category #themeform,
|
||||
#page-course-category #coursesearch,
|
||||
#page-course-category .singlebutton,
|
||||
#page-course-editsection .singlebutton {
|
||||
text-align: center;
|
||||
}
|
||||
#page-course-category #movecourses td img {
|
||||
margin: 0 .22em;
|
||||
input.titleeditor {
|
||||
width: 330px;
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
#page-course-category #movecourses td img.icon {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#coursesearch,
|
||||
#coursesearch2 {
|
||||
margin-top: 1em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#page-course-info .generalbox.icons {
|
||||
text-align: center;
|
||||
}
|
||||
#page-course-info .generalbox.info {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
#page-course-pending .pendingcourserequests {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
#page-course-pending .pendingcourserequests .singlebutton {
|
||||
display: inline;
|
||||
}
|
||||
#page-course-pending .pendingcourserequests .cell {
|
||||
padding: 0 5px;
|
||||
}
|
||||
#page-course-pending .pendingcourserequests .cell.c6 {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.coursebox {
|
||||
margin-bottom: 15px;
|
||||
border: 1px dotted #ddd;
|
||||
.border-radius(4px);
|
||||
padding: 5px;
|
||||
}
|
||||
.coursebox .summary .category {
|
||||
text-align: right;
|
||||
}
|
||||
.coursebox .teachers li {
|
||||
list-style-type: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
.coursebox .enrolmenticons img {
|
||||
margin-right: .45em;
|
||||
}
|
||||
.coursebox .enrolmenticons {
|
||||
border: 1px dotted #DDDDDD;
|
||||
.border-radius(3px);
|
||||
margin-top: 0.3em;
|
||||
padding: 3px;
|
||||
}
|
||||
|
||||
.coursebox h3.name {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.coursebox .info,
|
||||
.coursebox .summary {
|
||||
border: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
float: none;
|
||||
width: none;
|
||||
.box-sizing(border-box);
|
||||
display: block;
|
||||
float: left;
|
||||
margin-left: 2.76243%;
|
||||
min-height: 30px;
|
||||
}
|
||||
|
||||
.coursebox .summary {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.categorylist .category .numberofcourse {
|
||||
font-size: @fontSizeSmall;
|
||||
}
|
||||
.categorylist .category {
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
.categorylist .info,
|
||||
.categorylist .name,
|
||||
.categorylist .category .image {
|
||||
display: inline-block;
|
||||
margin-left: .2em;
|
||||
margin-right: .2em;
|
||||
}
|
||||
.categorylist .course {
|
||||
padding-left: 24px;
|
||||
margin-bottom: .5em;
|
||||
line-height: 1.5em;
|
||||
}
|
||||
.categorylist .indentation {
|
||||
margin-left: 24px;
|
||||
}
|
||||
|
||||
.course ul.section {
|
||||
margin: 5px;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.weeks-format,
|
||||
.topics-format {
|
||||
margin-top: 8px;
|
||||
min-width: 763px;
|
||||
}
|
||||
.categoryboxcontent {
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
}
|
||||
|
||||
/* Course and category combo list on front page */
|
||||
.course_category_tree .controls {
|
||||
visibility: hidden;
|
||||
}
|
||||
.course_category_tree .controls div {
|
||||
display: inline;
|
||||
cursor: pointer;
|
||||
}
|
||||
.course_category_tree .category.with_children>.category_label {
|
||||
background-image: url([[pix:moodle|t/expanded]]);
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.course_category_tree .category_label {
|
||||
padding-left: 13px;
|
||||
}
|
||||
.course_category_tree .category .category {
|
||||
margin: 5px 0;
|
||||
}
|
||||
.course_category_tree .category .courses {
|
||||
padding-left: 16px;
|
||||
}
|
||||
.course_category_tree .category .courses .course_link {
|
||||
display: block;
|
||||
background-image: url([[pix:moodle|i/course]]);
|
||||
background-repeat: no-repeat;
|
||||
padding-left: 21px;
|
||||
}
|
||||
.course_category_tree .category .course {
|
||||
position: relative;
|
||||
}
|
||||
.course_category_tree .category .course_info {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
.dir-rtl .course_category_tree .category .course_info {
|
||||
position: static;
|
||||
}
|
||||
.dir-rtl .course_category_tree .category .course_info a,
|
||||
.dir-rtl .course_category_tree .category .course_info div {
|
||||
float: right;
|
||||
}
|
||||
.dir-rtl .course_category_tree .controls div {
|
||||
padding: 7px;
|
||||
}
|
||||
.course_category_tree .category .course_info img {
|
||||
margin-left: .45em;
|
||||
}
|
||||
.dir-rtl .course_category_tree .category .course_info img {
|
||||
margin-right: .45em;
|
||||
margin-left: 0;
|
||||
}
|
||||
.jsenabled .course_category_tree .controls {
|
||||
visibility: visible;
|
||||
}
|
||||
.jsenabled .course_category_tree .category.with_children.collapsed .category_label {
|
||||
background-image: url([[pix:moodle|t/collapsed]]);
|
||||
}
|
||||
.jsenabled .course_category_tree .category.with_children.collapsed .subcategories,
|
||||
.jsenabled .course_category_tree .category.with_children.collapsed .courses {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/**
|
||||
* Overide for RTL layout
|
||||
*/
|
||||
.dir-rtl .coursebox .info {
|
||||
float: right;
|
||||
text-align: right;
|
||||
}
|
||||
.dir-rtl .coursebox .summary {
|
||||
text-align: right;
|
||||
}
|
||||
.dir-rtl .course_category_tree .category.with_children > .category_label {
|
||||
background-position: center right;
|
||||
padding-right: 18px;
|
||||
}
|
||||
.dir-rtl .course_category_tree .category_label, .dir-rtl .course_category_tree .category .course {
|
||||
padding-right: 18px;
|
||||
}
|
||||
.dir-rtl.jsenabled .course_category_tree .category.with_children.collapsed .category_label {
|
||||
background-image: url([[pix:moodle|t/collapsed_rtl]]);
|
||||
}
|
||||
.dir-rtl .course_category_tree .category .courses .course_link {
|
||||
background-position: center right;
|
||||
padding-right: 18px;
|
||||
}
|
||||
.dir-rtl .categorylist .course {
|
||||
padding-right: 18px;
|
||||
}
|
||||
|
||||
#page-course-index.dir-rtl .category .image {
|
||||
padding-left: 5px;
|
||||
padding-right: 0;
|
||||
}
|
||||
#page-course-index.dir-rtl .indentation {
|
||||
padding-left: 0;
|
||||
padding-right: 30px;
|
||||
}
|
||||
|
||||
table.category_subcategories {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
table.category_subcategories td {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
span.editinstructions {
|
||||
position: absolute;
|
||||
@@ -522,10 +289,6 @@ span.editinstructions {
|
||||
left: auto;
|
||||
right: 32px;
|
||||
}
|
||||
input.titleeditor {
|
||||
width: 330px;
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
|
||||
/* Course drag and drop upload styles */
|
||||
#dndupload-status {
|
||||
@@ -563,3 +326,274 @@ input.titleeditor {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* COURSES LISTINGS AND COURSE SUMMARY */
|
||||
#page-course-pending .singlebutton,
|
||||
#page-course-index .singlebutton,
|
||||
#page-course-editsection .singlebutton {
|
||||
text-align: center;
|
||||
}
|
||||
#page-admin-course-manage #movecourses td img {
|
||||
margin: 0 .22em;
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
#page-admin-course-manage #movecourses td img.icon {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#coursesearch {
|
||||
margin-top: 1em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#page-course-pending .pendingcourserequests {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
#page-course-pending .pendingcourserequests .singlebutton {
|
||||
display: inline;
|
||||
}
|
||||
#page-course-pending .pendingcourserequests .cell {
|
||||
padding: 0 5px;
|
||||
}
|
||||
#page-course-pending .pendingcourserequests .cell.c6 {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.coursebox {
|
||||
margin-bottom: 15px;
|
||||
border: 1px dotted #ddd;
|
||||
.border-radius(4px);
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.coursebox .name a {
|
||||
display:block;
|
||||
background-image:url([[pix:moodle|i/course]]);
|
||||
background-repeat: no-repeat;
|
||||
padding-left:21px;
|
||||
background-position: center left;
|
||||
}
|
||||
.coursebox.remotehost .name a {
|
||||
background-image:url([[pix:moodle|i/mnethost]]);
|
||||
}
|
||||
.coursebox .name,
|
||||
.coursebox .teachers,
|
||||
.coursebox .content .courseimage,
|
||||
.coursebox .content .coursefile {
|
||||
float:left;
|
||||
width:40%;
|
||||
clear:left;
|
||||
}
|
||||
.coursebox h3.name {
|
||||
margin:0;
|
||||
}
|
||||
.coursebox .name {
|
||||
padding: 5px;
|
||||
margin:0;
|
||||
}
|
||||
.coursebox .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.remotecoursebox .remotecourseinfo {
|
||||
float:left;
|
||||
width: 40%;
|
||||
}
|
||||
.coursebox .content .courseimage img {
|
||||
max-width:100px;
|
||||
max-height:100px;
|
||||
}
|
||||
.coursebox .coursecat,
|
||||
.coursebox .summary,
|
||||
.coursebox .courseimage,
|
||||
.coursebox .coursefile,
|
||||
.coursebox .teachers,
|
||||
.coursebox.remotecoursebox .remotecourseinfo {
|
||||
padding:3px 5px;
|
||||
}
|
||||
.coursebox .teachers {
|
||||
margin:0;
|
||||
}
|
||||
|
||||
.dir-rtl .coursebox .name a {
|
||||
padding-left:0;
|
||||
padding-right:21px;
|
||||
background-position: center right;
|
||||
}
|
||||
.dir-rtl .coursebox .name,
|
||||
.dir-rtl .coursebox .teachers,
|
||||
.dir-rtl .coursebox .content .courseimage,
|
||||
.dir-rtl .coursebox .content .coursefile {
|
||||
float:right;
|
||||
clear:right;
|
||||
}
|
||||
.dir-rtl .coursebox .enrolmenticons,
|
||||
.dir-rtl .coursebox .moreinfo {
|
||||
float:left;
|
||||
}
|
||||
.dir-rtl .coursebox .summary,
|
||||
.dir-rtl .coursebox .coursecat {
|
||||
float:left;
|
||||
}
|
||||
.dir-rtl .coursebox .coursecat {
|
||||
text-align:left;
|
||||
clear:left;
|
||||
}
|
||||
|
||||
.coursebox.collapsed {
|
||||
margin-bottom:0;
|
||||
}
|
||||
.coursebox.collapsed > .content {
|
||||
display:none;
|
||||
}
|
||||
.courses .coursebox.collapsed {
|
||||
border:1px solid #eeeeee;
|
||||
padding:3px 0;
|
||||
}
|
||||
|
||||
.courses .coursebox.even {
|
||||
background-color:#f6f6f6;
|
||||
}
|
||||
.courses .coursebox:hover,
|
||||
.course_category_tree .courses > .paging:hover {
|
||||
background-color:#eeeeee;
|
||||
}
|
||||
|
||||
.course_category_tree .category .numberofcourse {
|
||||
font-size: 0.85em;
|
||||
}
|
||||
|
||||
.course_category_tree .controls {
|
||||
visibility: hidden;
|
||||
}
|
||||
.course_category_tree .controls div {
|
||||
display:inline;
|
||||
cursor:pointer;
|
||||
}
|
||||
.jsenabled .course_category_tree .controls {
|
||||
visibility: visible;
|
||||
}
|
||||
.course_category_tree .controls {
|
||||
margin-bottom:5px;
|
||||
text-align:right;
|
||||
float:right;
|
||||
}
|
||||
.course_category_tree .controls div {
|
||||
padding-right:2em;
|
||||
font-size:75%;
|
||||
}
|
||||
|
||||
.course_category_tree .category>.info .name {
|
||||
background-image:url([[pix:moodle|t/collapsed_empty]]);
|
||||
background-repeat: no-repeat;
|
||||
background-position:center left;
|
||||
}
|
||||
.dir-rtl .course_category_tree .category>.info .name {
|
||||
background-image:url([[pix:moodle|t/collapsed_empty_rtl]]);
|
||||
background-position:center right;
|
||||
}
|
||||
.course_category_tree .category.with_children>.info .name {
|
||||
background-image:url([[pix:moodle|t/expanded]]);
|
||||
}
|
||||
.course_category_tree .category.with_children.collapsed>.info .name {
|
||||
background-image:url([[pix:moodle|t/collapsed]]);
|
||||
}
|
||||
.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 {
|
||||
.well;
|
||||
min-height:0;
|
||||
padding:0;
|
||||
margin:3px 0;
|
||||
margin-bottom:3px;
|
||||
}
|
||||
.course_category_tree.frontpage-category-names .category >.info {
|
||||
background:none;
|
||||
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;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
.course_category_tree .paging.paging-morelink a {
|
||||
font-size:90%;
|
||||
}
|
||||
.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 {
|
||||
margin-bottom: 15px;
|
||||
border: 1px dotted #ddd;
|
||||
.border-radius(4px);
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
#page-course-category .categorypicker {
|
||||
text-align: center;
|
||||
margin: 10px 0 20px;
|
||||
}
|
||||
|
||||
@@ -60,41 +60,6 @@
|
||||
.box-sizing(border-box);
|
||||
}
|
||||
}
|
||||
// Course
|
||||
@media (min-width: 1200px) {
|
||||
.coursebox .info,
|
||||
.coursebox .summary {
|
||||
width: 48.717948717948715%;
|
||||
*width: 48.664757228587014%;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 980px) {
|
||||
.coursebox .info,
|
||||
.coursebox .summary {
|
||||
width: 48.617948717948715%;
|
||||
*width: 48.664757228587014%;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 768px) and (max-width: 979px) {
|
||||
.coursebox .info,
|
||||
.coursebox .summary {
|
||||
width: 48.61878453038674%;
|
||||
*width: 48.56559304102504%;
|
||||
}
|
||||
}
|
||||
|
||||
@media ( max-width : 767px) {
|
||||
.coursebox .info,
|
||||
.coursebox .summary {
|
||||
display: block;
|
||||
float: none;
|
||||
width: 100%;
|
||||
margin-left: 0;
|
||||
.box-sizing(border-box);
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
// copied from tabs.less stacked-navs
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user