Merge pull request #21 from wsklad-source/dev

Dev 0.6.x
wsklad-source · Oct 9, 2023 · 25db5da · 25db5da
2 parents 120b627 + 154ac83
commit 25db5da
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 35 deletions.
diff --git a/assets/css/main.css b/assets/css/main.css
diff --git a/assets/css/main.css.map b/assets/css/main.css.map
diff --git a/assets/js/bootstrap.bundle.min.js b/assets/js/bootstrap.bundle.min.js
diff --git a/assets/scss/external/_bootsrap.scss b/assets/scss/external/_bootsrap.scss
@@ -1,35 +1,35 @@
 /*
 *** Init
  */
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/functions";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/variables";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/variables-dark";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/maps";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/mixins";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/utilities";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/functions";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/variables";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/variables-dark";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/maps";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/mixins";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/utilities";
 
 @import "../variables";
 
 /*
 *** bootstrap
  */
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/root";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/buttons";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/transitions";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/badge";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/button-group";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/list-group";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/grid";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/card";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/tables";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/progress";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/forms";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/nav";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/alert";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/popover";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/root";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/buttons";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/transitions";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/badge";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/button-group";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/list-group";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/grid";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/card";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/tables";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/progress";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/forms";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/nav";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/alert";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/popover";
 
 // Helpers
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/helpers";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/helpers";
 
 // Utilities
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/utilities/api";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/utilities/api";
diff --git a/readme.txt b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: WSKLAD, Frescoref
 Tags: мой склад, moy sklad, woocommerce, woo, warehouse, wsklad
 Requires at least: 5.2
-Tested up to: 6.2
+Tested up to: 6.3
 Requires PHP: 7.0
-Stable tag: 0.5.2
+Stable tag: 0.6.0
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Donate link: https://wsklad.ru/market
@@ -54,6 +54,13 @@ Updates are released as needed, but only when available to the WSKLAD team. For
 
 == Changelog ==
 
+= 0.6.0 =
+* Up: language files.
+* Up: composer to latest.
+* WP tested up to: 6.3
+* Up: Bootstrap to 5.3.2
+* Fix: more.
+
 = 0.5.2 =
 * Fix: more.
 

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'wsklad/wsklad',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => 'ae8184a86b35dcb37f5975d4d735d9fd0b5d7c96',
+        'reference' => '16f3955f0965e53cb2e0e64bbcdb155723636576',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -99,7 +99,7 @@
         'wsklad/wsklad' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => 'ae8184a86b35dcb37f5975d4d735d9fd0b5d7c96',
+            'reference' => '16f3955f0965e53cb2e0e64bbcdb155723636576',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

diff --git a/views/accounts/sections.php b/views/accounts/sections.php
@@ -21,7 +21,7 @@
 
 	$views[$tab_key] = sprintf
 	(
-		'<a href="%s" class="nav-link w-auto m-1 mt-0 mb-2 p-2 text-decoration-none %s">%s<br><span class="sub">%s</span></a>',
+		'<a href="%s" class="nav-link w-auto m-1 mt-0 mb-1 p-2 text-decoration-none %s">%s<br><span class="sub mt-1 ">%s</span></a>',
 		$sold_url,
 		$class,
 		$tab_name['title'],

diff --git a/views/add/sections.php b/views/add/sections.php
@@ -30,7 +30,7 @@
     return;
 }
 
-echo "<ul class='subsubsub w-100 d-block float-none fs-6'>";
+echo "<ul class='subsubsub mw-100 px-2 d-block float-none fs-6'>";
 foreach($views as $class => $view)
 {
     $views[$class] = "<li class='$class'>$view";

diff --git a/views/extensions/sections.php b/views/extensions/sections.php
@@ -25,7 +25,7 @@
     );
 }
 
-echo "<ul class='subsubsub w-100 d-block float-none fs-6'>";
+echo "<ul class='subsubsub mw-100 px-2 d-block float-none fs-6'>";
 foreach($views as $class => $view)
 {
     $views[$class] = "<li class='$class'>$view";

diff --git a/views/settings/sections.php b/views/settings/sections.php
@@ -30,7 +30,7 @@
     return;
 }
 
-echo "<ul class='subsubsub w-100 d-block float-none fs-6'>";
+echo "<ul class='subsubsub w-100 mw-100 px-2 d-block float-none fs-6'>";
 foreach($views as $class => $view)
 {
     $views[$class] = "<li class='$class'>$view";

diff --git a/wsklad.php b/wsklad.php
@@ -3,7 +3,7 @@
  * Plugin Name: WSKLAD
  * Plugin URI: https://wordpress.org/plugins/wsklad
  * Description: Implementation of a mechanism for flexible exchange of various data between Moy Sklad and a site running WordPress.
- * Version: 0.5.2
+ * Version: 0.6.0
  * Requires at least: 5.2
  * Requires PHP: 7.0
  * Text Domain: wsklad