Merge branch 'issue-13113' into panel.sutty.nl

.gitlab-ci.yml

@@ -0,0 +1,33 @@
+image: "gitea.nulo.in/sutty/panel:3.14.10-2.7.8-panel.sutty.nl"
+variables:
+  RAILS_ENV: "production"
+  LC_ALL: "C.UTF-8"
+cache:
+  paths:
+  - "vendor/ruby"
+assets:
+  stage: "build"
+  rules:
+  - if: "$CI_COMMIT_BRANCH == \"panel.sutty.nl\""
+  - if: "$CI_COMMIT_BRANCH"
+    changes:
+      compare_to: "refs/heads/rails"
+      paths:
+      - "package.json"
+      - "app/javascript/**/*"
+      - "app/assets/**/*"
+  before_script:
+  - "git config --global user.email \"${GIT_USER_EMAIL:-$GITLAB_USER_EMAIL}\""
+  - "git config --global user.name \"${GIT_USER_NAME:-$GITLAB_USER_NAME}\""
+  - "git remote set-url --push origin \"https://${GITLAB_USERNAME}:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\""
+  - "apk add python2 dotenv brotli"
+  - "mv config/credentials.yml.enc.ci config/credentials.yml.enc"
+  - "cp .env.example .env"
+  - "dotenv bundle install --path=vendor"
+  script:
+  - "dotenv RAILS_ENV=production bundle exec rails webpacker:clobber"
+  - "dotenv RAILS_ENV=production bundle exec rails assets:precompile"
+  - "dotenv RAILS_ENV=production bundle exec rails assets:clean"
+  after_script:
+  - "git add public && git commit -m \"ci: assets [skip ci]\""
+  - "git push -o ci.skip"

app/assets/stylesheets/application.scss

@@ -20,6 +20,7 @@ $form-feedback-valid-color: $cyan;
 $form-feedback-invalid-color: $magenta;
 $form-feedback-icon-valid-color: $black;
 $component-active-bg: $magenta;
+$btn-white-space: nowrap;
 
 $spacers: (
   2-plus: 0.75rem
@@ -92,6 +93,10 @@ a {
     color: var(--color);
   }
 
+  &:focus {
+    outline: 1px solid var(--color);
+  }
+
   &[target=_blank] {
     /* TODO: Convertir a base64 para no hacer peticiones extra */
     &:after {
@@ -217,6 +222,10 @@ svg {
   }
 }
 
+.badge {
+  white-space: break-spaces;
+}
+
 .btn-sm {
   @extend .badge
 }

app/views/layouts/_breadcrumb.haml

@@ -1,19 +1,20 @@
-%nav.navbar
+%nav.navbar.flex-nowrap
-  %a.navbar-brand.d-none.d-sm-block{ href: '/' }
+  %a.navbar-brand.order-0{ href: '/' }
     = inline_svg_tag 'sutty.svg', class: 'black', aria: true,
       title: t('svg.sutty.title'), desc: t('svg.sutty.desc')
 
-  %nav{ aria: { label: t('.title') } }
+  - if breadcrumbs?
+    %nav.flex-grow-1.order-2.order-md-1{ aria: { label: t('.title') } }
       %ol.breadcrumb.m-0.flex-wrap
         - breadcrumb_trail do |crumb|
           %li.breadcrumb-item{ class: crumb.current? ? 'active' : '' }
             - if crumb.current?
               %span.line-clamp-1{ aria: { current: 'page' } }= crumb.name
             - else
-            %span.line-clamp-1= link_to crumb.name, crumb.url
+              = link_to crumb.name, crumb.url, class: 'line-clamp-1'
 
+  %ul.navbar-nav.order-1.order-md-2
     - if @current_usuarie || current_usuarie
-    %ul.navbar-nav
       - if @site&.tienda?
         %li.nav-item
           = link_to t('.tienda'), @site.tienda_url,
@@ -26,4 +27,5 @@
       - params.permit!
       - I18n.available_locales.each do |locale|
         - next if locale == I18n.locale
+        %li.nav-item
           = link_to t("switch_locale.#{locale}"), params.to_h.merge(change_locale_to: locale)