Browse Source

Merge pull request #4236 from dimbslmh/develop

 fix toolbar dropdown button border
文翼 6 years ago
parent
commit
fee4e1ee23

+ 8 - 3
src/themes/bulma/bootstrap-table-bulma.scss

@@ -25,17 +25,22 @@
       margin-right: 0;
     }
 
-    .keep-open.button.dropdown {
+    .button.dropdown {
       padding: 0;
-      margin: 0;
       border: 0;
 
       .button {
+        margin: 0;
+      }
+
+      &:not(:first-child) .button {
         border-bottom-left-radius: 0;
         border-top-left-radius: 0;
+      }
+
+      &:last-child .button {
         border-bottom-right-radius: 4px;
         border-top-right-radius: 4px;
-        margin-right: 0;
       }
 
       .dropdown-content {

+ 1 - 1
src/themes/foundation/bootstrap-table-foundation.js

@@ -18,7 +18,7 @@
       this.constants.theme = 'foundation'
 
       this.constants.classes.buttonsGroup = 'button-group'
-      this.constants.classes.buttonsDropdown = 'button dropdown-container'
+      this.constants.classes.buttonsDropdown = 'dropdown-container'
       this.constants.classes.paginationDropdown = ''
       this.constants.classes.dropdownActive = 'is-active'
       this.constants.classes.paginationActive = 'current'

+ 1 - 6
src/themes/foundation/bootstrap-table-foundation.scss

@@ -21,16 +21,11 @@
       height: 2.5293rem;
     }
 
-    .keep-open.button {
+    .dropdown-container {
       .button {
         &:hover .menu {
           background: #fff;
         }
-
-        padding: 0;
-        border: none;
-        margin: 0;
-        vertical-align: top;
       }
 
       .menu {

+ 1 - 1
src/themes/materialize/bootstrap-table-materialize.js

@@ -62,7 +62,7 @@
     initPagination () {
       super.initPagination()
 
-      if (this.pagination && !this.options.onlyInfoPagination) {
+      if (this.options.pagination && !this.options.onlyInfoPagination) {
         this.$pagination.find('.dropdown-toggle')
           .attr('data-target', 'page-list-dropdown')
           .dropdown()