Skip to content

update 2.9 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kndnsow wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update 2.9 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26f2311
Update version.php
kndnsow Dec 27, 2022
8d52a54
.
Dec 29, 2022
3cc9d56
.
Jan 28, 2023
e54d145
update 2.9
Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/core_renderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@



class theme_rocket_core_renderer extends core_renderer {
class theme_rocket_core_renderer extends \core_renderer {
/**
* Renders a custom menu object (located in outputcomponents.php)
*
Expand Down
8 changes: 3 additions & 5 deletions config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$THEME->name = 'rocket';
if($CFG->version >= 2016120500){
$THEME->parents = array('base','bootstrapbase');
}else {
$THEME->parents = array('base');
}
$THEME->parents = ['classic'];
$THEME->haseditswitch = false;
$THEME->enable_dock = false;
$THEME->sheets = array(
'rocket_layout', /* Must come first: Page layout */
'rocket_styles', /* Must come second: default styles */
Expand Down
2 changes: 1 addition & 1 deletion layout/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<html <?php echo $OUTPUT->htmlattributes() ?>>
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<link rel="shortcut icon" href="<?php echo $OUTPUT->image_url('favicon', 'theme')?>" />
<!-- START AUTOHIDE STATUS CHECK -->
<?php
if (!empty($PAGE->theme->settings->autohide)) {
Expand Down
1 change: 1 addition & 0 deletions layout/frontpage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
</div>
</div>
</div>

<div id="headerstrip" class="duc_frontpage_headerstrip">
<div class="block-region" id="search">
<div class="region-content">
Expand Down
2 changes: 1 addition & 1 deletion renderers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ protected function render_navigation_node(navigation_node $item) {
/**
* Reformat edit button to new status indicator
*/
public function edit_button(moodle_url $url) {
public function edit_button(moodle_url $url, string $method = 'post') {
$edittoggle = 'enable';
if (!empty($this->page->theme->settings->edittoggle)) {
$edittoggle = $this->page->theme->settings->edittoggle;
Expand Down
91 changes: 47 additions & 44 deletions style/acustom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,45 @@
.duc_usermenu {
float:right;
padding-bottom: 10px;
padding-bottom: 0.625rem;
}

.duc_nav_plugin_output {
float:left;
padding-top: 15px;
padding-top: 0.938rem;
}

.duc_frontpage_headerstrip {
height:50px ! important;
height:3.125rem ! important;
}

.duc_forced_headerstrip_class {
height:90px ! important;
height:5.625rem! important;
}

.duc_nav_title {
font-size: 10px ! important;
font-size: 0.625rem ! important;
}

.duc_navbar {
background: transparent ! important;
padding-bottom: 10px !important;
padding-bottom: 0.625rem !important;
}

#ebutton {
margin-right: 100px !important;
margin-top: 0px !important;
margin-right: 6.25rem !important;
margin-top: 0rem !important;
}

.popover-region-notifications {
margin-right: 30px !important;
}

.popover-region-messages {
margin-right: 20px !important;
margin-right: 1.25rem !important;
}

/*#region-main, .region-content {
width: 100% !important;
padding: 0px !important;
}*/
#region-main, .region-content {

}

#adminsettings fieldset {
width: 70% !important;
Expand Down Expand Up @@ -69,18 +67,18 @@
}

#ebutton .singlebutton {
margin-top: 10px !important;
margin-bottom: 0px !important;
height: 28px !important;
margin-bottom: 0rem !important;
height: 1.75rem !important;
margin-top: 1rem;
}

.loginpanel{
margin-bottom: 0px !important;
padding-bottom: 0px !important;
margin-bottom: 0rem !important;
padding-bottom: 0rem !important;
}

.loginform {
margin-left: -50px !important;
margin: 1rem;
}

.block-hider-hide, .block-hider-show, .customcommand {
Expand All @@ -90,7 +88,6 @@
#page-wrapper {
width: 80% !important;
}

.side-post-only #region-main-box {
width: 100% !important;
float: none !important;
Expand Down Expand Up @@ -154,9 +151,12 @@
}

.side-pre-only #region-main-wrap {
width: 70% !important;
width: 69% !important;
right: 0% !important;
float: left !important;
margin-top: 2rem !important;
border-radius:0.5rem ;
overflow: hidden;
}

.editing.pagelayout-mydashboard #region-main-wrap {
Expand All @@ -177,42 +177,42 @@

.side-post-only #region-post {
width: 30% !important;
left: 0px !important;
left: 0rem !important;
float: right !important;
}

.side-pre-only #region-post {
width: 0% !important;
left: 0px !important;
left: 0rem !important;
float: right !important;
}

.editing.pagelayout-mydashboard #region-post {
width: 30% !important;
left: 0px !important;
left: 0rem !important;
float: right !important;
}

#region-post {
width: 30% !important;
left: 0px !important;
left: 0rem !important;
float: right !important;
}

.side-post-only #region-main-pad {
margin: 0px 0px 0px 0px !important;
margin: 0rem 0rem 0rem 0rem !important;
}

#region-main-pad {
margin: 0px 0px 0px 0px !important;
margin: 0rem 0rem 0rem 0rem !important;
}

#region-content {
width: 100% !important;
}

.block {
padding: 0px 0 !important;
padding: 0rem 0 !important;
border: none !important;
}

Expand All @@ -222,7 +222,7 @@

#navcontainer {
margin-top: 9% !important;
height: 36px;
height: 2.25rem;
}

ul.indented-list {
Expand All @@ -231,12 +231,12 @@ ul.indented-list {

[class*="span"] {
float: left !important;
min-height: 1px !important;
margin-left: 0px !important;
min-height: 0.063rem !important;
margin-left: 0rem !important;
}

.row {
margin-left: 0px !important;
margin-left: 0rem !important;
}

.offset6 {
Expand All @@ -256,7 +256,7 @@ ul.indented-list {

#toplinks .region-content {
margin: 0;
padding: 10px !important;
color: #fff;
}

#hometopblocks {
Expand All @@ -272,7 +272,7 @@ ul.indented-list {
}

#td1 {
width: 25% !important;
width: 30% !important;
}

#td1 a.logo{
Expand Down Expand Up @@ -304,12 +304,11 @@ ul.indented-list {
.duc_nav_plugin_output {
float: right !important;
padding-top: 0% !important;
display: inline-block !important;
padding-top: 15px !important
display: flex !important;
}

.headermenu {
right: 0px !important;
right: 0rem !important;
}

#navcontainer {
Expand Down Expand Up @@ -348,7 +347,7 @@ ul.indented-list {
}

.pagelayout-login.path-login.content-only .region-content > div {
padding: 0px !important;
padding: 0rem !important;
margin-top: 20% !important;
}

Expand All @@ -363,12 +362,12 @@ ul.indented-list {
}

#notice .singlebutton+.singlebutton input, .submit.buttons input[name="cancel"] {
margin: 0 0 0px 5px !important;
margin: 0 0 0rem 0.313rem !important;
}

input[type=checkbox], input[type=radio] {
margin-top: 0px !important;
margin-left: 20px !important;
margin-top: 0rem !important;
margin-left: 1.25rem !important;
}

#page-admin-registration-register .registration_textfield {
Expand All @@ -382,7 +381,6 @@ input[type=checkbox], input[type=radio] {
.mform .fitem .felement {
border-width: 0;
width: 70% !important;
margin-left: 30% !important;
}

div.jcontrolsleft {
Expand All @@ -398,7 +396,7 @@ div.jcontrolsleft {
}

.block .content {
border:1px solid !important;
border:0.063rem solid !important;
}

.course_category_tree .category > .info > .categoryname {
Expand All @@ -416,3 +414,8 @@ background-size: 100% 100% !important;
background-position: 0 0 !important;
}


button.btn.btn-secondary {
float: right;
clear: both;
}
8 changes: 5 additions & 3 deletions style/rocket_autohide.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#dndupload-status {
display: none;
}

.columnleft.blockcolumn.has-blocks {
width: 30% !important;
}
.block .header .commands a img,
.path-course-view .section .content li .commands a img,
.path-course-view .section .content .summary a img.icon.edit{
Expand Down Expand Up @@ -54,11 +56,11 @@
}

.path-course-view .section .content li {
padding: 3px;
padding: 0.188rem;
}

.editing .section .content li:hover {
border: 1px dashed #ff6666;
border: 0.063rem dashed #ff6666;
}

/** some feedback to tell user we are in editing mode **/
Expand Down
Loading