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

Use the color-primary-element* variables #1794

Merged
merged 1 commit into from
May 15, 2023
+55 −55
Merged

Use the color-primary-element* variables #1794

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
4 changes: 2 additions & 2 deletions js/photos-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...extcloud_sharing_dist_index_js-node_modules_vue-material-design-icons_AccountGr-bcaf35.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...loud_sharing_dist_index_js-node_modules_vue-material-design-icons_AccountGr-bcaf35.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ue-material-design-icons_AlertCircle_vue-node_modules_vue-material-design-icons-ea65fb.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...aterial-design-icons_AlertCircle_vue-node_modules_vue-material-design-icons-ea65fb.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-4e283b.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-c67b29.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-c67b29.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_components_Collection_CollectionContent_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_components_Collection_CollectionContent_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...rtControllerMixin_js-node_modules_vue-material-design-icons_FolderMultipleImage-67cc20.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ntrollerMixin_js-node_modules_vue-material-design-icons_FolderMultipleImage-67cc20.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_AlbumContent_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_AlbumContent_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_Places_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_Places_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_SharedAlbums_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_SharedAlbums_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_Tags_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_Tags_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/photos-src_views_Timeline_vue.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-src_views_Timeline_vue.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/components/Albums/AlbumPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ export default {
border-radius: var(--border-radius);

&--placeholder {
background: var(--color-primary-light);
background: var(--color-primary-element-light);

:deep .material-design-icon {
width: 100%;
height: 100%;

.material-design-icon__svg {
fill: var(--color-primary);
fill: var(--color-primary-element);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Collection/CollectionCover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ export default {
}

&--placeholder {
background: var(--color-primary-light);
background: var(--color-primary-element-light);

:deep .material-design-icon {
width: 100%;
height: 100%;

.material-design-icon__svg {
fill: var(--color-primary);
fill: var(--color-primary-element);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/File.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export default {

<style lang="scss" scoped>
.file-container {
background: var(--color-primary-light);
background: var(--color-primary-element-light);
position: relative;
height: 100%;
width: 100%;
Expand All @@ -239,7 +239,7 @@ export default {
width: 100%;
height: 100%;
content: '';
outline: var(--color-primary) solid 4px;
outline: var(--color-primary-element) solid 4px;
outline-offset: -4px;
pointer-events: none;
}
Expand Down Expand Up @@ -337,7 +337,7 @@ export default {
// Add a background to the checkbox so we do not see the image through it.
&::after {
content: '';
background: var(--color-primary-light);
background: var(--color-primary-element-light);
width: 16px;
height: 16px;
position: absolute;
Expand Down Expand Up @@ -368,7 +368,7 @@ export default {
fill: #FC0;

path {
stroke: var(--color-primary-light);
stroke: var(--color-primary-element-light);
stroke-width: 1px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/FilesListViewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export default {
position: relative;

&__placeholder {
background: var(--color-primary-light);
background: var(--color-primary-element-light);
width: 100%;
height: 100%;
border: 2px solid var(--color-main-background); // Use border so create a separation between images.
Expand Down
4 changes: 2 additions & 2 deletions src/components/FilesPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export default {
}

&--placeholder {
background: var(--color-primary-light);
background: var(--color-primary-element-light);
border-radius: var(--border-radius-large);
}

Expand Down Expand Up @@ -239,7 +239,7 @@ export default {
height: 100%;

&--placeholder {
background: var(--color-primary-light);
background: var(--color-primary-element-light);
border-radius: var(--border-radius-large);
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/TagCover.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ export default {
}

&--placeholder {
background: var(--color-primary-light);
background: var(--color-primary-element-light);

:deep .material-design-icon {
width: 100%;
height: 100%;

.material-design-icon__svg {
fill: var(--color-primary);
fill: var(--color-primary-element);
}
}
}
Expand Down