Skip to content

GitLab

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

BUG: regressions (bootstrap) 

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Idbb19773de8a781cfd1ad505505dd46f0a84d6d2
parent 27cfbf2f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 55 deletions
htdocs/lib/objectionable.php
View file @ 73e9e799
......@@ -146,9 +146,10 @@ function notrude_form() {
'value' => get_string('viewobjectionableunmark', 'view'),
),
'submit' => array(
'type' => 'submit',
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default',
'value' => get_string('notobjectionable'),
'value' => '<span class="fa fa-lg fa-times text-danger prs"></span> '.get_string('notobjectionable'),
),
),
);
......
htdocs/theme/bootstrap/static/sass/components/_indicator.scss
View file @ 73e9e799
.expand-indicator,
.move-indicator {
@extend .metadata;
@extend .text-muted;
font-size: 9px;
vertical-align: middle;
margin-left: -7px;
opacity: 0.7;
a:hover &,
a:hover &,
.panel-heading:hover & {
opacity: 1;
}
......@@ -27,7 +27,7 @@
.collapsed & {
color: #aaa;
}
a:hover &,
a:hover &,
a:focus & {
color: $brand-success;
}
......@@ -59,4 +59,4 @@
color: $brand-success;
}
}
}
\ No newline at end of file
}
htdocs/theme/bootstrap/static/sass/layout/panel/_panel-heading.scss
View file @ 73e9e799
......@@ -4,6 +4,7 @@
.panel-heading {
position: relative;
display: block;
font-family: $font-family-sans-serif;
p {
margin:0;
}
......
htdocs/theme/bootstrap/static/sass/layout/panel/_panel-secondary.scss
View file @ 73e9e799
......@@ -2,6 +2,9 @@
.panel-secondary {
@include box-shadow(none);
> .panel-heading {
font-family: $font-family-serif;
}
> .panel-heading, .panel-heading-nested {
border-left: 4px solid $panel-secondary-border;
background-color: $panel-secondary-heading-bg;
......
htdocs/theme/bootstrap/templates/view/blocktypecontainerediting.tpl
View file @ 73e9e799
<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}">
<span class="fa fa-arrows move-indicator"></span>
<span class="blockinstance-header">
{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 class="blockinstance-controls">
<button class="keyboardmovebutton btn btn-default hidden sr-only" name="action_moveblockinstance_id_{$id}" alt="{$strmovetitletext}" data-id="{$id}">
{$strmovetitletext}
</button>
{foreach from=$movecontrols item=item}
<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">
{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}
{if $configure}
<button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{str tag=Close}" data-id="{$id}">
<span class="fa fa-trash text-danger"></span>
</button>
</button>
{else}
<button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{$strremovetitletext}" data-id="{$id}">
<span class="fa fa-trash text-danger"></span>
</button>
{/if}
</span>
</span>
</h3>
<div class="block blockinstance-content js-blockinstance-content">
{$content|safe}
</div>
<h3 class="panel-heading js-heading drag-handle {if !$title}panel-heading-placeholder{/if}">
<span class="fa fa-arrows move-indicator"></span>
<span class="blockinstance-header">
{if $configure}{$configtitle}: {str tag=Configure section=view}{else}{$title|default:"[$strnotitle]"}{/if}
</span>
{if $retractable && !$configure}
<span class="fa fa-chevron-down text-watermark fa-sm pull-right"></span>
{/if}
<span class="blockinstance-controls pull-right">
<button class="keyboardmovebutton btn btn-default hidden sr-only" name="action_moveblockinstance_id_{$id}" alt="{$strmovetitletext}" data-id="{$id}">
{$strmovetitletext}
</button>
{foreach from=$movecontrols item=item}
<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="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}
{if $configure}
<button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{str tag=Close}" data-id="{$id}">
<span class="fa fa-trash text-danger"></span>
</button>
</button>
{else}
<button class="deletebutton btn btn-inverse btn-xs" name="action_removeblockinstance_id_{$id}" alt="{$strremovetitletext}" data-id="{$id}">
<span class="fa fa-trash text-danger"></span>
</button>
{/if}
</span>
</span>
</h3>
<div class="block blockinstance-content js-blockinstance-content">
{$content|safe}
</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