From 9eea7dabc295b296af416ad3b4f02e02f79d414e Mon Sep 17 00:00:00 2001 From: Eva Date: Wed, 2 Mar 2022 12:01:47 +0100 Subject: [PATCH 1/2] :bug: Fix length of names in sidebar --- CHANGES.md | 11 +++++++++++ .../styles/main/partials/sidebar-layers.scss | 6 ++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 05fa25ce0e..f4ebe4387d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,16 @@ # CHANGELOG +## 1.12.1-beta +### :boom: Breaking changes + +### :sparkles: New features + +### :bug: Bugs fixed + +- Fix length of names in sidebar [Taiga #2962](https://tree.taiga.io/project/penpot/issue/2962) + +### :heart: Community contributions by (Thank you!) + ## 1.12.0-beta ### :boom: Breaking changes diff --git a/frontend/resources/styles/main/partials/sidebar-layers.scss b/frontend/resources/styles/main/partials/sidebar-layers.scss index e8747f1325..666319fe60 100644 --- a/frontend/resources/styles/main/partials/sidebar-layers.scss +++ b/frontend/resources/styles/main/partials/sidebar-layers.scss @@ -183,21 +183,19 @@ } input.element-name { - max-width: 130px; - width: 100%; + max-width: 75%; } span.element-name { color: $color-gray-20; display: block; font-size: $fs12; - max-width: 130px; + max-width: 75%; min-width: 40px; min-height: 16px; overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; - width: 100%; } .element-actions { From 4f379821b5c541b9e587d5dfcef90321bf0839bd Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 6 Mar 2022 16:14:36 +0100 Subject: [PATCH 2/2] :bug: Fix labels on loki logger --- CHANGES.md | 1 + backend/src/app/loggers/loki.clj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index f4ebe4387d..36a66f1de2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ ### :bug: Bugs fixed - Fix length of names in sidebar [Taiga #2962](https://tree.taiga.io/project/penpot/issue/2962) +- Fix issues on loki integration ### :heart: Community contributions by (Thank you!) diff --git a/backend/src/app/loggers/loki.clj b/backend/src/app/loggers/loki.clj index 228877789b..77adc5f7e7 100644 --- a/backend/src/app/loggers/loki.clj +++ b/backend/src/app/loggers/loki.clj @@ -52,8 +52,8 @@ (let [labels {:host (cfg/get :host) :tenant (cfg/get :tenant) :version (:full cfg/version) - :logger (:logger event) - :level (:level event)}] + :logger (:logger/name event) + :level (:logger/level event)}] {:streams [{:stream labels :values [[(str (* (inst-ms (:created-at event)) 1000000))