Permalink
Browse files

Merge branch 'MDL-37749_M24' of git://github.com/lazydaisy/moodle int…

…o MOODLE_24_STABLE
  • Loading branch information...
2 parents e3f6d84 + fbf87b8 commit e23d098117205e2fb3ee40f8cfe54040bde91b8d @danpoltawski danpoltawski committed Feb 19, 2013
Showing with 2 additions and 57 deletions.
  1. +0 −13 theme/mymobile/javascript/custom.js
  2. +2 −44 theme/mymobile/style/core.css
@@ -243,19 +243,6 @@ $(document).ready(function() {
$('.path-mod-hotpot button').attr("data-role", "none");
});
- //collapsed topic only stuff
- $('div#page-course-view-topcollPAGE').live('pagebeforecreate',function(event, ui){
- $('#page-course-view-topcollPAGE ul.section').attr("data-role", "none");
- $('.section li img').removeClass("ui-li-icon");
- $.getScript('../course/format/topcoll/module.js');
- $('#page-course-view-topcollPAGE tr.cps a').attr("data-role", "button").attr("data-icon", "arrow-r");
- $('#page-course-view-topcollPAGE #thetopics').attr("data-role", "controlgroup");
- $('#page-course-view-topcollPAGE td.cps_centre').each(function(index) {
- var cpsc = $(this).text().replace('<br>','').replace(')','');
- $(this).prev('td').find('a').append('<span class="ui-li-count ui-btn-up-a ui-btn-corner-all">' + cpsc + '</span>');
- });
- });
-
///// functions below does stuff after creating page for some cleaning...
$('div').live('pageinit',function(event, ui){
$('.path-calendar div.ui-radio label:first-child, .path-mod-lesson div.ui-radio label:first-child, #page-mod-wiki-createPAGE div.ui-radio label:first-child').addClass("afirst");
@@ -1367,49 +1367,7 @@ a.comment-link, .block_comments a.showcommentsnonjs, .block_comments .comment-ar
.block_comments .comment-ctrl {
display: block;
}
-/*collapsed topic format*/
-#thetopics {
- table-layout: inherit !important;
- width: 100%;
- display: block !important;
-}
-#page-course-view-topcollPAGE .section td.content, col.content {
- text-align: left;
- width: 100% !important;
- overflow: hidden;
-}
-#page-course-view-topcollPAGE .section td.content {
- padding: .5em;
-}
-#page-course-view-topcollPAGE td.left.side, #page-course-view-topcollPAGE td.right.side {
- display: none;
-}
-#page-course-view-topcollPAGE tr.cps td a {
- background: none !important;
- color: inherit !important;
- padding: 7px 0 7px 0px !important;
-}
-tr.cps td span {
- font-style: inherit !important;
- font-size: 1.12em !important;
-}
-#page-course-view-topcollPAGE .section.separator, td.cps_centre {
- display: none;
-}
-tr.cps {
- background-color: inherit !important;
- color: inherit !important;
-}
-.opencps .ui-btn-inner .ui-icon-arrow-r {
- background-position: -216px 50%;
-}
-tr.cps td span.ui-li-count {
- font-size: .6em !important;
- right: 12px;
-}
-#page-course-view-topcollPAGE .cps .ui-btn-inner {
- white-space: normal;
-}
+
/*filemanager fixes and other button fixes and adds */
#page-mod-quiz-reportPAGE #commands input[type="submit"], #newmessagelinks a, .que input.submit {
display: block !important;
@@ -1476,7 +1434,7 @@ overflow:auto !important;
opacity: 0.8;
}
/*current highlight */
-.weeks .current .headingwrap, .topics .current div.headingwrap, .current .ui-bar-b, .current .left.side, .tabtree ul.tabrow0 li.selected a, .ui-btn-active, #page-course-view-topcollPAGE .current {
+.weeks .current .headingwrap, .topics .current div.headingwrap, .current .ui-bar-b, .current .left.side, .tabtree ul.tabrow0 li.selected a, .ui-btn-active {
border: 1px solid #F7C942;
background: #fadb4e;
color: #333;

0 comments on commit e23d098

Please sign in to comment.