From 0bfce8e96f28558d2676f5ce4056a6ffc490b4b4 Mon Sep 17 00:00:00 2001 From: Torsten Date: Thu, 15 Dec 2022 12:50:33 +0200 Subject: [PATCH] minor --- Gemfile.lock | 2 ++ app/views/layouts/_messages.haml | 2 +- config/tailwind.config.js | 3 ++- merged/cards.yml | 4 ++-- merged/sections.yml | 7 ++++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0a6f065..6407d35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,6 +5,7 @@ PATH active_hash git haml-rails + mini_magick rails (>= 7.0.4) redcarpet @@ -158,6 +159,7 @@ GEM mina (1.2.4) open4 (~> 1.3.4) rake + mini_magick (4.12.0) mini_mime (1.1.2) minitest (5.16.3) msgpack (1.6.0) diff --git a/app/views/layouts/_messages.haml b/app/views/layouts/_messages.haml index dc550e9..daffa21 100644 --- a/app/views/layouts/_messages.haml +++ b/app/views/layouts/_messages.haml @@ -22,7 +22,7 @@ const notification = document.querySelector('#flash') if (notification) { setInterval(function() { - notification.classList.add('collapse'); + notification.classList.add('hidden'); }, 5000); } } diff --git a/config/tailwind.config.js b/config/tailwind.config.js index 3ecd28d..fcca4e6 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -2,7 +2,8 @@ const defaultTheme = require('tailwindcss/defaultTheme') const execSync = require('child_process').execSync; const output = execSync('bundle show merged', { encoding: 'utf-8' }); -const fullname = output.trim() + '/app/**/*.{haml,html,rb}' +const fullname = output.trim() + '/app/**/*.{haml,html,rb}' ; +console.log(fullname); module.exports = { content: [ diff --git a/merged/cards.yml b/merged/cards.yml index 7903639..2e606e9 100644 --- a/merged/cards.yml +++ b/merged/cards.yml @@ -50,7 +50,7 @@ :options: background: solid_blue color: white - align: left + align: center :updated_at: &2 2022-12-09 17:50:02.733622073 +02:00 :section_id: 11 :index: 1 @@ -63,7 +63,7 @@ :options: background: solid_blue color: white - align: left + align: right :updated_at: *2 :section_id: 11 :index: 2 diff --git a/merged/sections.yml b/merged/sections.yml index 99139c7..cdb2fa0 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -182,12 +182,13 @@ the use of common spaces, see below. :image: :id: 11 - :card_template: card_full_image + :card_template: card_normal_round :options: button_link: '' button_text: '' - background: light_blue - columns: '2' + background: white + columns: '3' + color: none :updated_at: *2 :page_id: 2 :index: 2