Skip to content
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

Moodle 35 fixes pt2 #126

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

Moodle 35 fixes pt2 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6f13d7
Full audit of css using theme tester. Start on making behat + php uni…
gthomas2 Sep 10, 2018
968a134
Additional fixes
gthomas2 Sep 27, 2018
29f03ca
Restore padding on nav search
gthomas2 Sep 27, 2018
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
1 change: 1 addition & 0 deletions scss/_blocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ body.path-site .block.block_settings {
background-color: #fff !important;
top: 0;
right: -100%;
padding: 0;

.moodle-core-dragdrop-draghandle {
display: none;
Expand Down
7 changes: 7 additions & 0 deletions scss/_brandcolor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ $lighter-grey-btn: #e6e6e6;
}
}

.nav-pills, .nav-tabs {
a.nav-link.active {
background: $brand-primary;
color: #fff !importantß;
}
}

.snap-dropzone-label:hover .fake-link {
color: darken($brand-primary, 8%);
}
Expand Down
7 changes: 7 additions & 0 deletions scss/_core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ html {
-webkit-font-smoothing: auto !important;
font-size: 18px;
}

#moodle-page {
font-size: 1.1rem;
}
Expand Down Expand Up @@ -844,6 +845,8 @@ footer #moodle-footer
background-color: $nav-login-bg;
border-color: $nav-login-bg;

margin: 0 1rem;

&:hover,
&:focus {
color: darken($nav-login-color, 8%);
Expand Down Expand Up @@ -1488,6 +1491,7 @@ span.calendar_event_global,
li.calendar_event_global:before,
td.calendar_event_global > a {
background-color: $brand-success;
color: #fff !important;
}

span.calendar_event_course,
Expand All @@ -1496,6 +1500,7 @@ td.calendar_event_course > a {

//salmon
background-color: salmon;
color: #fff !important;
}

span.calendar_event_group,
Expand All @@ -1504,12 +1509,14 @@ td.calendar_event_group > a {

// yellow
background-color: #fdd652;
color: #fff !important;
}

span.calendar_event_user,
li.calendar_event_user:before,
td.calendar_event_user > a {
background-color: $brand-info;
color: #fff !important;
}

td.calendar_event_global,
Expand Down
8 changes: 4 additions & 4 deletions scss/_plugins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
// Height for search input.
form > input {
height: auto;
padding-left: 0;
padding-right: 0;
border-left: 0;
border-right: 0;
}
form.search-input-form.expanded > input {
margin-left: 1em;
margin-top: -4px;
}
}

Expand Down
2 changes: 2 additions & 0 deletions scss/_themesettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
// Tab styles.
// -------------------------
#snap-admin-tabs {
display: block;

border-bottom: 0;
.nav-item {
float: none;
Expand Down
2 changes: 2 additions & 0 deletions scss/post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
@import "behat";
@import "custom";
@import "print";
// Import FontAwesome.
@import "../../boost/scss/fontawesome";
2 changes: 1 addition & 1 deletion settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
require('settings/social_media_settings.php');
require('settings/navigation_bar_settings.php');
require('settings/categories_color_settings.php');
}
}
2 changes: 1 addition & 1 deletion templates/course_modchooser_modal.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<a class="nav-link" data-toggle="tab" href="#resources" role="tab">{{#str}}resources{{/str}}</a>
</li>
<li class="nav-item" id="snap-modchooser-help-tab">
<a class="nav-link iconhelp" data-toggle="tab" href="#help" role="tab">{{#str}}helpguide, theme_snap{{/str}} {{#pix}}help, theme_snap, {{#str}}helpguide, theme_snap{{/str}}{{/pix}}</a>
<a class="nav-link iconhelp" data-toggle="tab" href="#help" role="tab">{{#str}}helpguide, theme_snap{{/str}} {{#pix}}help, theme_snap, {{#str}}helpguide, theme_snap{{/str}}{{/pix}}</a>
</li>
</ul>

Expand Down
6 changes: 5 additions & 1 deletion tests/assign_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ public function test_assign_overdue() {
// Code taken from mod/assign/tests/events_test.php test_submission_status_viewed.
$PAGE->set_url('/a_url');
// View the assignment.
$assign->view();
try {
$assign->view();
} catch (Exception $e) {

}

// Viewing an assignment creates a submission record with a status of new.
// Make sure a submission record now exists with a status of new.
Expand Down