Skip to content

Commit

Permalink
Merge pull request #4178 from nextcloud/enh/noid/use-primary-element
Browse files Browse the repository at this point in the history
Use the color-primary-element* variables
  • Loading branch information
szaimen authored May 15, 2023
2 parents c84e365 + a25f57f commit db452e7
Show file tree
Hide file tree
Showing 24 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion css/prosemirror.scss
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ div.ProseMirror {
--table-color-heading: var(--color-text-maxcontrast);
--table-color-heading-border: var(--color-border-dark);
--table-color-background: var(--color-main-background);
--table-color-background-hover: var(--color-primary-light);
--table-color-background-hover: var(--color-primary-element-light);
--table-border-radius: var(--border-radius);

table {
Expand Down
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/files-modal.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/files-modal.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/highlight/haml-js-js.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/highlight/haml-js-js.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/text-editors.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-editors.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ export default {
// relative position for the alignment of the menububble
.text-editor__main {
&.draggedOver {
background-color: var(--color-primary-light);
background-color: var(--color-primary-element-light);
}
.text-editor__content-wrapper {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Editor/TableOfContents.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default {
width: calc(100% - var(--padding-left));
a:hover {
color: var(--color-primary-hover);
color: var(--color-primary-element-hover);
}
&--1 {
Expand Down
10 changes: 5 additions & 5 deletions src/components/Menu/ActionEntry.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%text__is-active-item-btn {
opacity: 1;
background-color: var(--color-primary-light);
background-color: var(--color-primary-element-light);
border-radius: 50%;
.material-design-icon > svg {
fill: var(--color-primary);
fill: var(--color-primary-element);
}
}

Expand Down Expand Up @@ -37,7 +37,7 @@
&:active {
background-color: var(--color-background-dark);
&:not(:disabled) {
box-shadow: var(--color-primary);
box-shadow: var(--color-primary-element);
}
}

Expand All @@ -46,7 +46,7 @@
opacity: 1;
}
&:focus-visible {
box-shadow: var(--color-primary);
box-shadow: var(--color-primary-element);
}

&.is-active {
Expand All @@ -60,7 +60,7 @@

.entry-action.entry-action-item {
&.is-active {
background-color: var(--color-primary-light);
background-color: var(--color-primary-element-light);
border-radius: var(--border-radius-large);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/SavingIndicator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ export default defineComponent({
}

&.saving > span {
color: var(--color-primary);
color: var(--color-primary-element);
:deep(svg) {
fill: var(--color-primary);
fill: var(--color-primary-element);
}
}
&.error > span {
color: var(--color-error);
:deep(svg) {
fill: var(--color-primary);
fill: var(--color-primary-element);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Suggestion/Emoji/EmojiList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export default {
&:focus,
&:hover {
opacity: 1;
background-color: var(--color-primary-light);
background-color: var(--color-primary-element-light);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Suggestion/Mention/AutoCompleteResult.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ $autocomplete-padding: 10px;
.highlight & {
color: var(--color-main-text);
background: var(--color-primary-light);
background: var(--color-primary-element-light);
&, * {
cursor: pointer;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Suggestion/SuggestionListWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default {
&:focus,
&:hover {
opacity: 1;
background-color: var(--color-primary-light);
background-color: var(--color-primary-element-light);
}
}
}
Expand Down

0 comments on commit db452e7

Please sign in to comment.