From 4378d71b70985915cda5f747329d6841f0a8c2b3 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 29 Sep 2022 11:42:45 +0200
Subject: [PATCH 1/4] :bug: Fix error message on login when profile does not
have password
---
frontend/src/app/main/ui/auth/login.cljs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs
index 437a60999..29273386d 100644
--- a/frontend/src/app/main/ui/auth/login.cljs
+++ b/frontend/src/app/main/ui/auth/login.cljs
@@ -93,6 +93,10 @@
(= :wrong-credentials (:code cause)))
(reset! error (tr "errors.wrong-credentials"))
+ (and (= :validation (:type cause))
+ (= :account-without-password (:code cause)))
+ (reset! error (tr "errors.wrong-credentials"))
+
:else
(reset! error (tr "errors.generic"))))
From 80f49e06ccd931acc9574f05ba9e4997dd8a9106 Mon Sep 17 00:00:00 2001
From: Elhombretecla <delacruzgarciajuan@gmail.com>
Date: Wed, 28 Sep 2022 15:54:58 +0200
Subject: [PATCH 2/4] :tada: add new css changes
---
.../styles/main/partials/dashboard-grid.scss | 21 +++++++-------
.../main/partials/dashboard-sidebar.scss | 2 +-
.../styles/main/partials/dashboard.scss | 28 ++++++++++++-------
.../src/app/main/ui/dashboard/sidebar.cljs | 23 +++++++++------
4 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/frontend/resources/styles/main/partials/dashboard-grid.scss b/frontend/resources/styles/main/partials/dashboard-grid.scss
index 4af6e1741..56f7d79e2 100644
--- a/frontend/resources/styles/main/partials/dashboard-grid.scss
+++ b/frontend/resources/styles/main/partials/dashboard-grid.scss
@@ -103,8 +103,8 @@
h3 {
border: 1px solid transparent;
color: $color-gray-60;
- font-size: $fs16;
- font-weight: 400;
+ font-size: $fs14;
+ font-weight: 500;
overflow: hidden;
padding: 0;
height: 27px;
@@ -120,7 +120,7 @@
}
span.date {
- color: $color-gray-20;
+ color: $color-gray-30;
font-size: $fs14;
overflow: hidden;
text-overflow: ellipsis;
@@ -146,10 +146,10 @@
.item-badge {
background-color: $color-white;
border: 1px solid $color-gray-20;
- border-radius: 4px;
+ border-radius: 2px;
position: absolute;
- top: $size-1;
- right: $size-1;
+ top: $size-2;
+ right: $size-2;
height: 32px;
width: 32px;
display: flex;
@@ -197,7 +197,7 @@
.project-th-actions {
align-items: center;
- bottom: 2px;
+ bottom: 14px;
opacity: 0;
display: flex;
right: 5px;
@@ -444,10 +444,11 @@
.create-new {
background-color: white;
border: 2px solid $color-gray-10;
- height: 158px;
- cursor: pointer;
- color: $color-black;
border-radius: 3px;
+ color: $color-black;
+ cursor: pointer;
+ height: 158px;
+ font-family: "worksans", sans-serif;
margin: 0.5rem;
&:hover {
border: 2px solid $color-primary;
diff --git a/frontend/resources/styles/main/partials/dashboard-sidebar.scss b/frontend/resources/styles/main/partials/dashboard-sidebar.scss
index 8b6107dd1..2d7ee138e 100644
--- a/frontend/resources/styles/main/partials/dashboard-sidebar.scss
+++ b/frontend/resources/styles/main/partials/dashboard-sidebar.scss
@@ -377,7 +377,7 @@
span {
@include text-ellipsis;
color: $color-black;
- margin: 10px 5px;
+ margin: 10px;
font-size: $fs14;
max-width: 160px;
}
diff --git a/frontend/resources/styles/main/partials/dashboard.scss b/frontend/resources/styles/main/partials/dashboard.scss
index fa08c6fc7..281026024 100644
--- a/frontend/resources/styles/main/partials/dashboard.scss
+++ b/frontend/resources/styles/main/partials/dashboard.scss
@@ -43,9 +43,10 @@
}
}
.invite {
- width: 180px;
- height: 40px;
align-self: flex-end;
+ height: 40px;
+ font-family: "worksans", sans-serif;
+ width: 180px;
}
img {
width: 274px;
@@ -200,7 +201,7 @@
align-items: center;
justify-content: flex-start;
min-height: 32px;
- margin-left: 13px;
+ margin-left: $size-2;
}
.show-more {
align-items: center;
@@ -245,10 +246,11 @@
}
.info {
- font-size: $fs16;
+ font-size: $fs14;
line-height: 1rem;
- font-weight: unset;
- color: $color-gray-30;
+ font-weight: 400;
+ color: $color-gray-60;
+ margin-left: .75rem;
}
.project-actions {
@@ -256,8 +258,9 @@
margin-left: $size-6;
.btn-small {
- padding: $size-2;
+ height: 32px;
margin: 0 $size-2;
+ width: 32px;
}
}
@@ -287,9 +290,10 @@
}
.recent-files-row-title-info {
- color: $color-gray-30;
+ color: $color-gray-60;
line-height: 1rem;
- font-size: $fs16;
+ font-size: $fs14;
+ font-weight: 400;
}
.dashboard-table {
@@ -453,8 +457,12 @@
font-size: 18px;
font-weight: 600;
color: $color-black;
- margin-left: 20px;
+ margin-left: 18px;
margin-right: 10px;
+ &.icon {
+ margin-left: 10px;
+ margin-right: 16px;
+ }
}
svg {
width: 12px;
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index eb11a8eda..62fc856ab 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -204,7 +204,7 @@
i/search])]))
(mf/defc teams-selector-dropdown
- [{:keys [profile] :as props}]
+ [{:keys [team profile] :as props}]
(let [teams (mf/deref refs/teams)
on-create-clicked
@@ -221,18 +221,23 @@
[:hr]
[:li.team-name {:on-click (partial team-selected (:default-team-id profile))}
[:span.team-icon i/logo-icon]
- [:span.team-text (tr "dashboard.your-penpot")]]
+ [:span.team-text (tr "dashboard.your-penpot")]
+ (when (= (:default-team-id profile) (:id team))
+ [:span.icon i/tick])]
- (for [team (remove :is-default (vals teams))]
- [:li.team-name {:on-click (partial team-selected (:id team))
- :key (dm/str (:id team))}
+ (for [team-item (remove :is-default (vals teams))]
+ [:li.team-name {:on-click (partial team-selected (:id team-item))
+ :key (dm/str (:id team-item))}
[:span.team-icon
- [:img {:src (cf/resolve-team-photo-url team)}]]
- [:span.team-text {:title (:name team)} (:name team)]])
+ [:img {:src (cf/resolve-team-photo-url team-item)}]]
+ [:span.team-text {:title (:name team-item)} (:name team-item)]
+ (when (= (:id team-item) (:id team))
+ [:span.icon i/tick])])
[:hr]
- [:li.action {:on-click on-create-clicked :data-test "create-new-team"}
- (tr "dashboard.create-new-team")]]))
+ [:li.team-name.action {:on-click on-create-clicked :data-test "create-new-team"}
+ [:span.team-icon i/close]
+ [:span.team-text (tr "dashboard.create-new-team")]]]))
(s/def ::member-id ::us/uuid)
(s/def ::leave-modal-form
From 8d5a97f6e57b66e84f8df9b5a7dc87c8c6339994 Mon Sep 17 00:00:00 2001
From: Elhombretecla <delacruzgarciajuan@gmail.com>
Date: Thu, 29 Sep 2022 12:05:30 +0200
Subject: [PATCH 3/4] :sparkles: Change team UI dropdown refactor
---
.../main/partials/dashboard-sidebar.scss | 33 +++++++++++++++++++
.../src/app/main/ui/dashboard/sidebar.cljs | 4 +--
frontend/translations/ar.po | 4 ---
frontend/translations/ca.po | 6 +---
frontend/translations/da.po | 4 ---
frontend/translations/de.po | 4 ---
frontend/translations/el.po | 4 ---
frontend/translations/en.po | 6 +---
frontend/translations/es.po | 6 +---
frontend/translations/eu.po | 4 ---
frontend/translations/fa.po | 4 ---
frontend/translations/fr.po | 6 +---
frontend/translations/gl.po | 2 +-
frontend/translations/he.po | 4 ---
frontend/translations/it.po | 6 +---
frontend/translations/jpn_JP.po | 4 ---
frontend/translations/nb_NO.po | 4 ---
frontend/translations/pl.po | 4 ---
frontend/translations/pt_BR.po | 6 +---
frontend/translations/ro.po | 6 +---
frontend/translations/ru.po | 4 ---
frontend/translations/tr.po | 4 ---
frontend/translations/zh_CN.po | 4 ---
frontend/translations/zh_Hant.po | 4 ---
24 files changed, 42 insertions(+), 95 deletions(-)
diff --git a/frontend/resources/styles/main/partials/dashboard-sidebar.scss b/frontend/resources/styles/main/partials/dashboard-sidebar.scss
index 2d7ee138e..621c3e4ed 100644
--- a/frontend/resources/styles/main/partials/dashboard-sidebar.scss
+++ b/frontend/resources/styles/main/partials/dashboard-sidebar.scss
@@ -88,6 +88,32 @@
display: flex;
height: 48px;
align-items: center;
+
+ &.action {
+ .team-icon {
+ border-radius: 50%;
+ background-color: $color-gray-10;
+ height: 24px;
+ margin-right: 10px;
+ padding: 6px;
+ width: 24px;
+
+ svg {
+ height: 12px;
+ width: 12px;
+ }
+ }
+
+ &:hover {
+ .team-icon {
+ background-color: $color-primary;
+ }
+ }
+
+ .team-text {
+ width: 150px;
+ }
+ }
.team-icon {
display: flex;
@@ -113,6 +139,13 @@
@include text-ellipsis;
width: 130px;
}
+
+ .icon {
+ margin-left: auto;
+ svg {
+ fill: $color-gray-60;
+ }
+ }
}
.switch-icon {
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index 62fc856ab..2e14b3c30 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -217,8 +217,6 @@
(st/emit! (dd/go-to-projects team-id))))]
[:ul.dropdown.teams-dropdown
- [:li.title (tr "dashboard.switch-team")]
- [:hr]
[:li.team-name {:on-click (partial team-selected (:default-team-id profile))}
[:span.team-icon i/logo-icon]
[:span.team-text (tr "dashboard.your-penpot")]
@@ -236,7 +234,7 @@
[:hr]
[:li.team-name.action {:on-click on-create-clicked :data-test "create-new-team"}
- [:span.team-icon i/close]
+ [:span.team-icon.new-team i/close]
[:span.team-text (tr "dashboard.create-new-team")]]]))
(s/def ::member-id ::us/uuid)
diff --git a/frontend/translations/ar.po b/frontend/translations/ar.po
index 251b20a18..ea33e4b84 100644
--- a/frontend/translations/ar.po
+++ b/frontend/translations/ar.po
@@ -460,10 +460,6 @@ msgstr "تم نقل الملفات بنجاح"
msgid "dashboard.success-move-project"
msgstr "تم نقل مشروعك بنجاح"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "تبديل الفريق"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "معلومات الفريق"
diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po
index e11be3a19..18650ca5d 100644
--- a/frontend/translations/ca.po
+++ b/frontend/translations/ca.po
@@ -240,7 +240,7 @@ msgstr "(còpia)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Crea un equip nou"
+msgstr "Crea un equip nou"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -597,10 +597,6 @@ msgstr "S'han mogut els fitxers"
msgid "dashboard.success-move-project"
msgstr "S'ha mogut el projecte"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Canvieu d'equip"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Informació de l'equip"
diff --git a/frontend/translations/da.po b/frontend/translations/da.po
index 5824a00a0..7626c10c3 100644
--- a/frontend/translations/da.po
+++ b/frontend/translations/da.po
@@ -361,10 +361,6 @@ msgstr "Dine filer er blevet flyttet med succes"
msgid "dashboard.success-move-project"
msgstr "Dit projekt er blevet flyttet med succes"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Skift team"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Team info"
diff --git a/frontend/translations/de.po b/frontend/translations/de.po
index 9d5fcaf58..6c41576c2 100644
--- a/frontend/translations/de.po
+++ b/frontend/translations/de.po
@@ -608,10 +608,6 @@ msgstr "Ihre Dateien wurden erfolgreich verschoben"
msgid "dashboard.success-move-project"
msgstr "Ihr Projekt wurde erfolgreich verschoben"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Team wechseln"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Teaminformationen"
diff --git a/frontend/translations/el.po b/frontend/translations/el.po
index 70d66b3fc..072d6b829 100644
--- a/frontend/translations/el.po
+++ b/frontend/translations/el.po
@@ -322,10 +322,6 @@ msgstr "Το έργο σας μετακινήθηκε με επιτυχία"
msgid "dashboard.success-move-project"
msgstr "Το έργο σας μετακινήθηκε με επιτυχία"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Αλλαγή εξοπλισμού"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Πληροφορίες ομάδας"
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index bbdc5b912..2d6d95252 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -284,7 +284,7 @@ msgstr "(copy)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Create new team"
+msgstr "Create new team"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -646,10 +646,6 @@ msgstr "Your files have been moved successfully"
msgid "dashboard.success-move-project"
msgstr "Your project has been moved successfully"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Switch team"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Team info"
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index a9c26c205..c3923cc23 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -290,7 +290,7 @@ msgstr "(copia)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Crear nuevo equipo"
+msgstr "Crear nuevo equipo"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -662,10 +662,6 @@ msgstr "Tus archivos han sido movidos con éxito"
msgid "dashboard.success-move-project"
msgstr "Tu proyecto ha sido movido con éxito"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Cambiar equipo"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Información del equipo"
diff --git a/frontend/translations/eu.po b/frontend/translations/eu.po
index 811cdf9e5..9e067b9d5 100644
--- a/frontend/translations/eu.po
+++ b/frontend/translations/eu.po
@@ -592,10 +592,6 @@ msgstr "Zure fitxategiak ondo mugitu dira"
msgid "dashboard.success-move-project"
msgstr "Zure proiektua ondo mugitu da"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Aldatu taldea"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Taldearen informazioa"
diff --git a/frontend/translations/fa.po b/frontend/translations/fa.po
index ab1d3a019..91f758c2e 100644
--- a/frontend/translations/fa.po
+++ b/frontend/translations/fa.po
@@ -614,10 +614,6 @@ msgstr "فایلهای شما با موفقیت منتقل شدند"
msgid "dashboard.success-move-project"
msgstr "پروژه شما با موفقیت منتقل شد"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "تغییر تیم"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "اطلاعات تیم"
diff --git a/frontend/translations/fr.po b/frontend/translations/fr.po
index 027773e28..c5cc3ab4d 100644
--- a/frontend/translations/fr.po
+++ b/frontend/translations/fr.po
@@ -242,7 +242,7 @@ msgstr "(copie)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Créer nouvelle équipe"
+msgstr "Créer nouvelle équipe"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -611,10 +611,6 @@ msgstr "Vos fichiers ont été déplacés avec succès"
msgid "dashboard.success-move-project"
msgstr "Votre projet a été déplacé avec succès"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Changer d’équipe"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Information de l’équipe"
diff --git a/frontend/translations/gl.po b/frontend/translations/gl.po
index b9b82d938..809c583c8 100644
--- a/frontend/translations/gl.po
+++ b/frontend/translations/gl.po
@@ -222,7 +222,7 @@ msgstr "(copia)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Crear novo equipo"
+msgstr "Crear novo equipo"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/he.po b/frontend/translations/he.po
index 2c44ca263..df4bd856b 100644
--- a/frontend/translations/he.po
+++ b/frontend/translations/he.po
@@ -587,10 +587,6 @@ msgstr "הקבצים שלך הועברו בהצלחה"
msgid "dashboard.success-move-project"
msgstr "המיזם שלך הועבר בהצלחה"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "לעבור צוות"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "פרטי הצוות"
diff --git a/frontend/translations/it.po b/frontend/translations/it.po
index 6c102f611..64556a6fa 100644
--- a/frontend/translations/it.po
+++ b/frontend/translations/it.po
@@ -236,7 +236,7 @@ msgstr "(copia)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Crea un nuovo team"
+msgstr "Crea un nuovo team"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -580,10 +580,6 @@ msgstr "I tuoi file sono stati spostati con successo"
msgid "dashboard.success-move-project"
msgstr "Il tuo progetto è stato spostato con successo"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Cambia team"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Informazioni sul team"
diff --git a/frontend/translations/jpn_JP.po b/frontend/translations/jpn_JP.po
index dcb68686d..03df38d92 100644
--- a/frontend/translations/jpn_JP.po
+++ b/frontend/translations/jpn_JP.po
@@ -462,10 +462,6 @@ msgstr "ファイルを移動しました"
msgid "dashboard.success-move-project"
msgstr "ファイルを削除しました"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "チーム切り替え"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "チーム情報"
diff --git a/frontend/translations/nb_NO.po b/frontend/translations/nb_NO.po
index 8d7b330e0..c54a6c6b2 100644
--- a/frontend/translations/nb_NO.po
+++ b/frontend/translations/nb_NO.po
@@ -170,10 +170,6 @@ msgstr "Velg drakt"
msgid "dashboard.show-all-files"
msgstr "Vis alle filer"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Bytt lag"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Laginfo"
diff --git a/frontend/translations/pl.po b/frontend/translations/pl.po
index ca185fab8..013cfd3da 100644
--- a/frontend/translations/pl.po
+++ b/frontend/translations/pl.po
@@ -555,10 +555,6 @@ msgstr "Twoje pliki został pomyślnie przeniesione"
msgid "dashboard.success-move-project"
msgstr "Twój projekt został pomyślnie przeniesiony"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Zmień zespół"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Informacje o zespole"
diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po
index 781aa4103..d238d3d3f 100644
--- a/frontend/translations/pt_BR.po
+++ b/frontend/translations/pt_BR.po
@@ -226,7 +226,7 @@ msgstr "(copiar)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Criar nova equipe"
+msgstr "Criar nova equipe"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -490,10 +490,6 @@ msgstr "Seus arquivos foram movidos com sucesso"
msgid "dashboard.success-move-project"
msgstr "Seu projeto foi movido com sucesso"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Trocar de equipe"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Informação da equipe"
diff --git a/frontend/translations/ro.po b/frontend/translations/ro.po
index a54247b96..c8b6884ef 100644
--- a/frontend/translations/ro.po
+++ b/frontend/translations/ro.po
@@ -178,7 +178,7 @@ msgstr "(copiază)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Creează o nouă echipă"
+msgstr "Creează o nouă echipă"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
@@ -364,10 +364,6 @@ msgstr "Fișerele au fost mutate cu succes"
msgid "dashboard.success-move-project"
msgstr "Proiectul a fost mutat cu succes"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Schimbă echipa"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Informațiile echipei"
diff --git a/frontend/translations/ru.po b/frontend/translations/ru.po
index dba575439..67c55fd03 100644
--- a/frontend/translations/ru.po
+++ b/frontend/translations/ru.po
@@ -502,10 +502,6 @@ msgstr "Ваши файлы перемещены"
msgid "dashboard.success-move-project"
msgstr "Ваш проект перемещён"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Сменить команду"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "О команде"
diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po
index 19f141331..189d0b619 100644
--- a/frontend/translations/tr.po
+++ b/frontend/translations/tr.po
@@ -602,10 +602,6 @@ msgstr "Dosyaların başarıyla taşındı"
msgid "dashboard.success-move-project"
msgstr "Projen başarıyla taşındı"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "Takım değiştir"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "Takım bilgisi"
diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po
index 75582b769..861cbb7e3 100644
--- a/frontend/translations/zh_CN.po
+++ b/frontend/translations/zh_CN.po
@@ -530,10 +530,6 @@ msgstr "成功移动了文件"
msgid "dashboard.success-move-project"
msgstr "成功移动了项目"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "切换团队"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "团队信息"
diff --git a/frontend/translations/zh_Hant.po b/frontend/translations/zh_Hant.po
index b6d2a8206..3521e4c46 100644
--- a/frontend/translations/zh_Hant.po
+++ b/frontend/translations/zh_Hant.po
@@ -440,10 +440,6 @@ msgstr "已成功移動您的檔案"
msgid "dashboard.success-move-project"
msgstr "已成功移動您的專案"
-#: src/app/main/ui/dashboard/sidebar.cljs
-msgid "dashboard.switch-team"
-msgstr "切換團隊"
-
#: src/app/main/ui/dashboard/team.cljs
msgid "dashboard.team-info"
msgstr "團隊資訊"
From 23d1087bc5837d28514186486e79c1d2db23e97f Mon Sep 17 00:00:00 2001
From: Elhombretecla <delacruzgarciajuan@gmail.com>
Date: Thu, 29 Sep 2022 12:11:09 +0200
Subject: [PATCH 4/4] :tada: Change pin icon
---
frontend/resources/images/icons/pin.svg | 5 +--
.../styles/main/partials/dashboard-grid.scss | 2 +-
.../main/partials/dashboard-sidebar.scss | 10 ++---
.../styles/main/partials/dashboard.scss | 6 ++-
.../src/app/main/ui/dashboard/libraries.cljs | 38 +++++++++----------
frontend/translations/ar.po | 2 +-
frontend/translations/da.po | 2 +-
frontend/translations/de.po | 2 +-
frontend/translations/el.po | 2 +-
frontend/translations/eu.po | 2 +-
frontend/translations/fa.po | 2 +-
frontend/translations/he.po | 2 +-
frontend/translations/id.po | 2 +-
frontend/translations/jpn_JP.po | 2 +-
frontend/translations/lt.po | 2 +-
frontend/translations/ml.po | 2 +-
frontend/translations/pl.po | 2 +-
frontend/translations/ru.po | 2 +-
frontend/translations/tr.po | 2 +-
frontend/translations/zh_CN.po | 2 +-
frontend/translations/zh_Hant.po | 2 +-
21 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/frontend/resources/images/icons/pin.svg b/frontend/resources/images/icons/pin.svg
index 0194c6401..46d71436a 100644
--- a/frontend/resources/images/icons/pin.svg
+++ b/frontend/resources/images/icons/pin.svg
@@ -1,4 +1,3 @@
-<svg width="12" xmlns="http://www.w3.org/2000/svg" height="12" x="767" viewBox="0 0 500 499.172" y="920.67">
- <path d="M325.318.012c-21.828-.283-42.138 15.34-48.74 35.798-15.498 31.788-36.62 62.656-67.738 80.85-46.02 26.248-99.73 35.59-152.188 35.65-11.824-.026-24.336 1.564-34 9.065-18.02 12.488-27.52 36.96-20.133 58.034 4.15 13.85 14.838 24.125 25.197 33.582l86.5 86.5C84.488 381.137 30.993 456.543 1.26 498.187c41.623-29.727 117.01-83.215 158.632-112.942 37.542 36.62 68.373 70.025 106.956 105.56 23.195 15.987 59.377 8.335 73.035-16.723 7.6-12.733 8.225-27.804 7.5-42.23 1.366-50.12 11.25-101.404 37.675-144.67 20.658-31.714 53.59-52.978 87.635-68.023 20.972-10.427 31.76-36.413 25.57-58.77-2.664-11.118-9.64-20.31-17.897-27.873-37.25-36.595-73.2-74.495-110.7-110.84-7.227-6.593-13.718-14.767-23.268-17.904-6.682-2.644-13.898-3.908-21.08-3.758zm-.26 36.837c45.35 46.82 90.704 93.64 136.056 140.46-40.437 18.15-79.907 42.182-106.303 78.613-30.216 43.44-43.98 96.178-48.765 148.346-1.852 21.542-2.097 43.256-1.726 64.933-91.546-91.52-183.09-183.044-274.634-274.564 60.078 2.462 121.696-4.117 176.98-28.967 38.773-15.762 70.437-46.032 91.712-81.66 9.637-15.522 17.813-31.905 25.36-48.525z" />
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500" viewBox="0 0 132.292 132.292">
+ <path d="M78.822.204l-3.3 3.3L56.69 22.335l2.698 9.296-17.315 17.316-18.998-12.4L0 59.624l32.865 32.865-31.33 31.33 6.598 6.599 31.33-31.33 33.001 33 23.076-23.075-12.128-18.726 17.316-17.315 9.432 2.834 22.132-22.13zm0 13.197l40.274 40.274-9.983 10.123-9.369-2.771-28.33 28.33 11.919 18.665-10.869 10.869-59.268-59.269 10.868-10.868 18.926 12.18 28.331-28.33-2.578-9.177z"/>
</svg>
-
diff --git a/frontend/resources/styles/main/partials/dashboard-grid.scss b/frontend/resources/styles/main/partials/dashboard-grid.scss
index 56f7d79e2..0b3e34417 100644
--- a/frontend/resources/styles/main/partials/dashboard-grid.scss
+++ b/frontend/resources/styles/main/partials/dashboard-grid.scss
@@ -121,7 +121,7 @@
span.date {
color: $color-gray-30;
- font-size: $fs14;
+ font-size: $fs13;
overflow: hidden;
text-overflow: ellipsis;
width: 100%;
diff --git a/frontend/resources/styles/main/partials/dashboard-sidebar.scss b/frontend/resources/styles/main/partials/dashboard-sidebar.scss
index 621c3e4ed..6f8265ede 100644
--- a/frontend/resources/styles/main/partials/dashboard-sidebar.scss
+++ b/frontend/resources/styles/main/partials/dashboard-sidebar.scss
@@ -38,7 +38,7 @@
top: 50px;
z-index: 12;
max-height: 30rem;
- min-width: 230px;
+ min-width: 234px;
overflow-y: auto;
}
@@ -88,8 +88,8 @@
display: flex;
height: 48px;
align-items: center;
-
- &.action {
+
+ &.action {
.team-icon {
border-radius: 50%;
background-color: $color-gray-10;
@@ -97,13 +97,13 @@
margin-right: 10px;
padding: 6px;
width: 24px;
-
+
svg {
height: 12px;
width: 12px;
}
}
-
+
&:hover {
.team-icon {
background-color: $color-primary;
diff --git a/frontend/resources/styles/main/partials/dashboard.scss b/frontend/resources/styles/main/partials/dashboard.scss
index 281026024..8fe5e2ebe 100644
--- a/frontend/resources/styles/main/partials/dashboard.scss
+++ b/frontend/resources/styles/main/partials/dashboard.scss
@@ -174,6 +174,10 @@
&.no-bg {
background-color: transparent;
}
+ &.dashboard-shared {
+ width: calc(100vw - 320px);
+ margin-right: 50px;
+ }
&.search {
margin-top: 10px;
@@ -250,7 +254,7 @@
line-height: 1rem;
font-weight: 400;
color: $color-gray-60;
- margin-left: .75rem;
+ margin-left: 0.75rem;
}
.project-actions {
diff --git a/frontend/src/app/main/ui/dashboard/libraries.cljs b/frontend/src/app/main/ui/dashboard/libraries.cljs
index be9df1fb8..4ccb6054b 100644
--- a/frontend/src/app/main/ui/dashboard/libraries.cljs
+++ b/frontend/src/app/main/ui/dashboard/libraries.cljs
@@ -29,10 +29,7 @@
width (mf/use-state nil)
rowref (mf/use-ref)
- itemsize (if (>= @width 1030)
- 280
- 230)
-
+ itemsize 330
ratio (if (some? @width) (/ @width itemsize) 0)
nitems (mth/floor ratio)
limit (min 10 nitems)
@@ -50,27 +47,26 @@
#(st/emit! (dd/fetch-shared-files)
(dd/clear-selected-files)))
- (mf/use-effect
- (fn []
- (let [node (mf/ref-val rowref)
- mnt? (volatile! true)
- sub (->> (wapi/observe-resize node)
- (rx/observe-on :af)
- (rx/subs (fn [entries]
- (let [row (first entries)
- row-rect (.-contentRect ^js row)
- row-width (.-width ^js row-rect)]
- (when @mnt?
- (reset! width row-width))))))]
- (fn []
- (vreset! mnt? false)
- (rx/dispose! sub)))))
+ (mf/with-effect
+ (let [node (mf/ref-val rowref)
+ mnt? (volatile! true)
+ sub (->> (wapi/observe-resize node)
+ (rx/observe-on :af)
+ (rx/subs (fn [entries]
+ (let [row (first entries)
+ row-rect (.-contentRect ^js row)
+ row-width (.-width ^js row-rect)]
+ (when @mnt?
+ (reset! width row-width))))))]
+ (fn []
+ (vreset! mnt? false)
+ (rx/dispose! sub))))
[:*
- [:header.dashboard-header
+ [:header.dashboard-header {:ref rowref}
[:div.dashboard-title
[:h1 (tr "dashboard.libraries-title")]]]
- [:section.dashboard-container.no-bg {:ref rowref}
+ [:section.dashboard-container.no-bg.dashboard-shared
[:& grid {:files files
:project default-project
:origin :libraries
diff --git a/frontend/translations/ar.po b/frontend/translations/ar.po
index ea33e4b84..05f2d297d 100644
--- a/frontend/translations/ar.po
+++ b/frontend/translations/ar.po
@@ -230,7 +230,7 @@ msgstr "(نسخة)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ إنشاء فريق جديد"
+msgstr "إنشاء فريق جديد"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/da.po b/frontend/translations/da.po
index 7626c10c3..606f02a56 100644
--- a/frontend/translations/da.po
+++ b/frontend/translations/da.po
@@ -175,7 +175,7 @@ msgstr "(kopi)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Opret nyt team"
+msgstr "Opret nyt team"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/de.po b/frontend/translations/de.po
index 6c41576c2..6f6fc3417 100644
--- a/frontend/translations/de.po
+++ b/frontend/translations/de.po
@@ -244,7 +244,7 @@ msgstr "(Kopie)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Neues Team erstellen"
+msgstr "Neues Team erstellen"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/el.po b/frontend/translations/el.po
index 072d6b829..d1181aec0 100644
--- a/frontend/translations/el.po
+++ b/frontend/translations/el.po
@@ -173,7 +173,7 @@ msgstr "(Αντίγραφο)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Δημιουργία νέας ομάδας"
+msgstr "Δημιουργία νέας ομάδας"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/eu.po b/frontend/translations/eu.po
index 9e067b9d5..a25fadc51 100644
--- a/frontend/translations/eu.po
+++ b/frontend/translations/eu.po
@@ -238,7 +238,7 @@ msgstr "(kopia)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Sortu talde berria"
+msgstr "Sortu talde berria"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/fa.po b/frontend/translations/fa.po
index 91f758c2e..51e0b0ccc 100644
--- a/frontend/translations/fa.po
+++ b/frontend/translations/fa.po
@@ -247,7 +247,7 @@ msgstr "(کپی)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ ایجاد تیم جدید"
+msgstr "ایجاد تیم جدید"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/he.po b/frontend/translations/he.po
index df4bd856b..abc3b7479 100644
--- a/frontend/translations/he.po
+++ b/frontend/translations/he.po
@@ -237,7 +237,7 @@ msgstr "(עותק)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ יצירת צוות חדש"
+msgstr "יצירת צוות חדש"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/id.po b/frontend/translations/id.po
index fe7193256..be39b9974 100644
--- a/frontend/translations/id.po
+++ b/frontend/translations/id.po
@@ -237,7 +237,7 @@ msgstr "(salin)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Buat tim baru"
+msgstr "Buat tim baru"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/jpn_JP.po b/frontend/translations/jpn_JP.po
index 03df38d92..4b4536e36 100644
--- a/frontend/translations/jpn_JP.po
+++ b/frontend/translations/jpn_JP.po
@@ -231,7 +231,7 @@ msgstr "(コピー)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ チームを新規作成"
+msgstr "チームを新規作成"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/lt.po b/frontend/translations/lt.po
index a41a1ad2a..4e941b99a 100644
--- a/frontend/translations/lt.po
+++ b/frontend/translations/lt.po
@@ -211,7 +211,7 @@ msgstr "(kopija)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Sukurti naują komandą"
+msgstr "Sukurti naują komandą"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/ml.po b/frontend/translations/ml.po
index 3990b0849..eba23c668 100644
--- a/frontend/translations/ml.po
+++ b/frontend/translations/ml.po
@@ -212,7 +212,7 @@ msgstr "(പകർത്തുക)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ പുതിയ സംഘം രൂപീകരിക്കുക"
+msgstr "പുതിയ സംഘം രൂപീകരിക്കുക"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/pl.po b/frontend/translations/pl.po
index 013cfd3da..f10241a78 100644
--- a/frontend/translations/pl.po
+++ b/frontend/translations/pl.po
@@ -209,7 +209,7 @@ msgstr "(skopiuj)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Utwórz nowy zespół"
+msgstr "Utwórz nowy zespół"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/ru.po b/frontend/translations/ru.po
index 67c55fd03..d424dfa11 100644
--- a/frontend/translations/ru.po
+++ b/frontend/translations/ru.po
@@ -206,7 +206,7 @@ msgstr "(копия)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Создать новую команду"
+msgstr "Создать новую команду"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po
index 189d0b619..118bfafb2 100644
--- a/frontend/translations/tr.po
+++ b/frontend/translations/tr.po
@@ -242,7 +242,7 @@ msgstr "(kopya)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ Yeni takım oluştur"
+msgstr "Yeni takım oluştur"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po
index 861cbb7e3..b24deeee1 100644
--- a/frontend/translations/zh_CN.po
+++ b/frontend/translations/zh_CN.po
@@ -206,7 +206,7 @@ msgstr "（拷贝）"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ 创建新团队"
+msgstr "创建新团队"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"
diff --git a/frontend/translations/zh_Hant.po b/frontend/translations/zh_Hant.po
index 3521e4c46..2257fc7b0 100644
--- a/frontend/translations/zh_Hant.po
+++ b/frontend/translations/zh_Hant.po
@@ -205,7 +205,7 @@ msgstr "(複製)"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.create-new-team"
-msgstr "+ 建立新團隊"
+msgstr "建立新團隊"
#: src/app/main/ui/dashboard/sidebar.cljs
msgid "dashboard.default-team-name"