Commit 7307f4ef authored by chibaguy's avatar chibaguy

[UPD] "Dropped the .btn-xs class entirely as .btn-sm is proportionally much...

[UPD] "Dropped the .btn-xs class entirely as .btn-sm is proportionally much smaller than v3’" (Bootstrap 3 -> 4 transition).
parent 5097bd25
......@@ -414,7 +414,7 @@ syntaxHighlighter = {
syntaxHighlighter.add(editor, textarea);
var changeButton = jQuery(
'<a class="btn btn-success btn-xs cm-change">' +
'<a class="btn btn-success btn-sm cm-change">' +
settings.changeText +
'</a>')
.insertAfter(textarea.next())
......@@ -513,7 +513,7 @@ syntaxHighlighter = {
});
var removeButton = jQuery(
'<a class="btn btn-xs btn-link cm-remove" style="float: right;">' +
'<a class="btn btn-sm btn-link cm-remove" style="float: right;">' +
settings.removeText +
'</a>')
.insertAfter(changeButton)
......
......@@ -48,7 +48,7 @@ class Services_H5P_Controller
'index' => $index,
]),
'_text' => tra('Create H5P content'),
'_class' => 'create-h5p-content btn-xs',
'_class' => 'create-h5p-content btn-sm',
], $smarty),
];
} else {
......@@ -94,7 +94,7 @@ class Services_H5P_Controller
'index' => $index,
]),
'_text' => tra('Edit'),
'_class' => 'edit-h5p-content btn-xs',
'_class' => 'edit-h5p-content btn-sm',
], $smarty);
}
return [
......
......@@ -98,7 +98,7 @@ $(document).ready(function () {
)
);
$(".dropdown-toggle", $tb).removeClass("btn-link btn-xs").addClass("btn-default btn-sm");
$(".dropdown-toggle", $tb).removeClass("btn-link btn-sm").addClass("btn-default btn-sm");
return $tb;
};
......@@ -790,7 +790,7 @@ $(document).ready(function () {
.addClass("btn-group")
.append(
$("<a>")
.addClass("btn btn-link dropdown-toggle btn-xs")
.addClass("btn btn-link dropdown-toggle btn-sm")
.data("toggle", "dropdown")
.attr("title", title)
.attr("href", "#")
......
......@@ -91,7 +91,7 @@ function smarty_block_tabset($params, $content, $smarty, &$repeat)
$button_params['_size'] = 'mini';
$button_params['_auto_args'] = '*';
$button_params['_onclick'] = "setCookie('$smarty_tabset_name','" . ($cookietab == 'n' ? 1 : 'n' ) . "', 'tabs') ;";
$button_params['_class'] = 'btn-xs';
$button_params['_class'] = 'btn-sm';
$notabs = smarty_function_button($button_params, $smarty);
$notabs = "<div class='pull-right'>$notabs</div>";
$content_class = '';
......
......@@ -438,7 +438,7 @@ abstract class Toolbar
$smarty = TikiLib::lib('smarty');
$params = [];
$params['_onclick'] = $click . (substr($click, strlen($click) - 1) != ';' ? ';' : '') . 'return false;';
$params['_class'] = 'toolbar btn btn-xs btn-link tips' . (! empty($class) ? ' ' . $class : '');
$params['_class'] = 'toolbar btn btn-sm btn-link tips' . (! empty($class) ? ' ' . $class : '');
$params['_ajax'] = 'n';
$content = $title;
if ($this->iconname) {
......@@ -1443,7 +1443,7 @@ class ToolbarHelptool extends Toolbar
$url = $servicelib->getUrl($params);
$help = tra('Help');
return "<a title=\":$help\" class=\"toolbar btn btn-xs btn-link qt-help tips\" href=\"$url\" data-toggle=\"modal\" data-target=\"#bootstrap-modal\">$icon</a>";
return "<a title=\":$help\" class=\"toolbar btn btn-sm btn-link qt-help tips\" href=\"$url\" data-toggle=\"modal\" data-target=\"#bootstrap-modal\">$icon</a>";
} // }}}
function getWysiwygToken($areaId) // {{{
......
......@@ -166,7 +166,7 @@ function wikiplugin_convene($data, $params)
$dateHeader .= $tikilib->get_short_datetime($stamp);
}
$dateHeader .= '</span>';
$dateHeader .= ($perms->edit ? " <button class='conveneDeleteDate$i icon btn btn-primary btn-xs' data-date='$stamp'>$deleteicon</button>" : "") . "</td>";
$dateHeader .= ($perms->edit ? " <button class='conveneDeleteDate$i icon btn btn-primary btn-sm' data-date='$stamp'>$deleteicon</button>" : "") . "</td>";
}
$result .= "<tr class='conveneHeaderRow'>";
......@@ -243,7 +243,7 @@ function wikiplugin_convene($data, $params)
$pic .= ($perms->edit ? smarty_function_icon(['name' => 'ok', 'iclass' => 'tips', 'ititle' => ':'
. tr("Selected Date")], $smarty) : "");
if ($perms->edit && $votes[$topVoteStamp] >= $minvotes) {
$pic .= "<a class='btn btn-primary btn-xs' href='tiki-calendar_edit_item.php?todate=$stamp&calendarId=$calendarid' title='"
$pic .= "<a class='btn btn-primary btn-sm' href='tiki-calendar_edit_item.php?todate=$stamp&calendarId=$calendarid' title='"
. tr("Add as Calendar Event") . "'>"
. smarty_function_icon(['name' => 'calendar'], $smarty)
. "</a>";
......
......@@ -49,26 +49,26 @@
<div class="content">{$activityframe.content}</div>
<div class="footer">
{if $activityframe.comment && $activity_format neq 'extended'}
<a class="comment btn btn-xs" href="{service controller=comment action=list type=$activityframe.comment.type objectId=$activityframe.comment.id modal=true}">
<a class="comment btn btn-sm" href="{service controller=comment action=list type=$activityframe.comment.type objectId=$activityframe.comment.id modal=true}">
{tr}Comment{/tr}
{if $activityframe.activity.comment_count}({$activityframe.activity.comment_count|escape}){/if}
</a>
{/if}
{if $prefs.feature_friends eq 'y' && $activityframe.likeactive}
{if $activityframe.like}
<a class="like btn btn-xs" href="{service controller=social action=unlike type=$activityframe.object.type id=$activityframe.object.id}">
<a class="like btn btn-sm" href="{service controller=social action=unlike type=$activityframe.object.type id=$activityframe.object.id}">
{tr}Unlike{/tr}
{if $activityframe.activity.like_list}({$activityframe.activity.like_list|count}){/if}
</a>
{else}
<a class="like btn btn-xs" href="{service controller=social action=like type=$activityframe.object.type id=$activityframe.object.id}">
<a class="like btn btn-sm" href="{service controller=social action=like type=$activityframe.object.type id=$activityframe.object.id}">
{tr}Like{/tr}
{if $activityframe.activity.like_list}({$activityframe.activity.like_list|count}){/if}
</a>
{/if}
{/if}
{if $tiki_p_admin == 'y'}
<a class="delete-activity btn btn-xs" href="{bootstrap_modal controller=managestream action=deleteactivity activityId=$activityframe.activity.object_id}" data-activity-id="{$activityframe.activity.object_id}">
<a class="delete-activity btn btn-sm" href="{bootstrap_modal controller=managestream action=deleteactivity activityId=$activityframe.activity.object_id}" data-activity-id="{$activityframe.activity.object_id}">
{tr}Delete{/tr}
</a>
{/if}
......
......@@ -99,7 +99,7 @@
d.style.display="none";
d=document.getElementById('minichata_'+minichat_selectedchan.id);
d.setAttribute('class', 'btn btn-primary btn-xs minichata_unselected');
d.setAttribute('class', 'btn btn-primary btn-sm minichata_unselected');
minichat_selectedchan=null;
}
......@@ -110,7 +110,7 @@
d.style.display="";
d=document.getElementById('minichata_'+c.id);
d.setAttribute('class', 'active btn btn-primary btn-xs minichata_selected');
d.setAttribute('class', 'active btn btn-primary btn-sm minichata_selected');
minichat_selectedchan=c;
}
......@@ -130,7 +130,7 @@
var d=minichat_newelem("div", { 'id' : 'minichatdiv_'+c.id , 'class' : 'minichatdiv' });
document.getElementById('minichat').appendChild(d);
d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-primary btn-xs minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
d=minichat_newelem("a", { 'id' : 'minichata_'+c.id, 'class' : 'btn btn-primary btn-sm minichata_unselected', 'role' : 'button' , 'href' : "javascript: minichat_selectchannel('"+c.name+"');" });
d.innerHTML=c.name;
document.getElementById('minichatchans').appendChild(d);
......
......@@ -70,7 +70,7 @@
<input type="hidden" name="filter~{$key|escape}" value="{$filter|escape}"/>
{/foreach}
{if $smod_params.show_search_button eq 'y'}
<input type = "submit" class="btn btn-primary btn-sm tips{if $smod_params.default_button eq 'search'} btn-secondary button_default{/if}{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}"
<input type = "submit" class="btn btn-primary btn-sm tips{if $smod_params.default_button eq 'search'} btn-secondary button_default{/if}{if $smod_params.compact eq "y"} bottom{else} btn-sm{/if}"
name = "search" value = "{$smod_params.search_submit|escape}"
title="{tr}Search{/tr}|{tr}Search for text throughout the site.{/tr}"
{if $smod_params.compact eq "y"}data-placement="bottom"{/if}
......@@ -79,7 +79,7 @@
{/if}
{if $smod_params.show_go_button eq 'y'}
<input type="hidden" name="exact_match" value="" />
<input type = "submit" class="btn btn-primary btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}{if $smod_params.default_button eq 'go'} btn-secondary button_default{/if}"
<input type = "submit" class="btn btn-primary btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-sm{/if}{if $smod_params.default_button eq 'go'} btn-secondary button_default{/if}"
name = "go" value = "{$smod_params.go_submit|escape}"
title="{tr}Go{/tr}|{tr}Go directly to a page, or search in page titles if exact match is not found.{/tr}"
{if $smod_params.compact eq "y"}data-placement="bottom"{/if}
......@@ -91,7 +91,7 @@
>
{/if}
{if $smod_params.show_edit_button eq 'y' and $tiki_p_edit eq 'y'}
<input type = "submit" class = "btn btn-primary btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-xs{/if}{if $smod_params.default_button eq 'edit'} btn-secondary button_default{/if}"
<input type = "submit" class = "btn btn-primary btn-sm tips{if $smod_params.compact eq "y"} bottom{else} btn-sm{/if}{if $smod_params.default_button eq 'edit'} btn-secondary button_default{/if}"
name = "edit" value = "{$smod_params.edit_submit|escape}"
title="{tr}Edit{/tr}|{tr}Edit existing page or create a new one.{/tr}"
{if $smod_params.compact eq "y"}data-placement="bottom"{/if}
......
......@@ -16,9 +16,9 @@
{if not empty($param.type)}
{$onclick = "openFgalsWindow('{$prefs.home_file_gallery|sefurl:'file gallery':true}filegals_manager={$param.area|escape}&id=1', true);return false;"}
{if $param.type eq 'image'}
<br>{icon name='image' title='{tr}Select image{/tr}' onclick=$onclick class='btn btn-xs btn-primary'}
<br>{icon name='image' title='{tr}Select image{/tr}' onclick=$onclick class='btn btn-sm btn-primary'}
{elseif $param.type eq 'fileId'}
<br>{icon name='file' title='{tr}Pick a file{/tr}' onclick=$onclick class='btn btn-xs btn-primary'}
<br>{icon name='file' title='{tr}Pick a file{/tr}' onclick=$onclick class='btn btn-sm btn-primary'}
{elseif $param.type eq 'kaltura'}
{jq}
$("#picker_{{$name|escape}}").parent().click(function () {
......@@ -36,7 +36,7 @@ $("#picker_{{$name|escape}}").parent().click(function () {
return false;
});
{/jq}
<br>{icon name='video' title='{tr}Upload or record media{/tr}' href={service controller='kaltura' action='upload'} id='picker_'|cat:$name|escape class='btn btn-xs btn-primary'}
<br>{icon name='video' title='{tr}Upload or record media{/tr}' href={service controller='kaltura' action='upload'} id='picker_'|cat:$name|escape class='btn btn-sm btn-primary'}
{/if}
{/if}
</div>
......@@ -96,7 +96,7 @@ $("#picker_{{$name|escape}}").parent().click(function () {
</div>
{/foreach}
{if not empty($info.advancedParams)}
{button _text='Advanced' _onclick="$('.form-group.advanced.default').toggle('fast'); return false;" _class='btn btn-xs margin-bottom-md'}
{button _text='Advanced' _onclick="$('.form-group.advanced.default').toggle('fast'); return false;" _class='btn btn-sm margin-bottom-md'}
{foreach $info.advancedParams as $name => $param}
<div class="form-group advanced default" style="display: none;">
{plugin_edit_row param=$param name=$name info=$info pluginArgs=$pluginArgs}
......
......@@ -25,5 +25,5 @@
{/foreach}
{/if}
<input type="hidden" name="rating_prev[{$rating_type|escape}][{$rating_id|escape}]" value="{$current_rating|escape}">
<input type="submit" class="btn btn-info btn-xs" value="{tr}Rate{/tr}">
<input type="submit" class="btn btn-info btn-sm" value="{tr}Rate{/tr}">
</div>
......@@ -36,8 +36,8 @@
{/if}
</td>
<td>
<a class="btn btn-primary btn-xs" href="{bootstrap_modal controller=search_stored action=edit queryId=$q.queryId}">{icon name="edit"} {tr}Edit{/tr}</a>
<a class="btn btn-danger btn-xs" href="{bootstrap_modal controller=search_stored action=delete queryId=$q.queryId}">{icon name="delete"} {tr}Delete{/tr}</a>
<a class="btn btn-primary btn-sm" href="{bootstrap_modal controller=search_stored action=edit queryId=$q.queryId}">{icon name="edit"} {tr}Edit{/tr}</a>
<a class="btn btn-danger btn-sm" href="{bootstrap_modal controller=search_stored action=delete queryId=$q.queryId}">{icon name="delete"} {tr}Delete{/tr}</a>
</td>
</tr>
{foreachelse}
......
......@@ -2,7 +2,6 @@
<h2>Buttons</h2>
<div class="row">
<div class="col-sm-8 col-md-9">
<button type="button" class="btn btn-primary btn-xs">Default</button>
<button type="button" class="btn btn-primary btn-sm">Default</button>
<button type="button" class="btn btn-primary">Default</button>
<button type="button" class="btn btn-primary btn-lg">Default</button>
......@@ -31,7 +30,6 @@
<div class="row">
<div class="col-sm-8 col-md-9">
<button type="button" class="btn btn-secondary btn-xs">Primary</button>
<button type="button" class="btn btn-secondary btn-sm">Primary</button>
<button type="button" class="btn btn-secondary">Primary</button>
<button type="button" class="btn btn-secondary btn-lg">Primary</button>
......@@ -60,7 +58,6 @@
<div class="row">
<div class="col-sm-8 col-md-9">
<button type="button" class="btn btn-success btn-xs">Success</button>
<button type="button" class="btn btn-success btn-sm">Success</button>
<button type="button" class="btn btn-success">Success</button>
<button type="button" class="btn btn-success btn-lg">Success</button>
......@@ -89,7 +86,6 @@
<div class="row">
<div class="col-sm-8 col-md-9">
<button type="button" class="btn btn-info btn-xs">Info</button>
<button type="button" class="btn btn-info btn-sm">Info</button>
<button type="button" class="btn btn-info">Info</button>
<button type="button" class="btn btn-info btn-lg">Info</button>
......@@ -118,7 +114,6 @@
<div class="row">
<div class="col-sm-8 col-md-9">
<button type="button" class="btn btn-warning btn-xs">Warning</button>
<button type="button" class="btn btn-warning btn-sm">Warning</button>
<button type="button" class="btn btn-warning">Warning</button>
<button type="button" class="btn btn-warning btn-lg">Warning</button>
......@@ -147,7 +142,6 @@
<div class="row">
<div class="col-sm-8 col-md-9">
<button type="button" class="btn btn-danger btn-xs">Danger</button>
<button type="button" class="btn btn-danger btn-sm">Danger</button>
<button type="button" class="btn btn-danger">Danger</button>
<button type="button" class="btn btn-danger btn-lg">Danger</button>
......
......@@ -460,7 +460,7 @@ $("#id_recurrent").click(function () {
{html_select_time prefix="duration_" display_seconds=false time=$calitem.duration|default:'01:00' minute_interval=$prefs.calendar_timespan class='form-control date nochosen'}
</div>
<div class="col-md-2 time">
<a href="#" id="durationBtn" class="btn btn-xs btn-primary">
<a href="#" id="durationBtn" class="btn btn-sm btn-primary">
{tr}Show duration{/tr}
</a>
</div>
......
......@@ -50,7 +50,7 @@
{if $payment_info.state eq 'authorized'}
{permission name=payment_admin}
<form method="post" action="{service controller=payment action=capture paymentId=$payment_info.paymentRequestId}">
<input type="submit" class="btn btn-xs btn-warning" value="{tr}Capture Payment{/tr}">
<input type="submit" class="btn btn-sm btn-warning" value="{tr}Capture Payment{/tr}">
<input type="hidden" name="next" value="{$smarty.server.REQUEST_URI|escape}">
</form>
{/permission}
......
......@@ -20,7 +20,7 @@
<div class="form-group">
<div class="row">
<div class="col-sm-6 col-sm-push-6">
<input class="btn btn-secondary btn-xs" type="submit" name="quickedit" value="{tr}Test Plugin LIST{/tr}">
<input class="btn btn-secondary btn-sm" type="submit" name="quickedit" value="{tr}Test Plugin LIST{/tr}">
</div>
<div class="col-sm-6 col-sm-pull-6">
<label for="comment">Plugin LIST content:</label>
......
......@@ -390,13 +390,13 @@ the section loop so that the vars are not replaced by nested pretty tracker exec
{self_link delete=$items[user].itemId _class='tips' _title=":{tr}Remove{/tr}"}{icon name='delete'}{/self_link}
{/if}
{if $showcloseitem eq 'y' && $items[user].status neq 'c' && ($perms.tiki_p_admin_trackers eq 'y' or ($perms.tiki_p_modify_tracker_items eq 'y' and $items[user].status ne 'p' and $items[user].status ne 'c') or ($perms.tiki_p_modify_tracker_items_pending eq 'y' and $items[user].status eq 'p') or ($perms.tiki_p_modify_tracker_items_closed eq 'y' and $items[user].status eq 'c'))}
{self_link closeitem=$items[user].itemId _style='display:inline-block;' _class='text-nowrap btn-xs btn-danger'}{tr}Close item{/tr}{/self_link}
{self_link closeitem=$items[user].itemId _style='display:inline-block;' _class='text-nowrap btn-sm btn-danger'}{tr}Close item{/tr}{/self_link}
{/if}
{if $showopenitem eq 'y' && $items[user].status neq 'o' && ($perms.tiki_p_admin_trackers eq 'y' or ($perms.tiki_p_modify_tracker_items eq 'y' and $items[user].status ne 'p' and $items[user].status ne 'c') or ($perms.tiki_p_modify_tracker_items_pending eq 'y' and $items[user].status eq 'p') or ($perms.tiki_p_modify_tracker_items_closed eq 'y' and $items[user].status eq 'c'))}
{self_link openitem=$items[user].itemId _style='display:inline-block;' _class='text-nowrap btn-xs btn-success'}{tr}Open item{/tr}{/self_link}
{self_link openitem=$items[user].itemId _style='display:inline-block;' _class='text-nowrap btn-sm btn-success'}{tr}Open item{/tr}{/self_link}
{/if}
{if $showpenditem eq 'y' && $items[user].status neq 'p' && ($perms.tiki_p_admin_trackers eq 'y' or ($perms.tiki_p_modify_tracker_items eq 'y' and $items[user].status ne 'p' and $items[user].status ne 'c') or ($perms.tiki_p_modify_tracker_items_pending eq 'y' and $items[user].status eq 'p') or ($perms.tiki_p_modify_tracker_items_closed eq 'y' and $items[user].status eq 'c'))}
{self_link penditem=$items[user].itemId _style='display:inline-block;' _class='text-nowrap btn-xs btn-warning'}{tr}Pend item{/tr}{/self_link}
{self_link penditem=$items[user].itemId _style='display:inline-block;' _class='text-nowrap btn-sm btn-warning'}{tr}Pend item{/tr}{/self_link}
{/if}
</td>
{/if}
......
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