From bd662b90fbf819eb65510641afa98750507a3692 Mon Sep 17 00:00:00 2001 From: Josef Moravec <josef.moravec@gmail.com> Date: Tue, 1 Nov 2016 11:45:35 +0100 Subject: [PATCH] Bug 16239: Rebased on master on 2016-11-01, commit 6001765 --- koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index 46e9ed1..3d6b23b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -262,7 +262,7 @@ CAN_user_serials_create_subscription ) %] [% END %] [% IF Koha.Preference('ArticleRequests') %] - <div class="btn-group"><a id="placehold" class="btn btn-small" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber %]"><i class="fa fa-file-text-o"></i> Request article</a></div> + <div class="btn-group"><a id="placehold" class="btn btn-default btn-sm" href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber %]"><i class="fa fa-file-text-o"></i> Request article</a></div> [% END %] </div> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 1000c03..2cc5f51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -206,7 +206,7 @@ <form action="/cgi-bin/koha/acqui/basket.pl" method="post"> <input type="hidden" name="op" value="email" /> <input type="hidden" name="basketno" value="[% basketno %]" /> - <button type="submit" class="btn btn-small" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button> + <button type="submit" class="btn btn-default btn-sm" id="emailvendorbutton"><i class="fa fa-envelope"></i> E-mail order</button> </form> </div> [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index dfb7894..fd42baa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -132,7 +132,7 @@ [% END %] [% END %] </select> - <button type="submit" class="btn btn-small" type="submit"> + <button type="submit" class="btn btn-default btn-sm" type="submit"> <i class="fa fa-refresh"></i> Update </button> </form> @@ -245,7 +245,7 @@ <td class="ar-date"><span title="[% ar.created_on %]">[% ar.created_on | $KohaDates %]</span></td> <td class="ar-actions"> <div class="dropdown"> - <a class="btn btn-mini dropdown-toggle" id="ar-actions" role="button" data-toggle="dropdown" href="#"> + <a class="btn btn-default btn-xs dropdown-toggle" id="ar-actions" role="button" data-toggle="dropdown" href="#"> Actions <b class="caret"></b> </a> @@ -373,7 +373,7 @@ <td class="ar-date"><span title="[% ar.created_on %]">[% ar.created_on | $KohaDates %]</span></td> <td class="ar-actions"> <div class="dropdown"> - <a class="btn btn-mini dropdown-toggle" id="ar-actions" role="button" data-toggle="dropdown" href="#"> + <a class="btn btn-default btn-xs dropdown-toggle" id="ar-actions" role="button" data-toggle="dropdown" href="#"> Actions <b class="caret"></b> </a> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index 6dcdd75..0a6d6f6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -287,7 +287,7 @@ $(document).ready(function() { [% END %] <p> - <input type="submit" class="btn" value="Place request" /> + <input type="submit" class="btn btn-default" value="Place request" /> </p> </form> [% ELSE %] -- 2.1.4