Skip to content

GitLab

Commit 876253f7 authored by Liam's avatar Liam Committed by Rebecca Blundell
Browse files
Options

Bug #1765276: Changing btn-default to btn-secondary, btn-xs to btn-sm 

behatnotneeded

Change-Id: Ie369f5b2433709738fe10563e8200748c06a3896
parent eb10f4b1
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 139 deletions
htdocs/artefact/annotation/lib.php
View file @ 876253f7
......@@ -1368,7 +1368,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-link btn-xs quiet',
'class' => 'btn-link btn-sm quiet',
'name' => 'make_annotation_feedback_public_submit',
'value' => '<span class="icon icon-lock text-default left" role="presentation" aria-hidden="true"></span>' . get_string('makepublic', 'artefact.annotation'),
),
......
htdocs/artefact/comment/lib.php
View file @ 876253f7
......@@ -1016,7 +1016,7 @@ class ArtefactTypeComment extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-link btn-xs',
'class' => 'btn-link btn-sm',
'name' => 'make_public_submit',
'value' => '<span class="icon icon-lock text-default left" role="presentation" aria-hidden="true"></span>' . get_string('makecommentpublic', 'artefact.comment'),
),
......
htdocs/artefact/internal/notes.json.php
View file @ 876253f7
......@@ -210,7 +210,7 @@ function deletenote_form($id, $notedata) {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-secondary btn-xs last',
'class' => 'btn-secondary btn-sm last',
'elementtitle' => get_string('delete'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span> ',
),
......
htdocs/artefact/peerassessment/lib.php
View file @ 876253f7
......@@ -707,9 +707,9 @@ class ArtefactTypePeerassessment extends ArtefactType {
'submit' => 'publish',
'cancel' => 'cancel'),
'primarychoice' => 'publish',
'classes' => array('draftsubmit' => 'btn-default',
'submit' => 'btn-default',
'cancel' => 'btn-default submitcancel'),
'classes' => array('draftsubmit' => 'btn-secondary',
'submit' => 'btn-secondary',
'cancel' => 'btn-secondary submitcancel'),
'value' => array('draftsubmit' => get_string('draft', 'blocktype.peerassessment/peerassessment'),
'submit' => get_string('publish', 'blocktype.peerassessment/peerassessment'),
'cancel' => get_string('cancel'))
......@@ -741,7 +741,7 @@ class ArtefactTypePeerassessment extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-sm',
'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span> <span class="sr-only">' . get_string('delete') . '</span>',
'confirm' => get_string('reallydeletethisassessment', 'artefact.peerassessment'),
'name' => 'delete_assessment_submit',
......
htdocs/auth/saml/index.php
View file @ 876253f7
......@@ -385,7 +385,7 @@ function saml_auth_generate_login_form() {
return;
}
if (count_records('institution', 'registerallowed', 1, 'suspended', 0)) {
$registerlink = '<a class="btn btn-primary btn-xs" href="' . get_config('wwwroot') . 'register.php">' . get_string('register') . '</a>';
$registerlink = '<a class="btn btn-primary btn-sm" href="' . get_config('wwwroot') . 'register.php">' . get_string('register') . '</a>';
}
else {
$registerlink = '';
......
htdocs/auth/saml/lib.php
View file @ 876253f7
......@@ -675,7 +675,7 @@ class PluginAuthSaml extends PluginAuth {
$certstatus = 'createnewkey';
}
$elements['deletesubmit'] = array(
'class' => 'btn-default',
'class' => 'btn-secondary',
'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button',
'usebuttontag' => true,
......@@ -1554,7 +1554,7 @@ EOF;
}
$elements = array(
'loginsaml' => array(
'value' => '<div class="login-externallink"><a class="btn btn-primary btn-xs" href="' . $url . '">' . get_string('login', 'auth.saml') . '</a></div>'
'value' => '<div class="login-externallink"><a class="btn btn-primary btn-sm" href="' . $url . '">' . get_string('login', 'auth.saml') . '</a></div>'
)
);
return $elements;
......
htdocs/blocktype/openbadgedisplayer/badgrtoken.php
View file @ 876253f7
......@@ -49,7 +49,7 @@ if ($token) {
$elements['submit'] = array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-sm',
'class' => 'btn-secondary btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger left" role="presentation" aria-hidden="true"></span>' . get_string('delete'),
'elementtitle' => get_string('deletespecific', 'mahara', $token),
);
......
htdocs/blocktype/openbadgedisplayer/js/configform.js
View file @ 876253f7
......@@ -60,8 +60,8 @@ if ((badgegroups_hosts instanceof Array && badgegroups_hosts.length >= 1)
'<div id="instconf_' + data.host + '_container" class="checkboxes form-group">' +
'<span class="pseudolabel">' + data["hosttitle"] + '</span>' +
'<div class="btn-group">' +
'<a href="" class="btn btn-secondary btn-xs" onclick="pieform_element_checkboxes_update(\'instconf_' + data["host"] + '_container\', true); return false;">' + get_string_ajax('selectall','blocktype.openbadgedisplayer') + '</a>' +
'<a href="" class="btn btn-secondary btn-xs" onclick="pieform_element_checkboxes_update(\'instconf_' + data["host"] + '_container\', false); return false;">' + get_string_ajax('selectnone','blocktype.openbadgedisplayer') + '</a>&nbsp;' +
'<a href="" class="btn btn-secondary btn-sm" onclick="pieform_element_checkboxes_update(\'instconf_' + data["host"] + '_container\', true); return false;">' + get_string_ajax('selectall','blocktype.openbadgedisplayer') + '</a>' +
'<a href="" class="btn btn-secondary btn-sm" onclick="pieform_element_checkboxes_update(\'instconf_' + data["host"] + '_container\', false); return false;">' + get_string_ajax('selectnone','blocktype.openbadgedisplayer') + '</a>&nbsp;' +
'</div>';
for (var badgegroupid in data.badgegroups) {
var badgegroupname = data.badgegroups[badgegroupid];
......
htdocs/lang/en.utf8/help/forms/accountprefs.addremovecolumns.html
View file @ 876253f7
......@@ -2,11 +2,11 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Show controls to add and remove columns when editing a page</h3>
<p>You can choose to display a row with the buttons
<span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="btn btn-primary btn-sm text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm" role="presentation"></span>
<span class="icon-plus icon icon-sm" role="presentation"></span>
</span> and
<span title="Remove this column" class="text-center btn btn-secondary btn-xs">
<span title="Remove this column" class="text-center btn btn-secondary btn-sm">
<span class="icon-times-circle icon icon-sm" role="presentation"></span>
</span>
in the page editor. These buttons add and remove columns from that page when you click on them.</p>
......
htdocs/lang/en.utf8/help/forms/adduser.addremovecolumns.html
View file @ 876253f7
......@@ -2,11 +2,11 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Show controls to add and remove columns when editing a page</h3>
<p>You can choose to display a row with the buttons
<span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="btn btn-primary btn-sm text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm" role="presentation"></span>
<span class="icon-plus icon icon-sm" role="presentation"></span>
</span> and
<span title="Remove this column" class="text-center btn btn-secondary btn-xs">
<span title="Remove this column" class="text-center btn btn-secondary btn-sm">
<span class="icon-times-circle icon icon-sm" role="presentation"></span>
</span>
in the page editor. These buttons add and remove columns from that page.</p>
......
htdocs/lang/en.utf8/help/forms/uploadcsv.addremovecolumns.html
View file @ 876253f7
......@@ -2,11 +2,11 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Show controls to add and remove columns when editing a page</h3>
<p>The users can choose to display a row with the buttons
<span class="btn btn-primary btn-xs text-left" title="Add column">
<span class="btn btn-primary btn-sm text-left" title="Add column">
<span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm" role="presentation"></span>
<span class="icon-plus icon icon-sm" role="presentation"></span>
</span> and
<span title="Remove this column" class="text-center btn btn-secondary btn-xs">
<span title="Remove this column" class="text-center btn btn-secondary btn-sm">
<span class="icon-times-circle icon icon-sm" role="presentation"></span>
</span> in the page editor. These buttons add and remove columns from that page when you click on them.</p>
<p>Even if not enabled, the users can change the number of columns in their page in the page layout section.</p>
htdocs/lib/objectionable.php
View file @ 876253f7
......@@ -161,15 +161,15 @@ function notrude_form() {
'class' => 'btn-group last',
'elements' => array (
'review' => array(
'class' => 'btn-default text-inline',
'class' => 'btn-secondary text-inline',
'type' => 'html',
'value' => '<button type="button" class="btn btn-default" data-toggle="modal-docked" data-target="#objection-review">
'value' => '<button type="button" class="btn btn-secondary" data-toggle="modal-docked" data-target="#objection-review">
<span class="icon icon-lg icon-check text-danger left" role="presentation" aria-hidden="true"></span>' .
get_string('stillobjectionable') .
'</button>'
),
'submit' => array(
'class' => 'btn-default text-inline',
'class' => 'btn-secondary text-inline',
'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button',
'usebuttontag' => true,
......@@ -430,7 +430,7 @@ function review_form($viewid = null) {
$form['elements']['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn-default',
'class' => 'btn-secondary',
'value' => array(get_string('notifyadministrator'), get_string('cancel')),
'confirm' => array(get_string('notifyadministratorreview')),
);
......
htdocs/lib/searchlib.php
View file @ 876253f7
......@@ -717,13 +717,13 @@ function build_admin_export_queue_results($search, $offset, $limit) {
'template' => 'admin/users/searchexportstatuscolumn.tpl',
),
'exportselect' => array(
'headhtml' => get_string('requeue', 'export') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-secondary" href="" id="selectallexport">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-secondary" href="" id="selectnoneexport">' . get_string('none') . '</a></div>',
'headhtml' => get_string('requeue', 'export') . '<br><div class="btn-group" role="group"><a class="btn btn-sm btn-secondary" href="" id="selectallexport">' . get_string('All') . '</a>&nbsp;<a class="btn btn-sm btn-secondary" href="" id="selectnoneexport">' . get_string('none') . '</a></div>',
'template' => 'admin/users/searchselectcolumnexport.tpl',
'class' => 'nojs-hidden-table-cell with-selectall',
'accessible' => get_string('bulkselect'),
),
'deleteselect' => array(
'headhtml' => get_string('delete') . '<br><div class="btn-group" role="group"><a class="btn btn-xs btn-secondary" href="" id="selectalldelete">' . get_string('All') . '</a>&nbsp;<a class="btn btn-xs btn-secondary" href="" id="selectnonedelete">' . get_string('none') . '</a></div>',
'headhtml' => get_string('delete') . '<br><div class="btn-group" role="group"><a class="btn btn-sm btn-secondary" href="" id="selectalldelete">' . get_string('All') . '</a>&nbsp;<a class="btn btn-sm btn-secondary" href="" id="selectnonedelete">' . get_string('none') . '</a></div>',
'template' => 'admin/users/searchselectcolumnexportdelete.tpl',
'class' => 'nojs-hidden-table-cell with-selectall',
'accessible' => get_string('bulkselect'),
......
htdocs/lib/view.php
View file @ 876253f7
......@@ -7321,7 +7321,7 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
$form['elements']['submitcollection'] = array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-secondary btn-xs btn-group-item',
'class' => 'btn-secondary btn-sm btn-group-item',
'value' => get_string('copycollection', 'collection'),
);
}
......@@ -7331,7 +7331,7 @@ function create_view_form($group=null, $institution=null, $template=null, $colle
'value' => $template,
);
$form['elements']['submit']['value'] = get_string('copyview', 'view');
$form['elements']['submit']['class'] = 'btn-secondary btn-xs btn-group-item';
$form['elements']['submit']['class'] = 'btn-secondary btn-sm btn-group-item';
if ($collection !== null) {
$form['elements']['submit']['class'] .= ' last';
}
......
htdocs/testing/frameworks/behat/html-formatter/bootstrap.min.css
View file @ 876253f7
This source diff could not be displayed because it is too large. You can view the blob instead.
htdocs/theme/default/sass/utilities/_custom-variables.scss
View file @ 876253f7
......@@ -24,8 +24,6 @@ $theme-primary-color-light: #799152;
// Colors
$brand-success: #449D44;
$brand-info: #5bc0de;
$brand-warning: #f0ad4e;
$brand-danger: #F04F50;
// Form states and alerts
......@@ -46,7 +44,6 @@ $state-danger-bg: lighten($brand-danger, 30%);
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%);
// Buttons
$btn-secondary-color: #333333;
$btn-secondary-bg: $white;
$btn-secondary-border: #CCCCCC;
......@@ -54,39 +51,19 @@ $btn-primary-color: #FFFFFF;
$btn-primary-bg: #556d32;
$btn-primary-border: #556d32;
$btn-success-bg: $theme-primary-color;
$btn-success-border: darken($theme-primary-color, 5%);
$btn-info-bg: $state-info-bg;
$btn-info-border: darken($btn-info-bg, 5%);
$btn-warning-bg: $state-warning-bg;
$btn-warning-border: darken($btn-warning-bg, 15%);
$btn-danger-bg: $brand-danger;
$btn-danger-border: darken($btn-danger-bg, 5%);
// Navbar
$navbar-collapse-max-height: 340px;
$navbar-default-color: #777;
$navbar-default-bg: #FFFFFF;
$navbar-default-border: transparent;
// Navbar links
$navbar-default-link-hover-color: #FFFFFF;
$navbar-default-link-hover-bg: $link-hover-color;
$navbar-default-link-active-color: #FFFFFF;
$navbar-default-link-active-bg: darken($link-color, 10%);
// Navbar toggle
$navbar-default-toggle-hover-bg: #f1f6eb;
// Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color: #FFFFFF;
$navbar-inverse-bg: $link-hover-color;
$navbar-inverse-border: $link-hover-color;
// Inverted navbar links
$navbar-inverse-link-color: #FFFFFF;
......@@ -96,18 +73,12 @@ $navbar-inverse-link-active-color: #FFFFFF;
$navbar-inverse-link-active-bg: $link-hover-color;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: #fff;
$navbar-inverse-toggle-icon-bar-bg: $link-hover-color;
$navbar-inverse-toggle-border-color: #fff;
// cards
//** Border color for elements within cards
$card-inner-border: transparent;
$card-footer-bg: #f0f5ea;
$card-header-bg: #fff;
$card-border: #d9d9d9;
$card-header-bg: #FFFFFF;
$card-secondary-heading-bg: darken($card-header-bg, 2%);
htdocs/theme/modern/sass/utilities/_custom-variables.scss
View file @ 876253f7
......@@ -25,9 +25,6 @@ $rss-icon-color: #FE6500;
// LEGACY BOOTSTRAP 3 VARIABLES
// Fonts
$line-height-computed: $font-size-base * $line-height-base; // ~20px
// Form states
$state-success-text: #426600 !default;
$state-success-bg: mix(#426600, #fff, 20%) !default;
......@@ -45,9 +42,7 @@ $state-danger-text: #545B5D !default;
$state-danger-bg: #f2dede !default;
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
// Buttons + Forms
$btn-secondary-color: #374757;
$btn-secondary-bg: #e8eaec;
$btn-secondary-border: #caced3;
......@@ -55,52 +50,18 @@ $btn-primary-color: #fff;
$btn-primary-bg: $primary;
$btn-primary-border: darken($btn-primary-bg, 8%);
$btn-info-bg: $state-info-bg;
$btn-info-border: darken($btn-info-bg, 5%);
$btn-success-color: #fff;
$btn-success-bg: $primary;
$btn-success-border: darken($btn-success-bg, 5%);
$btn-warning-color: $state-warning-text;
$btn-warning-bg: $state-warning-bg;
$btn-warning-border: darken($btn-warning-bg, 15%);
$btn-danger-color: #fff;
$btn-danger-bg: $danger;
$btn-danger-border: darken($btn-danger-bg, 5%);
$btn-link-disabled-color: $gray-300;
$cursor-disabled: not-allowed;
// Forms
$legend-color: $gray-700;
$legend-border-color: #e5e5e5;
// Navs
$navbar-height: 60px;
$navbar-collapse-max-height: none;
$navbar-default-color: #FFF;
$navbar-default-bg: $primary;
$navbar-default-border: transparent;
// $navbar-padding-y: (($navbar-height - $line-height-computed) / 2);
// Navbar links
$navbar-default-link-color: #FFF;
$navbar-default-link-hover-color: #FFF;
$navbar-default-link-hover-bg: darken($primary, 3%);
// Navbar toggle
$navbar-default-toggle-hover-bg: $theme-accent-color;
$navbar-default-toggle-icon-bar-bg: $navbar-default-link-color;
$navbar-default-toggle-border-color: transparent;
// Inverted navbar
// Reset inverted navbar basics
......@@ -114,7 +75,6 @@ $navbar-inverse-link-active-color: #FFFFFF;
$navbar-inverse-link-active-bg: $navbar-inverse-link-hover-bg;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: $theme-accent-color;
$navbar-inverse-toggle-icon-bar-bg: #959595;
// Popovers
......@@ -126,33 +86,9 @@ $pre-bg: #f5f5f5;
// Cards
$card-border: #ccc;
$card-inner-border: #ddd;
$card-footer-bg: #f5f5f5;
$card-text: $gray-700;
$card-border: #ddd;
$card-header-bg: #f9f9f9;
$card-primary-text: $gray-700;
$card-primary-border: #ddd;
$card-primary-heading-bg: #fff;
$card-secondary-text: $primary;
$card-secondary-border: $primary;
$card-secondary-heading-bg: darken($card-header-bg, 2%);
$card-success-text: $state-success-text;
$card-success-border: $state-success-border;
$card-success-heading-bg: $state-success-bg;
$card-info-text: $state-info-text;
$card-info-border: $state-info-border;
$card-info-heading-bg: $state-info-bg;
$card-warning-text: $state-warning-text;
$card-warning-border: $state-warning-border;
$card-warning-heading-bg: $state-warning-bg;
$card-danger-text: $state-danger-text;
$card-danger-border: $state-danger-border;
$card-danger-heading-bg: $state-danger-bg;
htdocs/theme/raw/plugintype/artefact/peerassessment/blocktype/signoff/templates/verifyform.tpl
View file @ 876253f7
......@@ -45,8 +45,8 @@
<p id="signoff-on" class="hidden">{str tag=signoffpageundodesc section=blocktype.peerassessment/signoff}</p>
<p id="signoff-off" class="hidden">{str tag=signoffpagedesc section=blocktype.peerassessment/signoff}</p>
<div class="btn-group">
<button id="signoff-yes-button" type="button" class="btn btn-default">{str tag="yes"}</button>
<button id="signoff-back-button" type="button" class="btn btn-default">{str tag="no"}</button>
<button id="signoff-yes-button" type="button" class="btn btn-secondary">{str tag="yes"}</button>
<button id="signoff-back-button" type="button" class="btn btn-secondary">{str tag="no"}</button>
</div>
</div>
</div>
......@@ -65,8 +65,8 @@
<div class="modal-body">
<p>{str tag=verifypagedesc section=blocktype.peerassessment/signoff}</p>
<div class="btn-group">
<button id="verify-yes-button" type="button" class="btn btn-default">{str tag="yes"}</button>
<button id="verify-back-button" type="button" class="btn btn-default">{str tag="no"}</button>
<button id="verify-yes-button" type="button" class="btn btn-secondary">{str tag="yes"}</button>
<button id="verify-back-button" type="button" class="btn btn-secondary">{str tag="no"}</button>
</div>
</div>
</div>
......
htdocs/theme/raw/plugintype/artefact/peerassessment/templates/editlink.tpl
View file @ 876253f7
<a id="modify_assessment_feedback_{$block}" class="js-peerassessment-modal feedback assessbtn btn btn-default btn-sm" href="#" data-toggle="modal-docked" data-target="#assessment_feedbackform_{$block}" data-blockid="{$block}" data-id="{$id}">
<a id="modify_assessment_feedback_{$block}" class="js-peerassessment-modal feedback assessbtn btn btn-secondary btn-sm" href="#" data-toggle="modal-docked" data-target="#assessment_feedbackform_{$block}" data-blockid="{$block}" data-id="{$id}">
<span class="icon icon-pencil" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=editspecific arg1=$title}</span>
</a>
htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
View file @ 876253f7
......@@ -5,15 +5,15 @@
<div class="card-body flush">
{if $editing}
<div class="pull-right btn-group">
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=editspecific arg1=$plan.title)|escape:html|safe}">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=editspecific arg1=$plan.title)|escape:html|safe}">
<span class="icon icon-pencil"></span>
<span class="sr-only">{str tag='edit'}</span>
</a>
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/new.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=addtaskspecific section='artefact.plans' arg1=$plan.title)|escape:html|safe}">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/new.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=addtaskspecific section='artefact.plans' arg1=$plan.title)|escape:html|safe}">
<span class="icon icon-plus"></span>
<span class="sr-only">{str tag='addtask' section='artefact.plans'}</span>
</a>
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=deletespecific arg1=$plan.title)|escape:html|safe}">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan.id}{if $plan.view}&view={$plan.view}{/if}" title="{str(tag=deletespecific arg1=$plan.title)|escape:html|safe}">
<span class="icon icon-trash text-danger"></span>
<span class="sr-only">{str tag='Delete'}</span>
</a>
......
htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
View file @ 876253f7
......@@ -3,8 +3,8 @@
<div class="task-item plan_incomplete list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
{if $editing}
<div class="pull-right btn-group">
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
</div>
{/if}
{if $task->description || $task->tags}<a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}">{/if}
......@@ -42,8 +42,8 @@
<div class="task-item list-group-item {if $task->description || $task->tags}list-group-item-default{/if}">
{if $editing}
<div class="pull-right btn-group">
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-default btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='editthistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-pencil text-default"></span></a>
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->id}{if $view}&view={$view}{/if}" title="{str tag='deletethistask' section='artefact.plans' arg1=$task->title}"><span class="icon icon-trash text-danger"></span></a>
</div>
{/if}
{if $task->description || $task->tags}<a class="link-block collapsed" href="#expand-task-{$task->id}{if $block}-{$block}{/if}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}{if $block}-{$block}{/if}">{/if}
......
htdocs/theme/raw/plugintype/auth/saml/templates/idpdelete.tpl
View file @ 876253f7
{if $r.delete}
<button type="button" onclick="deleteidp(this, '{$r.idpentityid}')" name="delete" value="{$r.idpentityid}" class="deletebutton btn btn-default btn-xs" alt='{str tag=deletespecific section=mahara arg1=$r.name}'>
<button type="button" onclick="deleteidp(this, '{$r.idpentityid}')" name="delete" value="{$r.idpentityid}" class="deletebutton btn btn-secondary btn-sm" alt='{str tag=deletespecific section=mahara arg1=$r.name}'>
<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">
{str tag=delete section=mahara}
......
htdocs/theme/raw/templates/admin/users/pendinguserslist.tpl
View file @ 876253f7
......@@ -36,11 +36,11 @@
<div>{str tag=pendingusercompletion section=admin}</div>
{else}
<div class="btn-group">
<a class="btn btn-default btn-xs" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=approve">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=approve">
<span class="icon icon-lg left icon-check text-success" role="presentation" aria-hidden="true"></span>
<span class="btn-approve">{str tag=approve section=admin}</span>
</a>
<a class="btn btn-default btn-sm" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=deny">
<a class="btn btn-secondary btn-sm" href="{$WWWROOT}admin/users/actionregistration.php?r={$registration->id}&action=deny">
<span class="icon icon-lg left icon-ban text-danger" role="presentation" aria-hidden="true"></span>
<span class="btn-deny">{str tag=deny section=admin}</span>
</a>
......
htdocs/theme/raw/templates/customcss.tpl
View file @ 876253f7
......@@ -4,6 +4,9 @@
border-color: {$data.background};
}
.navbar-default .navbar-toggle:not(.collapsed) {
background-color: transparent;
}
.navbar-toggle .icon {
color: {$data.backgroundfg};
}
......
htdocs/theme/raw/templates/view/view.tpl
View file @ 876253f7
......@@ -21,7 +21,7 @@
{str tag=objectionablematerialreportedreply}
{/if}
<div class="form-group">
<a id="review_link" class="btn btn-default" href="#" data-toggle="modal" data-target="#review-form">
<a id="review_link" class="btn btn-secondary" href="#" data-toggle="modal" data-target="#review-form">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=objectionreview}
</a>
......
htdocs/view/accessurl.php
View file @ 876253f7
......@@ -621,7 +621,7 @@ for ($i = 0; $i < count($records); $i++) {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-secondary btn-xs',
'class' => 'btn-secondary btn-sm',
'elementtitle' => get_string('delete'),
'confirm' => get_string('reallydeletesecreturl', 'view'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
......
htdocs/view/urls.php
View file @ 876253f7
......@@ -137,7 +137,7 @@ for ($i = 0; $i < count($records); $i++) {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-secondary btn-xs',
'class' => 'btn-secondary btn-sm',
'elementtitle' => get_string('delete'),
'confirm' => get_string('reallydeletesecreturl', 'view'),
'value' => '<span class="icon icon-trash text-danger icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('delete') . '</span>',
......
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