Merge branch 'develop'

.github/ISSUE_TEMPLATE/1_Bug_report.yaml

@@ -7,7 +7,7 @@ body:
     id: affected-versions
     attributes:
       label: Bootstraptable version(s) affected
-      placeholder: 1.21.1
+      placeholder: 1.21.2
     validations:
       required: true
   - type: textarea

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,7 +22,7 @@
 
 **☑️Self Check before Merge**
 
-⚠️ Please check all items below before review. ⚠️
+⚠️ Please check all items below before reviewing. ⚠️
 
 - [ ] Doc is updated/provided or not needed
 - [ ] Demo is updated/provided or not needed

.stylelintrc

@@ -1,12 +1,11 @@
 {
-  "extends": "stylelint-config-standard",
+  "extends": "stylelint-config-standard-scss",
   "rules": {
-    "indentation": null,
-    "selector-pseudo-element-colon-notation": null,
-    "function-comma-space-after": null,
+    "alpha-value-notation": null,
+    "color-function-notation": null,
+    "hue-degree-notation": null,
     "no-descending-specificity": null,
-    "declaration-bang-space-before": null,
-    "number-leading-zero": null,
-    "rule-empty-line-before": null
+    "scss/no-global-function-names": null,
+    "selector-not-notation": null
   }
 }

CHANGELOG.md

@@ -1,6 +1,25 @@
 ChangeLog
 ---------
 
+### 1.21.2
+
+#### Core
+
+- **New:** Added `sortResetPage` option to reset the page number when sorting.
+- **Update:** Fixed overwrite default option bug.
+- **Update:** Updated es-ES, es-CR locale.
+- **Update:** Improved scss style and lint.
+- **Update:** Used scss vars for sorting background image URLs.
+
+#### Extensions
+
+- **New(custom-view):** Added `onToggleCustomView` event.
+- **Update(cookie):** Fixed cookie name compare bug on using `cookiesEnabled` option.
+- **Update(custom-view):** Fixed `showCustomView` option cannot work.
+- **Update(filter-control):** Fixed bug while using a select filter and set `searchFormatter` to false.
+- **Update(filter-control):** Fixed missing class when specifying `iconSize`.
+- **Update(reorder-rows):** Updated default value to `reorder-rows-on-drag-class` of `onDragClass` option.
+
 ### 1.21.1
 
 #### Core

_config.yml

@@ -27,7 +27,7 @@ algolia:
   index_name:     bootstrap-table
 
 # Custom variables
-current_version:  1.21.1
+current_version:  1.21.2
 title:            "Bootstrap Table"
 description:      "An extended table to the integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)"
 authors:          "Zhixin Wen, and Bootstrap Table contributors"

bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "title": "Bootstrap Table",
   "description": "An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)",
   "author": {