pg_rails 7.6.39 → 7.6.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de59469aa32c2ef73f030ea848179b8941f67a1eb948b72b018cf2d9e7b1b95
-  data.tar.gz: 4311903fb7f15aa7b070e2ac36ff530bc6e4a7750ac011a7843d34a85921483e
+  metadata.gz: cf260a16e98842bebe950a0d4c3253d6c63f2690a922ec767c04d8a99ae7a0f7
+  data.tar.gz: 57dfdff6f3042539d11089edccf7fa32df6c38f86d151256a1536f5efe6d073b
 SHA512:
-  metadata.gz: 37288f9d151624cb72e6c7567e6fdb875d91b5945baf3d66e045c640fa500d3ff3f1a90cbd6bd76aa898562c0c6b8f9d09aceddd287975f456af068b3310cee3
-  data.tar.gz: 63d8f3e1d03d521db97cae73cde5908342bbcd9dc44913289f516ee0c932b63fcdb6e626ed6a575556f04b651315293f7315b5d0e1ed69471f750dfa14fc2375
+  metadata.gz: e6fa99a2c8881e8f615839ce690c7cb9bf1d3c3ed3cf31f5490641bc253bd2de7b8826ee7c9c2374716dc8b85653db0d066d5bf5dcd4739d41bac81ff2938fbc
+  data.tar.gz: 65c53c5d31a893c6700347d16f9e3b2146a82b21ca2b5905fc214ab551ff844c9b9880118f59a1adc030cd8636fffd44908c5032482e28e3c1501dc14041af9e

data/pg_engine/app/views/users/accounts/index.html.slim

@@ -1,4 +1,5 @@
 - content_for(:container_class) { 'container border p-0 my-3' }
 - content_for(:container_style) { 'max-width: 50em; xborder-left: 1px solid grey' }
+- content_for(:padding_top_class) { 'pt-0' }
 
 = render template: 'pg_engine/base/index'

data/pg_layout/app/assets/stylesheets/sidebar.scss

@@ -54,13 +54,16 @@ $chevron-color: 200,200,200,.5;
 
 .navbar__nav-button[aria-expanded=true] {
   font-weight: bold;
+  background-color: tint-color($primary, 5%);
 }
 
 // Child entries
-#sidebar .collapse-inner {
-  background-color: tint-color($primary, 5%);
-  padding-bottom: 0.1em;
-  padding-top: 0.1em;
+#sidebar, .offcanvas {
+  .collapse-inner {
+    background-color: tint-color($primary, 5%);
+    padding-bottom: 0.1em;
+    padding-top: 0.1em;
+  }
 }
 
 // Los small-items están deprecados

data/pg_layout/app/views/layouts/pg_layout/containerized.html.slim

@@ -1,6 +1,8 @@
 - content_for :content do
   - klass = modal_targeted? ? '' : (yield(:container_class).presence || 'container-fluid')
-  div class="pt-3 #{klass}" style=yield(:container_style)
+  - padding_top_class = yield(:padding_top_class).presence || 'pt-3'
+
+  div class="#{padding_top_class} #{klass}" style=yield(:container_style)
     = content_for?(:containerized_content) ? yield(:containerized_content) : yield
 
 = render template: 'layouts/pg_layout/base'

data/pg_layout/app/views/pg_layout/_sidebar.html.slim

@@ -5,18 +5,18 @@ div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakp
     ul.list-unstyled.ps-0.mt-5
       - @navbar.sidebar.each do |entry|
         - next if @navbar.hide_entry?(entry)
+        - active = @navbar.active_entry?(entry, request)
         li.mb-1
           - if entry[:children].present?
             - entry_id = "nav-entry-#{entry[:orig_idx]}"
-            - active = @navbar.active_entry?(entry, request)
             a class="d-inline-flex text-decoration-none navbar__nav-button #{ active ? '' : 'collapsed'} #{entry[:attributes]}" data-bs-toggle="collapse" href="##{entry_id}" role="button" aria-expanded="#{ active ? 'true' : 'false'}" aria-controls=entry_id
               = entry[:title]
               - if active
-                span.bi.bi-chevron-down.ms-1 style="font-size: 0.7em"
+                span.bi.bi-chevron-down.ms-1.align-text-bottom style="font-size: 0.7em"
               - else
-                span.bi.bi-chevron-right.ms-1 style="font-size: 0.7em"
+                span.bi.bi-chevron-right.ms-1.align-text-bottom style="font-size: 0.7em"
 
-            .collapse data-turbo-temporary=('true' unless @navbar.active_entry?(entry, request)) class="#{ 'show' if @navbar.active_entry?(entry, request)}" id=entry_id
+            .collapse data-turbo-temporary=('true' unless active) class="#{ 'show' if active}" id=entry_id
               .collapse-inner
                 - entry[:children].each do |child|
                   - next if @navbar.hide_entry?(child)
@@ -24,5 +24,5 @@ div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakp
                     a href=child[:path] class="d-inline-flex text-decoration-none navbar__nav-button #{@navbar.active_entry?(child, request) ? 'active' : ''} #{child[:attributes]}"
                       = child[:title]
           - else
-            a href=entry[:path] class="d-inline-flex text-decoration-none navbar__nav-button #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
+            a href=entry[:path] class="d-inline-flex text-decoration-none navbar__nav-button #{active ? 'active' : ''} #{entry[:attributes]}"
               = entry[:title]

data/pg_layout/app/views/pg_layout/_sidebar_mobile.html.slim

@@ -9,9 +9,28 @@
       ul.list-unstyled.mt-4
         - @navbar.sidebar.each do |entry|
           - next if @navbar.hide_entry?(entry)
+          - active = @navbar.active_entry?(entry, request)
           li
-            a href=entry[:path] class="navbar__nav-button pe-4 text-light #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
-              = entry[:title]
+            - if entry[:children].present?
+              - entry_id = "nav-entry-#{entry[:orig_idx]}"
+
+              a class="d-inline-flex text-decoration-none navbar__nav-button text-light #{ active ? '' : 'collapsed'} #{entry[:attributes]}" data-bs-toggle="collapse" href="##{entry_id}" role="button" aria-expanded="#{ active ? 'true' : 'false'}" aria-controls=entry_id
+                = entry[:title]
+                - if active
+                  span.bi.bi-chevron-down.ms-1.align-text-bottom style="font-size: 0.7em"
+                - else
+                  span.bi.bi-chevron-right.ms-1.align-text-bottom style="font-size: 0.7em"
+
+              .collapse data-turbo-temporary=('true' unless active) class="#{ 'show' if active}" id=entry_id
+                .collapse-inner
+                  - entry[:children].each do |child|
+                    - next if @navbar.hide_entry?(child)
+                    .mb-1
+                      a href=child[:path] class="d-inline-flex text-decoration-none navbar__nav-button text-light #{@navbar.active_entry?(child, request) ? 'active' : ''} #{child[:attributes]}"
+                        = child[:title]
+            - else
+              a href=entry[:path] class="navbar__nav-button pe-4 text-light #{active ? 'active' : ''} #{entry[:attributes]}"
+                = entry[:title]
 css:
   .offcanvas a { text-decoration: none; }
   .offcanvas li { xmargin-top: 0.75em; }

data/pg_rails/lib/version.rb

@@ -2,6 +2,6 @@
 
 # :nocov:
 module PgRails
-  VERSION = '7.6.39'
+  VERSION = '7.6.40'
 end
 # :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.39
+  version: 7.6.40
 platform: ruby
 authors:
 - Martín Rosso