mirror of
https://github.com/penpot/penpot.git
synced 2025-03-12 15:51:37 -05:00
Merge pull request #3920 from penpot/ladybenko-fix-ui-modal-shared-library
🐛 fix modal text color + remove lines in shared library modal
This commit is contained in:
commit
51b3556b45
8 changed files with 57 additions and 33 deletions
|
@ -106,9 +106,8 @@
|
||||||
(:typography-count summary))]
|
(:typography-count summary))]
|
||||||
(modal/show
|
(modal/show
|
||||||
{:type :confirm
|
{:type :confirm
|
||||||
:message ""
|
|
||||||
:title (tr "modals.add-shared-confirm.message" (:name summary))
|
:title (tr "modals.add-shared-confirm.message" (:name summary))
|
||||||
:hint (if (zero? count) (tr "modals.add-shared-confirm-empty.hint") (tr "modals.add-shared-confirm.hint"))
|
:message (if (zero? count) (tr "modals.add-shared-confirm-empty.hint") (tr "modals.add-shared-confirm.hint"))
|
||||||
:cancel-label (if (zero? count) (tr "labels.cancel") :omit)
|
:cancel-label (if (zero? count) (tr "labels.cancel") :omit)
|
||||||
:accept-label (tr "modals.add-shared-confirm.accept")
|
:accept-label (tr "modals.add-shared-confirm.accept")
|
||||||
:accept-style :primary
|
:accept-style :primary
|
||||||
|
|
|
@ -26,10 +26,7 @@
|
||||||
.modal-content {
|
.modal-content {
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg,
|
.modal-hint {
|
||||||
.modal-scd-msg,
|
|
||||||
.modal-hint,
|
|
||||||
.modal-subtitle {
|
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,3 +46,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-scd-msg,
|
||||||
|
.modal-subtitle,
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
|
@ -26,11 +26,6 @@
|
||||||
.modal-content {
|
.modal-content {
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg,
|
|
||||||
.modal-scd-msg,
|
|
||||||
.modal-subtitle {
|
|
||||||
@include titleTipography;
|
|
||||||
}
|
|
||||||
.component-list {
|
.component-list {
|
||||||
.modal-item-element {
|
.modal-item-element {
|
||||||
@include flexRow;
|
@include flexRow;
|
||||||
|
@ -68,3 +63,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-scd-msg,
|
||||||
|
.modal-subtitle,
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
|
@ -25,11 +25,6 @@
|
||||||
.modal-content {
|
.modal-content {
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg,
|
|
||||||
.modal-scd-msg,
|
|
||||||
.modal-subtitle {
|
|
||||||
@include titleTipography;
|
|
||||||
}
|
|
||||||
.export-option {
|
.export-option {
|
||||||
@extend .input-checkbox;
|
@extend .input-checkbox;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -68,6 +63,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-scd-msg,
|
||||||
|
.modal-subtitle,
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
.file-entry {
|
.file-entry {
|
||||||
.file-name {
|
.file-name {
|
||||||
@include flexRow;
|
@include flexRow;
|
||||||
|
|
13
frontend/src/app/main/ui/dashboard/import.scss
vendored
13
frontend/src/app/main/ui/dashboard/import.scss
vendored
|
@ -26,11 +26,6 @@
|
||||||
.modal-content {
|
.modal-content {
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg,
|
|
||||||
.modal-scd-msg,
|
|
||||||
.modal-subtitle {
|
|
||||||
@include titleTipography;
|
|
||||||
}
|
|
||||||
.feedback-banner {
|
.feedback-banner {
|
||||||
@include flexRow;
|
@include flexRow;
|
||||||
height: $s-32;
|
height: $s-32;
|
||||||
|
@ -79,6 +74,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-scd-msg,
|
||||||
|
.modal-subtitle,
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
.file-entry {
|
.file-entry {
|
||||||
.file-name {
|
.file-name {
|
||||||
@include flexRow;
|
@include flexRow;
|
||||||
|
|
|
@ -26,11 +26,6 @@
|
||||||
.modal-content {
|
.modal-content {
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg,
|
|
||||||
.modal-scd-msg,
|
|
||||||
.modal-subtitle {
|
|
||||||
@include titleTipography;
|
|
||||||
}
|
|
||||||
.modal-hint {
|
.modal-hint {
|
||||||
@extend .modal-hint-base;
|
@extend .modal-hint-base;
|
||||||
}
|
}
|
||||||
|
@ -57,3 +52,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-scd-msg,
|
||||||
|
.modal-subtitle,
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
|
@ -89,10 +89,7 @@
|
||||||
.no-selection {
|
.no-selection {
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg,
|
.modal-hint {
|
||||||
.modal-scd-msg,
|
|
||||||
.modal-hint,
|
|
||||||
.modal-subtitle {
|
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
color: var(--modal-text-foreground-color);
|
color: var(--modal-text-foreground-color);
|
||||||
}
|
}
|
||||||
|
@ -223,3 +220,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-scd-msg,
|
||||||
|
.modal-subtitle,
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
|
@ -28,9 +28,6 @@
|
||||||
gap: $s-24;
|
gap: $s-24;
|
||||||
@include titleTipography;
|
@include titleTipography;
|
||||||
margin-bottom: $s-24;
|
margin-bottom: $s-24;
|
||||||
.modal-msg {
|
|
||||||
@include titleTipography;
|
|
||||||
}
|
|
||||||
.input-wrapper {
|
.input-wrapper {
|
||||||
@extend .input-with-label;
|
@extend .input-with-label;
|
||||||
label {
|
label {
|
||||||
|
@ -40,3 +37,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal-msg {
|
||||||
|
@include titleTipography;
|
||||||
|
color: var(--modal-text-foreground-color);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue