Removed the extra line on the plugin page and refactored some btn-group-items code - Bug #1465107

behatnotneeded

Change-Id: I1b6edd6a429a25ec51dcdef67b74f05e1ad03544

htdocs/artefact/comment/lib.php

@@ -1010,7 +1010,7 @@ class ArtefactTypeComment extends ArtefactType {
         return array(
             'name'     => 'delete_comment',
             'renderer' => 'div',
-            'class' => 'form-as-button pull-left delete-comment comment-action',
+            'class' => 'form-as-button pull-left delete-comment btn-group-items',
             'elements' => array(
                 'comment' => array('type' => 'hidden', 'value' => $id),
                 'submit'  => array(

htdocs/lib/upgrade.php

@@ -1427,7 +1427,7 @@ function activate_plugin_form($plugintype, $plugin) {
         'renderer'        => 'div',
         'elementclasses'  => false,
         'successcallback' => 'activate_plugin_submit',
-        'class'           => 'form-inline form-as-button pull-left last',
+        'class'           => 'form-inline form-as-button pull-left last btn-group-items',
         'jsform'          => false,
         'action'          => get_config('wwwroot') . 'admin/extensions/pluginconfig.php',
         'elements' => array(

htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl

@@ -45,7 +45,7 @@
             <div class="btn-group btn-group-top comment-item-buttons">
                 {if !$onview}
                     {if $item->canedit}
-                    <a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&amp;view={$viewid}" class="btn btn-default comment-action form-as-button pull-left">
+                    <a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&amp;view={$viewid}" class="btn btn-default btn-group-items form-as-button pull-left">
                         <span class="icon icon-pencil icon-lg"></span>
                         <span class="sr-only">{str tag=edit}</span>
                     </a>
@@ -55,7 +55,7 @@
                     {$item->deleteform|safe}
                 {/if}
                 {if $item->canreply}
-                <button class="btn btn-default pull-left commentreplyto comment-action js-reply" id="commentreplyto{$item->id}" title="{str tag=reply section=artefact.comment}" data-replyto="{$item->id}" data-canprivatereply="{$item->canprivatereply}" data-canpublicreply="{$item->canpublicreply}">
+                <button class="btn btn-default pull-left commentreplyto btn-group-items js-reply" id="commentreplyto{$item->id}" title="{str tag=reply section=artefact.comment}" data-replyto="{$item->id}" data-canprivatereply="{$item->canprivatereply}" data-canpublicreply="{$item->canpublicreply}">
                     <span class="icon icon-reply icon-lg"></span>
                     <span class="sr-only">{str tag=reply section=artefact.comment}</span>
                 </button>

htdocs/theme/raw/sass/components/_btn-group.scss

@@ -27,17 +27,15 @@
     }
 }
 
-// Custom for comment list
-.comment-action:not(:first-child) {
+// Btn-group works when there are multiple elements eg a, form, button
+.btn-group-items:not(:first-child) {
     margin-left: -1px;
 }
-.comment-action {
+.btn-group-items {
     &.btn,
     .btn {
-        @include border-right-radius(3px);
+        @include border-right-radius($border-radius-base);
         border-right-width: 1px !important; // Overriding standard styling above
         padding-top: 3px !important; // Override standard btn padding
     }
 }
-
-

htdocs/theme/raw/templates/admin/extensions/plugins.tpl

@@ -38,7 +38,7 @@
                         {$plugin}
                         <div class="btn-group btn-group-top">
                         {if $data.config}
-                            <a class="btn btn-default pull-left" title="{str tag='configfor'} {$plugintype} {$plugin}" href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">
+                            <a class="btn btn-default pull-left btn-group-items" title="{str tag='configfor'} {$plugintype} {$plugin}" href="pluginconfig.php?plugintype={$plugintype}&amp;pluginname={$plugin}">
                                  <span class="icon icon-cog icon-lg"></span>
                                  <span class="accessible-hidden sr-only ">{str tag='configfor'} {$plugintype} {$plugin}</span>
                             </a>