Commit 73e9e799 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

BUG: regressions (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Idbb19773de8a781cfd1ad505505dd46f0a84d6d2
parent 27cfbf2f
...@@ -146,9 +146,10 @@ function notrude_form() { ...@@ -146,9 +146,10 @@ function notrude_form() {
'value' => get_string('viewobjectionableunmark', 'view'), 'value' => get_string('viewobjectionableunmark', 'view'),
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default', 'class' => 'btn btn-default',
'value' => get_string('notobjectionable'), 'value' => '<span class="fa fa-lg fa-times text-danger prs"></span> '.get_string('notobjectionable'),
), ),
), ),
); );
......
.expand-indicator, .expand-indicator,
.move-indicator { .move-indicator {
@extend .metadata; @extend .text-muted;
font-size: 9px; font-size: 9px;
vertical-align: middle; vertical-align: middle;
margin-left: -7px; margin-left: -7px;
opacity: 0.7; opacity: 0.7;
a:hover &, a:hover &,
.panel-heading:hover & { .panel-heading:hover & {
opacity: 1; opacity: 1;
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.collapsed & { .collapsed & {
color: #aaa; color: #aaa;
} }
a:hover &, a:hover &,
a:focus & { a:focus & {
color: $brand-success; color: $brand-success;
} }
...@@ -59,4 +59,4 @@ ...@@ -59,4 +59,4 @@
color: $brand-success; color: $brand-success;
} }
} }
} }
\ No newline at end of file
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
.panel-heading { .panel-heading {
position: relative; position: relative;
display: block; display: block;
font-family: $font-family-sans-serif;
p { p {
margin:0; margin:0;
} }
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
.panel-secondary { .panel-secondary {
@include box-shadow(none); @include box-shadow(none);
> .panel-heading {
font-family: $font-family-serif;
}
> .panel-heading, .panel-heading-nested { > .panel-heading, .panel-heading-nested {
border-left: 4px solid $panel-secondary-border; border-left: 4px solid $panel-secondary-border;
background-color: $panel-secondary-heading-bg; background-color: $panel-secondary-heading-bg;
......
<div class="js-blockinstance blockinstance panel panel-secondary {if $configure} configure{elseif $retractable} retractable{/if}" data-id="{$id}" id="blockinstance_{$id}{if $configure}_configure{/if}"> <div class="js-blockinstance blockinstance panel panel-secondary {if $configure} configure{elseif $retractable} retractable{/if}" data-id="{$id}" id="blockinstance_{$id}{if $configure}_configure{/if}">
<h3 class="panel-heading js-heading drag-handle {if !$title}panel-heading-placeholder{/if}"> <h3 class="panel-heading js-heading drag-handle {if !$title}panel-heading-placeholder{/if}">
<span class="fa fa-arrows move-indicator"></span> <span class="fa fa-arrows move-indicator"></span>
<span class="blockinstance-header"> <span class="blockinstance-header">
{if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if} {if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if}
<span class="fa fa-chevron-down text-watermark fa-sm"></span>
</span> </span>
<span class="blockinstance-controls"> {if $retractable && !$configure}
<span class="fa fa-chevron-down text-watermark fa-sm pull-right"></span>
<button class="keyboardmovebutton btn btn-default hidden sr-only" name="action_moveblockinstance_id_{$id}" alt="{$strmovetitletext}" data-id="{$id}"> {/if}
{$strmovetitletext} <span class="blockinstance-controls pull-right">
</button>
<button class="keyboardmovebutton btn btn-default hidden sr-only" name="action_moveblockinstance_id_{$id}" alt="{$strmovetitletext}" data-id="{$id}">
{$strmovetitletext}
{foreach from=$movecontrols item=item} </button>
<button class="movebutton hidden" name="action_moveblockinstance_id_{$id}_row_{$row}_column_{$item.column}_order_{$item.order}" data-id="{$id}">
{$item.title}
</button> {foreach from=$movecontrols item=item}
{/foreach} <button class="movebutton hidden" name="action_moveblockinstance_id_{$id}_row_{$row}_column_{$item.column}_order_{$item.order}" data-id="{$id}">
{$item.title}
</button>
{/foreach}
<span class="pull-right btn-group btn-group-top">
<span class="prl pull-right btn-group btn-group-top">
{if $configurable && !$configure}
<button class="configurebutton btn btn-inverse btn-xs" name="action_configureblockinstance_id_{$id}" alt="{$strconfigtitletext}" data-id="{$id}">
<span class="fa fa-cog"></span>
</button> {if $configurable && !$configure}
{/if} <button class="configurebutton btn btn-inverse btn-xs" name="action_configureblockinstance_id_{$id}" alt="{$strconfigtitletext}" data-id="{$id}">
<span class="fa fa-cog"></span>
{if $configure} </button>
<button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{str tag=Close}" data-id="{$id}"> {/if}
<span class="fa fa-trash text-danger"></span>
</button> {if $configure}
</button> <button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{str tag=Close}" data-id="{$id}">
{else} <span class="fa fa-trash text-danger"></span>
<button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{$strremovetitletext}" data-id="{$id}"> </button>
<span class="fa fa-trash text-danger"></span> </button>
</button> {else}
{/if} <button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{$strremovetitletext}" data-id="{$id}">
</span> <span class="fa fa-trash text-danger"></span>
</span> </button>
</h3> {/if}
<div class="block blockinstance-content js-blockinstance-content"> </span>
{$content|safe} </span>
</div> </h3>
<div class="block blockinstance-content js-blockinstance-content">
{$content|safe}
</div>
</div> </div>
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