From 6573f727a4c36d9ef88849b78540aa60cd058c88 Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Mon, 11 Mar 2013 10:11:20 +1100 Subject: [PATCH] MDL-38406 Separate categories view and edit page - alter CSS --- theme/base/style/admin.css | 20 +++++++++----------- theme/canvas/style/admin.css | 2 +- theme/canvas/style/tables.css | 6 +++--- theme/formal_white/style/formal_white.css | 6 +++--- theme/mymobile/style/core.css | 2 +- theme/splash/style/core.css | 2 +- theme/splash/style/pagelayout.css | 4 ++-- theme/standard/style/admin.css | 10 ++++------ 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/theme/base/style/admin.css b/theme/base/style/admin.css index e98ce044cc2da..a6ded86e0de25 100644 --- a/theme/base/style/admin.css +++ b/theme/base/style/admin.css @@ -67,15 +67,14 @@ .path-admin .incompatibleblockstable td.c0 {font-weight: bold;} -#page-admin-course-category .addcategory {padding: 10px;} -#page-admin-course-index .buttons, -#page-admin-course-category .buttons {margin-bottom: 15px;} -#page-admin-course-index .editcourse {margin:20px auto;} -#page-admin-course-index .editcourse th, -#page-admin-course-index .editcourse td {padding-left:10px;padding-right:10px;} -#page-admin-course-index .editcourse .count {text-align:right;} -#page-admin-course-index.dir-rtl .editcourse td[align="left"] {text-align: right;} -#page-admin-course-index.dir-rtl .editcourse td[align="right"] {text-align: left;} +#page-admin-course-manage .addcategory {padding: 10px;} +#page-admin-course-manage .buttons {margin-bottom: 15px;} +#page-admin-course-manage .editcourse {margin:20px auto;} +#page-admin-course-manage .editcourse th, +#page-admin-course-manage .editcourse td {padding-left:10px;padding-right:10px;} +#page-admin-course-manage .editcourse .count {text-align:right;} +#page-admin-course-manage.dir-rtl .editcourse td[align="left"] {text-align: right;} +#page-admin-course-manage.dir-rtl .editcourse td[align="right"] {text-align: left;} #page-admin-report-security-index .timewarninghidden {display:none;} #page-admin-report-security-index .statuswarning {background-color: #f0e000;} @@ -112,8 +111,7 @@ #page-admin-qtypes #qtypes img { padding-right: .45em; vertical-align: text-bottom; } .path-admin-roles .buttons .singlebutton, -#page-admin-course-index .buttons .singlebutton, -#page-admin-course-category .buttons .singlebutton {display: inline;padding: 5px;} +#page-admin-course-manage {display: inline;padding: 5px;} .path-admin-roles .capabilitysearchui {text-align: left;margin-left: auto;margin-right: auto;} #page-admin-roles-define .topfields {margin: 1em 0 2em;} diff --git a/theme/canvas/style/admin.css b/theme/canvas/style/admin.css index 5f66876395bf1..59e43fab7fbee 100644 --- a/theme/canvas/style/admin.css +++ b/theme/canvas/style/admin.css @@ -62,7 +62,7 @@ margin: 0; } -#page-admin-course-category .generalbox { +#page-admin-course-manage .generalbox { margin-bottom: 0; } diff --git a/theme/canvas/style/tables.css b/theme/canvas/style/tables.css index 40864072d730e..509543c064d9b 100644 --- a/theme/canvas/style/tables.css +++ b/theme/canvas/style/tables.css @@ -2,8 +2,8 @@ .editcourse td, .generaltable th, .generaltable td, -#page-admin-course-category .generalbox th, -#page-admin-course-category .generalbox td, +#page-admin-course-manage .generalbox th, +#page-admin-course-manage .generalbox td, #attempts th, #attempts td, .environmenttable th, @@ -14,7 +14,7 @@ border-collapse: collapse; } -#page-admin-course-category .generalbox th, +#page-admin-course-manage .generalbox th, .editcourse .header, .results .header, #attempts .header, diff --git a/theme/formal_white/style/formal_white.css b/theme/formal_white/style/formal_white.css index 9bdcfa1639a9e..75fb058bc871e 100644 --- a/theme/formal_white/style/formal_white.css +++ b/theme/formal_white/style/formal_white.css @@ -121,8 +121,8 @@ h2.main, h3.main, h4.main {margin:1em;padding:0;text-align:center;} .editcourse td, .generaltable th, .generaltable td, -#page-admin-course-category .generalbox th, -#page-admin-course-category .generalbox td, +#page-admin-course-manage .generalbox th, +#page-admin-course-manage .generalbox td, #attempts th, #attempts td, .plugincompattable th, @@ -160,7 +160,7 @@ tr.rolecap {border-top:1px dashed #F30;} tr.rolecapheading + tr.rolecap {border-top:none;} /* course categories */ -#page-admin-course-index .editcourse td div.singleselect {text-align:left;} +#page-admin-course-manage .editcourse td div.singleselect {text-align:left;} /* course */ /* ul.topics .section span.commands {float:right;} /* distanza dei comandi dagli elementi del corso */ diff --git a/theme/mymobile/style/core.css b/theme/mymobile/style/core.css index 7cde0f1b729bf..17a6299ef651f 100644 --- a/theme/mymobile/style/core.css +++ b/theme/mymobile/style/core.css @@ -1165,7 +1165,7 @@ div.gradeparent, #attemptsform .no-overflow, .usersubmissions .no-overflow { #attemptsform .no-overflow, .usersubmissions .no-overflow { max-height: 200px; } -.userenrolment .col_enrol .enrolment, #page-admin-course-category .generalbox th, .editcourse .header, .results .header, #attempts .header, .generaltable .header, .plugincompattable th, .environmenttable th, .forumheaderlist th, .path-mod-assignment #dates .c0, .userenrolment tr.r1, .userenrolment tr.r0, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th, .gradestable .lastrow td.cell, .gradestable .lastrow th.header, table#user-grades tr.avg td.cell, table#fixed_column tr.odd th, table#user-grades tr.odd th, table#user-grades tr.odd td.cell, table#user-grades td.topleft, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th { +.userenrolment .col_enrol .enrolment, #page-admin-course-manage .generalbox th, .editcourse .header, .results .header, #attempts .header, .generaltable .header, .plugincompattable th, .environmenttable th, .forumheaderlist th, .path-mod-assignment #dates .c0, .userenrolment tr.r1, .userenrolment tr.r0, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th, .gradestable .lastrow td.cell, .gradestable .lastrow th.header, table#user-grades tr.avg td.cell, table#fixed_column tr.odd th, table#user-grades tr.odd th, table#user-grades tr.odd td.cell, table#user-grades td.topleft, table#user-grades .catlevel1, table#user-grades .r1, .path-grade-report-grader table tr.even td.cell, .path-grade-report-grader table tr.even th { background-color:inherit !important; background: inherit !important; } diff --git a/theme/splash/style/core.css b/theme/splash/style/core.css index 1a99a6e4aede8..767b4f323180c 100644 --- a/theme/splash/style/core.css +++ b/theme/splash/style/core.css @@ -434,7 +434,7 @@ li.activity { .section_add_menus { text-align:left; } -#page-admin-course-category .generalbox td, +#page-admin-course-manage .generalbox td, #attempts td, .editcourse td, .generaltable td, diff --git a/theme/splash/style/pagelayout.css b/theme/splash/style/pagelayout.css index eca577cf710ae..a82e4adfd38aa 100644 --- a/theme/splash/style/pagelayout.css +++ b/theme/splash/style/pagelayout.css @@ -517,14 +517,14 @@ input[type=text],textarea,select,input[type=password]{ } .editcourse th, .generaltable th, -#page-admin-course-category .generalbox th, +#page-admin-course-manage .generalbox th, #attempts th, .plugincompattable th, .environmenttable th,.forumheaderlist th { padding:5px; } .editcourse td,.generaltable td, -#page-admin-course-category .generalbox td, +#page-admin-course-manage .generalbox td, #attempts td, .plugincompattable td, .environmenttable td, diff --git a/theme/standard/style/admin.css b/theme/standard/style/admin.css index 3fdab4738d0cd..38bb3ee495a27 100644 --- a/theme/standard/style/admin.css +++ b/theme/standard/style/admin.css @@ -1,15 +1,13 @@ /** Admin **/ -#page-admin-course-category .rolelink {text-align:right;padding:10px;} +#page-admin-course-manage .rolelink {text-align:right;padding:10px;} #page-admin-lang .generalbox, -#page-admin-course-index .singlebutton, -#page-admin-course-index .addcategory, -#page-admin-course-category .addcategory, +#page-admin-course-manage .singlebutton, +#page-admin-course-manage .addcategory, #page-admin-stickyblocks .generalbox, #page-admin-maintenance .buttons, -#page-admin-course-index .buttons, -#page-admin-course-category .buttons, +#page-admin-course-manage .buttons, #page-admin-index .copyright, #page-admin-index .copyrightnotice, #page-admin-index .adminerror,