Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: set variation to brand for preview controls #8758

Merged
merged 1 commit into from
Mar 30, 2023
Merged

fix: set variation to brand for preview controls #8758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/bugfix-preview-controls-colors
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Bugfix: Preview controls colors

We've fixed a bug where the controls of the "preview" app were appearing black-on-grey in the dark theme.

https://github.com/owncloud/web/pull/8758
23 changes: 16 additions & 7 deletions packages/web-app-preview/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@
v-oc-tooltip="previousDescription"
class="preview-controls-previous"
appearance="raw-inverse"
variation="brand"
:aria-label="previousDescription"
@click="prev"
>
<oc-icon size="large" name="arrow-drop-left" />
<oc-icon size="large" name="arrow-drop-left" variation="inherit" />
</oc-button>
<p v-if="!isFolderLoading" class="oc-m-rm preview-controls-action-count">
<span aria-hidden="true" v-text="ariaHiddenFileCount" />
Expand All @@ -91,10 +92,11 @@
v-oc-tooltip="nextDescription"
class="preview-controls-next"
appearance="raw-inverse"
variation="brand"
:aria-label="nextDescription"
@click="next"
>
<oc-icon size="large" name="arrow-drop-right" />
<oc-icon size="large" name="arrow-drop-right" variation="inherit" />
</oc-button>
<div class="oc-flex">
<oc-button
Expand All @@ -103,6 +105,7 @@
"
class="preview-controls-fullscreen"
appearance="raw-inverse"
variation="brand"
:aria-label="
isFullScreenModeActivated ? exitFullScreenDescription : enterFullScreenDescription
"
Expand All @@ -111,6 +114,7 @@
<oc-icon
fill-type="line"
:name="isFullScreenModeActivated ? 'fullscreen-exit' : 'fullscreen'"
variation="inherit"
/>
</oc-button>
</div>
Expand All @@ -120,15 +124,17 @@
v-oc-tooltip="imageShrinkDescription"
class="preview-controls-image-shrink"
appearance="raw-inverse"
variation="brand"
:aria-label="imageShrinkDescription"
@click="imageShrink"
>
<oc-icon fill-type="line" name="checkbox-indeterminate" />
<oc-icon fill-type="line" name="checkbox-indeterminate" variation="inherit" />
</oc-button>
<oc-button
v-oc-tooltip="imageOriginalSizeDescription"
class="preview-controls-image-original-size oc-ml-s oc-mr-s"
appearance="raw-inverse"
variation="brand"
:aria-label="imageOriginalSizeDescription"
@click="currentImageZoom = 1"
>
Expand All @@ -138,30 +144,33 @@
v-oc-tooltip="imageZoomDescription"
class="preview-controls-image-zoom"
appearance="raw-inverse"
variation="brand"
:aria-label="imageZoomDescription"
@click="imageZoom"
>
<oc-icon fill-type="line" name="add-box" />
<oc-icon fill-type="line" name="add-box" variation="inherit" />
</oc-button>
</div>
<div class="oc-ml-m">
<oc-button
v-oc-tooltip="imageRotateLeftDescription"
class="preview-controls-rotate-left"
appearance="raw-inverse"
variation="brand"
:aria-label="imageRotateLeftDescription"
@click="imageRotateLeft"
>
<oc-icon fill-type="line" name="anticlockwise" />
<oc-icon fill-type="line" name="anticlockwise" variation="inherit" />
</oc-button>
<oc-button
v-oc-tooltip="imageRotateRightDescription"
class="preview-rotate-right"
appearance="raw-inverse"
variation="brand"
:aria-label="imageRotateRightDescription"
@click="imageRotateRight"
>
<oc-icon fill-type="line" name="clockwise" />
<oc-icon fill-type="line" name="clockwise" variation="inherit" />
</oc-button>
</div>
</div>
Expand Down Expand Up @@ -635,7 +644,7 @@ export default defineComponent({
}

.preview-controls-action-count {
color: var(--oc-color-swatch-passive-contrast);
color: var(--oc-color-swatch-brand-contrast);
}

.preview-controls-image-original-size {
Expand Down