Commit 20cf4d20 authored by Liam Sharpe's avatar Liam Sharpe Committed by Son Nguyen
Browse files

Changes some of the colors around mahara slightly to fix the contrast - Bug #1465107

behatnotneeded

Change-Id: Ibe2edeeb178018e7d0bdf9814ce31c2f03f742fb
parent 7a993ffe
......@@ -33,7 +33,7 @@ $quotasform = pieform(array(
'hiddenlabel' => true,
'title' => get_string('filequota1', 'admin'),
'defaultvalue' => $group->quota,
'description' => '<p class="text-small text-lighttone">' .get_string('groupfilequotadescription', 'admin') . '</p>',
'description' => '<p class="text-small text-midtone">' .get_string('groupfilequotadescription', 'admin') . '</p>',
),
'submit' => array(
'type' => 'submit',
......
......@@ -337,7 +337,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
$html = '<span class="blocktype_internalmedia_mp3" id="' . $id . '" style="display:block;width:'.$width.'px;height:'.$height.'px;"></span>';
$html .= '<span id="' . $id . '_h">' . get_string('flashanimation', 'blocktype.file/internalmedia') . '</span>';
$html .= '<div class="media-download content-text"><span class="icon icon-download left"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
$html .= '<span class="text-lighttone text-small"> ['.$filesize.'] </span></div>';
$html .= '<span class="text-midtone text-small"> ['.$filesize.'] </span></div>';
$html .= '<script type="application/javascript">
flowplayer("'.$id.'", "'.$playerurl.'", {
clip: {
......
......@@ -1025,14 +1025,14 @@ EOF;
return "
function (r, d) {
if (!{$bodystring} && !{$attachstring}) {
return TD(null, SPAN(null, {$titlestring}), DIV({'class': 'detail text-lighttone'}, {$extrastring}));
return TD(null, SPAN(null, {$titlestring}), DIV({'class': 'detail text-midtone'}, {$extrastring}));
}
var link = A({'class': 'toggle textonly', 'href': ''}, {$titlestring});
connect(link, 'onclick', function (e) {
e.stop();
return showhideComposite(r, {$bodystring}, {$attachstring});
});
var extra = DIV({'class': 'detail text-lighttone'}, {$extrastring});
var extra = DIV({'class': 'detail text-midtone'}, {$extrastring});
return TD({'id': 'composite-' + r.artefact + '-' + r.id}, DIV({'class': 'expandable-head'}, link, extra));
},
";
......
......@@ -7,10 +7,3 @@
}
}
}
.outer-link {
&:focus,
&:hover {
background-color: rgba(250, 255, 234, 0.2);
}
}
......@@ -29,7 +29,7 @@
color: #FFFFFF;
}
.metadata {
.text-midtone {
color: #eef3e9;
font-size: 11px;
margin-top: 5px;
......
......@@ -10,4 +10,3 @@ $theme-accent-color: #474220;
$theme-text-lighttone-color: #888;
$theme-text-midtone-color: #888;
......@@ -4,8 +4,8 @@
border-color: $brand-secondary;
color: #FFF;
.metadata {
color: desaturate(lighten($theme-secondary-color, 30), 26);
.text-midtone {
color: desaturate(lighten($theme-secondary-color, 30), 10);
}
}
}
\ No newline at end of file
......@@ -135,7 +135,7 @@ jQuery(function($) {
if(context.find('.js-dropdown-context').length > 0){
context.find('.js-dropdown-context').html('(' + val + ')');
} else {
context.find('.js-with-dropdown label').append('<em class="js-dropdown-context metadata">('+ val + ')</em>');
context.find('.js-with-dropdown label').append('<em class="js-dropdown-context text-midtone text-small">('+ val + ')</em>');
}
}
......
......@@ -9,7 +9,7 @@ return <<<EOF
<div class="checkbox">
{$element['html']}
{$element['labelhtml']}
<div class="text-small text-lighttone with-label">
<div class="text-small text-midtone with-label">
{$element['description']}
<a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
</div>
......@@ -73,7 +73,7 @@ $row = $col = 0;
$itemsinrow = 3;
foreach ($elements as $key => $element) {
if (substr($key, 0, 11) == 'collection_') {
$body[$row][$col] = '<div class="checkbox">' . $element['html'] . $element['labelhtml'] . '<p class="with-label text-small text-lighttone labeldescriptpreview">' . hsc($element['description']) . '</p></div>';
$body[$row][$col] = '<div class="checkbox">' . $element['html'] . $element['labelhtml'] . '<p class="with-label text-small text-midtone labeldescriptpreview">' . hsc($element['description']) . '</p></div>';
$col++;
if ($col % $itemsinrow == 0) {
$row++;
......
......@@ -56,14 +56,14 @@
<div id="{$feedback.id}_desc" class="detail hidden">
{$feedback.description|clean_html|safe}
</div>
<span id="annotationfeedbackstatus{$feedback.id}" class="annotationfeedbackstatus text-small text-lighttone">
<span id="annotationfeedbackstatus{$feedback.id}" class="annotationfeedbackstatus text-small text-midtone">
{if $feedback.private}
{str tag=private section=artefact.annotation}
{else}
{str tag=public section=artefact.annotation}
{/if}
</span>
<div id="annotationfeedbackdetails_{$feedback.id}" class="annotationfeedbackdetails text-small text-lighttone">
<div id="annotationfeedbackdetails_{$feedback.id}" class="annotationfeedbackdetails text-small text-midtone">
{str tag=enteredon section=artefact.annotation} {$feedback.ctime}
</div>
<!-- TODO Display existing annotation feedbacks and annotation feedback count with section title -->
......
......@@ -22,7 +22,7 @@
</div>
{/if}
<div class="taggedpost-title text-lighttone panel-body flush">
<div class="taggedpost-title text-midtone panel-body flush">
{$blockheading|clean_html|safe}
{if $viewowner}
{$tag} {str tag='by' section='artefact.blog'}
......@@ -33,9 +33,9 @@
</div>
{if $configerror}
<span class="text-lighttone">{str tag='configerror' section='blocktype.blog/taggedposts'}</span>
<span class="text-midtone">{str tag='configerror' section='blocktype.blog/taggedposts'}</span>
{elseif $badtag}
<span class="text-lighttone">{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}</span>
<span class="text-midtone">{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}</span>
{elseif $full}
<div id="blogdescription">
<div id="postlist_{$blockid}" class="list-group">
......
......@@ -59,7 +59,7 @@
{$post.title|str_shorten_text:80:true}
{/if}
</h4>
<span id="poststatus{$post.id}" class="poststatus text-small text-lighttone">
<span id="poststatus{$post.id}" class="poststatus text-small text-midtone">
{if $post.published}
({str tag=published section=artefact.blog})
{else}
......
......@@ -21,7 +21,7 @@
</span>
</a>
</h4>
<span class="text-small text-lighttone"> -
<span class="text-small text-midtone"> -
{$file.ctime|format_date:'strftimedaydate'}
[{$file.size|display_size}]
</span>
......
......@@ -49,7 +49,7 @@
<span class="icon icon-download icon-lg pull-right text-watermark icon-action"></span>
{/if}
{if $child->description}
<p class="file-description text-small text-lighttone">
<p class="file-description text-small text-midtone">
{$child->description}
</p>
{/if}
......
......@@ -8,7 +8,7 @@
<h5 class="title list-group-item-heading text-inline">
{$file.title|str_shorten_text:80:true}
</h5>
<span class="filesize text-small text-lighttone">
<span class="filesize text-small text-midtone">
({$file.filesize|display_size})
</span>
<div id="{$file.id}_desc" class="detail">
......
......@@ -59,7 +59,7 @@
</a>
</h4>
{if $task.completed == 1}
<span class="completed text-small text-lighttone">
<span class="completed text-small text-midtone">
({str tag=completed section=artefact.plans})
</span>
{/if}
......
......@@ -7,7 +7,7 @@
<span class="overdue-task">
<span class="icon icon-times text-danger icon-lg left"></span>
<span class="text-danger">{$task->title}</span> -
<span class="text-small text-lighttone">
<span class="text-small text-midtone">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
{if $task->description}
......@@ -39,12 +39,12 @@
<span class="icon icon-check-square-o icon-lg text-success left"></span>
<span class="sr-only">{str tag=completed section=artefact.plans}</span>
{else}
<span class="icon-square-o icon icon-lg text-lighttone left"></span>
<span class="icon-square-o icon icon-lg text-midtone left"></span>
<span class="sr-only">{str tag=incomplete section=artefact.plans}</span>
{/if}
<span class="text-default">{$task->title}</span> -
<span class="text-lighttone text-small">
<span class="text-midtone text-small">
{str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
</span>
......
......@@ -3,7 +3,7 @@
<div id="blocktype_externalfeed_title" >
{if $description && $description != $entries[0]->description}
<div class="panel-body flush">
<div id="blocktype_externalfeed_desc" class="feed-decription text-lighttone text-small">
<div id="blocktype_externalfeed_desc" class="feed-decription text-midtone text-small">
{$description|clean_html|safe}
</div>
</div>
......@@ -51,7 +51,7 @@
</ol>
{/if}
<div id="blocktype_externalfeed_lastupdate" class="content-text text-right text-small text-lighttone">
<div id="blocktype_externalfeed_lastupdate" class="content-text text-right text-small text-midtone">
{$lastupdated}
</div>
</div>
......
......@@ -13,7 +13,7 @@
</div>
{if $post->postcount}
<div class="postcount text-lighttone">
<div class="postcount text-midtone">
{$post->postcount}
</div>
{/if}
......@@ -33,7 +33,7 @@
</div>
{/if}
<p class="posttime detail text-small text-lighttone">
<p class="posttime detail text-small text-midtone">
{$post->ctime}
</p>
......
......@@ -21,7 +21,7 @@
{/if}
{if $topic->closed || $topic->subscribed || $sticky}
{if $sticky}
<span class="icon icon-asterisk icon-sm left text-lighttone"></span>
<span class="icon icon-asterisk icon-sm left text-midtone"></span>
{/if}
{if $topic->closed}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment