Merge branch 'release/3.0.1'

otto-torino · Feb 1, 2024 · 0f2fcfe · 0f2fcfe
2 parents c43424a + df40373
commit 0f2fcfe
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 47 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/core/ChangeForm.js b/baton/static/baton/app/src/core/ChangeForm.js
@@ -202,8 +202,7 @@ const ChangeForm = {
         })
     },
     fixSubmitRow: function() {
-        $('#content-main form').addClass('with-baton-fixed-submit-row')
-        $('form .submit-row').addClass('baton-fixed-submit-row')
+        $('#content-main form').addClass('baton-fixed-submit-row')
         const footerHeight = $('#footer').outerHeight()
         let fixPosition = function() {
             if ($(window).scrollTop() + $(window).height() > $(document).height() - footerHeight + 2) {

diff --git a/baton/static/baton/app/src/styles/_breadcrumbs.scss b/baton/static/baton/app/src/styles/_breadcrumbs.scss
@@ -4,7 +4,7 @@
   background: var(--bs-baton-breadcrumbs-bg);
   color: var(--bs-baton-breadcrumbs-color);
   // border-bottom: 1px solid $breadcrumbs-border-color;
-  line-height: 1.9;
+  line-height: 2.0;
   word-spacing: 5px;
 
   a {

diff --git a/baton/static/baton/app/src/styles/_footer.scss b/baton/static/baton/app/src/styles/_footer.scss
@@ -10,7 +10,7 @@
   margin-top: 20px;
   position: absolute;
   width: 100%;
-  z-index: 1000;
+  z-index: 1001;
 
   p {
     margin-bottom: 5px;

diff --git a/baton/static/baton/app/src/styles/_menu.scss b/baton/static/baton/app/src/styles/_menu.scss
@@ -28,7 +28,8 @@ body:not(.menu-mobile) {
   padding: 0;
   position: fixed;
   top: 0;
-  z-index: 100;
+  transition: left .4s ease-out;
+  z-index: 10002;
 
   @include media-breakpoint-up(lg) {
     overflow: auto;

diff --git a/baton/static/baton/app/src/styles/_placeholders.scss b/baton/static/baton/app/src/styles/_placeholders.scss
@@ -75,7 +75,7 @@
       width: 100%;
     }
 
-    > div:not(.flex-container),
+    >div:not(.flex-container),
     .flex-container {
       align-items: flex-start;
       display: flex;
@@ -149,7 +149,7 @@
         margin: 0 10px;
       }
 
-      a + a {
+      a+a {
         @extend .me-3;
       }
 
@@ -168,8 +168,8 @@
     .datetimeshortcuts {
       align-self: center;
 
-      + .newline,
-      + br {
+      +.newline,
+      +br {
         content: '';
         display: block;
         height: 0.5rem;
@@ -202,7 +202,8 @@
 
       +p
 
-            /* django 1.11 */ {
+      /* django 1.11 */
+        {
         flex-basis: 100%;
         margin-left: 0 !important;
 
@@ -471,6 +472,7 @@
   }
 
   .tabular.inline-related {
+
     input[type='text'],
     input[type='number'],
     input[type='email'],
@@ -545,7 +547,7 @@
       margin-left: 10% !important;
     }
 
-    > ul {
+    >ul {
       padding-left: 1.2rem;
     }
   }
@@ -587,19 +589,6 @@
       flex-direction: row-reverse;
     }
 
-    @include media-breakpoint-up(lg) {
-      &.baton-fixed-submit-row {
-        background: var(--bs-baton-changeform-submit-row-bg);
-        bottom: 0;
-        left: 16.66666667%;
-        padding: 1rem 2rem;
-        position: fixed;
-        transition: padding 0.2s linear;
-        width: 83.33333333%;
-        z-index: 100;
-      }
-    }
-
     input[type='submit'] {
       @extend .btn;
       @extend .btn-success;
@@ -614,7 +603,7 @@
       }
     }
 
-    > a {
+    >a {
       margin-bottom: 15px;
       margin-left: 0.25rem;
       order: 1;
@@ -700,18 +689,18 @@
     margin-right: 0;
   }
 
-  fieldset > h2 {
+  fieldset>h2 {
     background: var(--bs-baton-changeform-fieldset-title-bg);
     font-size: $h2-size;
     margin-bottom: 0;
     padding: 5px 10px;
 
-    + .form-row {
+    +.form-row {
       margin-top: 15px;
     }
   }
 
-  fieldset fieldset > h2 {
+  fieldset fieldset>h2 {
     background: var(--bs-baton-changeform-fieldset-nested-title-bg);
   }
 
@@ -725,8 +714,8 @@
     }
 
     &.empty-form,
-        // stacked inline
-        .empty-form {
+    // stacked inline
+    .empty-form {
       // tabular
       display: none !important; // inline extra param
     }
@@ -758,7 +747,7 @@
       }
       */
 
-      > .delete {
+      >.delete {
         label {
           margin-bottom: 0;
         }
@@ -769,7 +758,7 @@
       background: var(--bs-baton-changeform-field-row-error-bg);
     }
 
-    > .module {
+    >.module {
       // @extend .table-responsive;
       position: relative;
     }
@@ -822,8 +811,8 @@
           }
         }
 
-        & + td,
-        & + th {
+        &+td,
+        &+th {
           border-left: 0px;
         }
       }
@@ -907,7 +896,7 @@
     }
   }
 
-  .wrapped-fields-container > * {
+  .wrapped-fields-container>* {
     flex-grow: 0 !important;
   }
 
@@ -932,7 +921,7 @@
         width: auto;
       }
 
-      label + *:not(.datetime) {
+      label+*:not(.datetime) {
         display: inline-block;
       }
     }
@@ -941,13 +930,27 @@
 
 .baton-menu-always-collapsed {
   @include media-breakpoint-up(lg) {
-    .baton-fixed-submit-row {
+    .baton-fixed-submit-row .submit-row {
       left: 0 !important;
       width: 100% !important;
     }
   }
 }
 
-.change-form #content form.with-baton-fixed-submit-row {
-    margin-bottom: 80px !important;
+.change-form #content form.baton-fixed-submit-row {
+  margin-bottom: 80px !important;
+
+  @include media-breakpoint-up(lg) {
+    .submit-row {
+      background: var(--bs-baton-changeform-submit-row-bg);
+      border-radius: 0 6px 0 0;
+      bottom: 0;
+      left: 16.66666667%;
+      padding: 1rem 2rem;
+      position: fixed;
+      transition: padding 0.2s linear;
+      width: 83.33333333%;
+      z-index: 1000;
+    }
+  }
 }
diff --git a/baton/static/baton/app/src/styles/_root.scss b/baton/static/baton/app/src/styles/_root.scss
@@ -193,7 +193,7 @@
   --#{$prefix}baton-search-field-input-border-color: #1c2429;
   --#{$prefix}baton-search-field-color: #000;
   --#{$prefix}baton-search-field-datalist-bg: #1c2429;
-  --#{$prefix}baton-search-field-icon-color: #bf283a;
+  --#{$prefix}baton-search-field-icon-color: #a5b200;
   --#{$prefix}baton-search-field-link-color: #fff;
   --#{$prefix}baton-search-field-selected-bg: #4f6875;
   --#{$prefix}baton-search-field-selected-color: #fff;

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,8 +54,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'3.0.0'
-release = u'3.0.0'
+version = u'3.0.1'
+release = u'3.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='3.0.0',
+    version='3.0.1',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',

diff --git a/testapp/app/app/tests/test_e2e_menu_mobile.py b/testapp/app/app/tests/test_e2e_menu_mobile.py
@@ -54,12 +54,14 @@ def test_menu(self):
 
         toggler = self.driver.find_element(By.CSS_SELECTOR, ".navbar-toggler")
         toggler.click()
+        time.sleep(2)
         self.assertEqual(self.navbar_is_visible(navbar), True)
         self.assertEqual('menu-open' in self.driver.find_element(By.TAG_NAME, 'body').get_attribute('class').split(), True)
         root_voices = navbar.find_elements(By.CSS_SELECTOR, '.depth-0 > li')
 
         close_button = self.driver.find_element(By.CLASS_NAME, 'fa-times')
         close_button.click()
+        time.sleep(2)
         self.assertEqual('menu-open' in self.driver.find_element(By.TAG_NAME, 'body').get_attribute('class').split(), False)
         self.assertEqual(self.navbar_is_invisible(navbar), True)
 

diff --git a/testapp/app/db.sqlite3 b/testapp/app/db.sqlite3