Commit 7d72d927 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Tidy up the styling for resume (bug: 1465107)"

parents 6ca0ade3 c28d5443
......@@ -28,6 +28,7 @@ jQuery(function($) {
if (typeof tinyMCE != 'undefined') {
var editor = tinyMCE.get(t),
formTop = container.closest('#main-column-container').attr('id');;
$('.mce-toolbar.mce-first').siblings().toggleClass('hidden');
editor.show();
editor.focus();
document.location.href = "#" + formTop;
......
......@@ -1011,14 +1011,14 @@ EOF;
return "
function (r, d) {
if (!{$bodystring} && !{$attachstring}) {
return TD(null, STRONG(null, {$titlestring}), DIV(null, {$extrastring}));
return TD(null, STRONG(null, {$titlestring}), DIV({'class': 'detail text-lighttone'}, {$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 mbs'}, {$extrastring});
var extra = DIV({'class': 'detail mbs text-lighttone'}, {$extrastring});
return TD({'id': 'composite-' + r.artefact + '-' + r.id}, DIV({'class': 'expandable-head'}, link, extra));
},
";
......
......@@ -1125,13 +1125,13 @@ function group_get_accept_form($name, $groupid, $returnto) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default form-as-button pull-left',
'value' => '<span class="icon icon-lg icon-check text-success prs"></span> ' . get_string('acceptinvitegroup', 'group')
'value' => '<span class="icon icon-lg icon-check text-success left"></span> ' . get_string('acceptinvitegroup', 'group')
),
'decline' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default form-as-button pull-left',
'value' => '<span class="icon icon-lg icon-ban text-danger prs"></span> ' . get_string('declineinvitegroup', 'group')
'value' => '<span class="icon icon-lg icon-ban text-danger left"></span> ' . get_string('declineinvitegroup', 'group')
)
),
),
......
......@@ -159,7 +159,7 @@ $output .= '</div>';
$output .= '<div id="previewcustomlayoutpane" class="panel-footer">'
. '<button type="button" name="submitlayout" id="addlayout" class="btn btn-primary" onclick="CustomLayoutManager.customlayout_submit_layout()">'
.'<span class="icon icon-lg icon-check text-success prs"></span>'
.'<span class="icon icon-lg icon-check left"></span>'
. get_string('createnewlayout', 'view')
. '</button>'
. '</div>';
......
......@@ -118,8 +118,12 @@
.manage-collection-pages {
.pagelist {
.select-pages {
float: right;
margin: -10px 0 0 0;
padding-top: 8px;
a {
padding: 1px 7px;
}
}
.add-pages {
margin: 5px;
......
......@@ -31,7 +31,7 @@
}
.tinymce-large iframe{
min-height: 500px;
min-height: 300px;
}
label.sr-only + div.mce-tinymce {
......
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