mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64910-master' of git://github.com/peterRd/moodle

Browse Source
This commit is contained in:
Jake Dallimore 2019-05-03 12:09:47 +08:00
commit 55e5530f97
7 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blocks/myoverview/templates/view-cards.mustache
View File

@ -55,7 +55,9 @@
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
<div>{{{coursecategory}}}</div>
<span class="categoryname">
{{{coursecategory}}}
</span>
{{/coursecategory}}
{{$divider}}
<div class="pl-1 pr-1">|</div>

24
blocks/myoverview/templates/view-list.mustache
View File

@ -42,14 +42,14 @@
data-course-id="{{{id}}}">
<div class="row-fluid">
<div class="{{#hasprogress}}col-md-6{{/hasprogress}}{{^hasprogress}}col-md-11 col-md-11{{/hasprogress}} d-flex align-items-center">
<a href="{{viewurl}}" class="coursename">
<div class="text-muted muted d-flex" style="flex-flow:wrap;">
<div>
<div class="text-muted muted d-flex flex-wrap">
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
{{$coursecategory}}
<div>{{{coursecategory}}}</div>
{{/coursecategory}}
<span class="categoryname">
{{{coursecategory}}}
</span>
{{#showshortname}}
<div class="pl-1 pr-1">|</div>
<span class="sr-only">
@ -58,12 +58,14 @@
<div>{{{shortname}}}</div>
{{/showshortname}}
</div>
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
</span>
{{{fullname}}}
</a>
<a href="{{viewurl}}" class="coursename">
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
</span>
{{{fullname}}}
</a>
</div>
</div>
{{#hasprogress}}
<div class="col-md-5 pt-1">

32
blocks/myoverview/templates/view-summary.mustache
View File

@ -48,23 +48,25 @@
</a>
<div class="align-self-stretch d-flex flex-column w-100">
<div class="text-muted muted mb-1 d-flex flex-wrap">
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
{{$coursecategory}}
<span class="categoryname">
{{{coursecategory}}}
</span>
{{/coursecategory}}
{{#showshortname}}
<div class="pl-1 pr-1">|</div>
<span class="sr-only">
{{#str}}aria:courseshortname, core_course{{/str}}
</span>
<div>{{{shortname}}}</div>
{{/showshortname}}
</div>
<div class="d-flex mb-1">
<a href="{{viewurl}}" class="coursename">
<div class="text-muted muted mb-1 d-flex" style="flex-flow:wrap;">
<span class="sr-only">
{{#str}}aria:coursecategory, core_course{{/str}}
</span>
{{$coursecategory}}
<div>{{{coursecategory}}}</div>
{{/coursecategory}}
{{#showshortname}}
<div class="pl-1 pr-1">|</div>
<span class="sr-only">
{{#str}}aria:courseshortname, core_course{{/str}}
</span>
<div>{{{shortname}}}</div>
{{/showshortname}}
</div>
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}

18
course/templates/coursecard.mustache
View File

@ -43,8 +43,8 @@
</a>
<div class="card-body pr-1 course-info-container" id="course-info-container-{{id}}-{{uniqid}}">
<div class="d-flex align-items-start">
<a href="{{viewurl}}" class="coursename mr-2 text-truncate">
<div class="text-muted muted d-flex w-100 mb-1 text-truncate" style="flex-flow:wrap;">
<div>
<div class="text-muted muted d-flex w-100 mb-1 text-truncate flex-wrap">
{{$coursecategory}}{{/coursecategory}}
{{#showshortname}}
{{$divider}}{{/divider}}
@ -56,12 +56,14 @@
</div>
{{/showshortname}}
</div>
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
</span>
{{$coursename}}{{/coursename}}
</a>
<a href="{{viewurl}}" class="coursename mr-2 text-truncate">
{{> core_course/favouriteicon }}
<span class="sr-only">
{{#str}}aria:coursename, core_course{{/str}}
</span>
{{$coursename}}{{/coursename}}
</a>
</div>
{{$menu}}{{/menu}}
</div>
</div>

1
theme/boost/scss/moodle/blocks.scss
View File

@ -99,6 +99,7 @@ $card-gutter : $card-deck-margin * 2;
margin-top: -0.5rem;
}
a.coursename,
span.categoryname,
.btn-link {
color: inherit;
}

1
theme/boost/style/moodle.css
View File

@ -11258,6 +11258,7 @@ div.editor_atto_toolbar button .icon {
margin-top: -0.5rem; }
.block .block-cards a.coursename,
.block .block-cards span.categoryname,
.block .block-cards .btn-link {
color: inherit; }

1
theme/classic/style/moodle.css
View File

@ -11499,6 +11499,7 @@ div.editor_atto_toolbar button .icon {
margin-top: -0.5rem; }
.block .block-cards a.coursename,
.block .block-cards span.categoryname,
.block .block-cards .btn-link {
color: inherit; }