Skip to content

Commit

Permalink
Get rid of some color variables
Browse files Browse the repository at this point in the history
--text-color-lighten-15-percent
--link-color-lighten-10-percent
--chat-head-color-lighten-50-percent
  • Loading branch information
jcbrand committed Aug 1, 2024
1 parent af28a95 commit 5017efb
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/plugins/chatview/styles/chat-head.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

.chat-head__desc {
color: var(--chat-head-color-lighten-50-percent);
color: var(--chat-head-color);
font-size: var(--font-size-small);
margin: 0;
overflow: hidden;
Expand Down
5 changes: 2 additions & 3 deletions src/shared/chat/message-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,9 @@ class MessageActions extends CustomElement {
<button class="dropdown-item chat-msg__action ${o.button_class}" @click=${o.handler}>
<converse-icon
class="${o.icon_class}"
color="var(--text-color-lighten-15-percent)"
color="var(--inverse-link-color)"
size="1em"
></converse-icon>
${o.i18n_text}
></converse-icon>&nbsp;${o.i18n_text}
</button>
`;
}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/chat/styles/message-actions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ converse-message-actions {
min-width: 5rem;
}
i {
color: var(--text-color-lighten-15-percent);
color: var(--inverse-link-color);
font-size: 70%;
}
button {
border: none;
background: transparent;
color: var(--text-color-lighten-15-percent);
color: var(--inverse-link-color);
padding: 0 0.25em;
}
.btn--standalone {
Expand Down
10 changes: 4 additions & 6 deletions src/shared/modals/templates/user-details.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ const remove_button = (el) => {
<button type="button" @click="${ev => el.removeContact(ev)}" class="btn btn-danger remove-contact">
<converse-icon
class="fas fa-trash-alt"
color="var(--text-color-lighten-15-percent)"
color="var(--inverse-link-color)"
size="1em"
></converse-icon>
${i18n_remove_contact}
></converse-icon>&nbsp;${i18n_remove_contact}
</button>
`;
}
Expand All @@ -28,10 +27,9 @@ export const tplFooter = (el) => {
<button type="button" class="btn btn-info refresh-contact" @click=${ev => el.refreshContact(ev)}>
<converse-icon
class="fa fa-refresh"
color="var(--text-color-lighten-15-percent)"
color="var(--inverse-link-color)"
size="1em"
></converse-icon>
${i18n_refresh}</button>
></converse-icon>&nbsp;${i18n_refresh}</button>
${ (allow_contact_removal && is_roster_contact) ? remove_button(el) : '' }
</div>
`;
Expand Down
2 changes: 1 addition & 1 deletion src/shared/styles/_core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@

.helptext {
font-size: var(--font-size-tiny);
color: var(--text-color-lighten-15-percent);
color: var(--comment);
}

.selected {
Expand Down
2 changes: 1 addition & 1 deletion src/shared/styles/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
font-size: 85%;
padding-top: 0.5em;
a {
color: var(--link-color-lighten-10-percent);
color: var(--link-color);
}
&.error {
color: var(--error-color);
Expand Down
2 changes: 1 addition & 1 deletion src/shared/styles/messages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
.chat-msg__time {
padding-left: 0.25em;
padding-right: 0.25em;
color: var(--text-color-lighten-15-percent);
color: var(--comment);
}
.fa-lock {
svg {
Expand Down
5 changes: 1 addition & 4 deletions src/shared/styles/themes/classic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

--dark-link-color: #206485; // $dark-blue
--inverse-link-color: var(--background);
--link-color-lighten-10-percent: #79a5ba; // lighten($light-blue, 10%)
--link-color: var(--light-blue);
--link-hover-color: #345566;

Expand All @@ -54,7 +53,6 @@
--text-shadow-color: #FAFAFA;
--text-color: var(--foreground);
--controlbox-text-color: var(--foreground);
--text-color-lighten-15-percent: #8c8c8c; // lighten(#666, 15%)
--message-author-color: var(--text-color);
--text-color-invert: var(--background);

Expand All @@ -72,11 +70,10 @@
--chat-textarea-disabled-bg-color: #EEE;
--chat-textarea-height: 60px;

--chat-correcting-color: var(--chat-head-color-lighten-50-percent);
--chat-correcting-color: var(--comment);
--chat-head-fg-color: var(--background);
--chat-head-color-dark: var(--dark-green);
--chat-head-color-darker: #0E763B;
--chat-head-color-lighten-50-percent: #e7f7ee; // lighten($green, 50%)
--chat-head-color: var(--green);
--chat-head-text-color: var(--background);
--chat-toolbar-btn-color: var(--green);
Expand Down
2 changes: 0 additions & 2 deletions src/shared/styles/themes/dracula.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
--chat-head-fg-color: var(--chat-color);
--chat-head-color-dark: var(--chat-color);
--chat-head-color-darker: var(--chat-color);
--chat-head-color-lighten-50-percent: var(--chat-color);
--chat-head-color: var(--background);
--chat-head-text-color: var(--chat-color);
--chat-toolbar-btn-color: var(--chat-color);
Expand Down Expand Up @@ -141,7 +140,6 @@
--controlbox-text-color: var(--foreground);
--message-text-color: var(--foreground);
--text-color: var(--foreground);
--text-color-lighten-15-percent: var(--pink);
--text-color-invert: var(--background);

--message-author-color: var(--purple);
Expand Down

0 comments on commit 5017efb

Please sign in to comment.