github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 23:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:directus/next into main

Browse Source
This commit is contained in:
rijkvanzanten
2020-08-12 14:53:47 -04:00
parent 56da8670d5 a36d2a86e4
commit ae593ddbc5
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/components/v-input/v-input.vue
View File

@@ -232,6 +232,7 @@ body {
.v-input {
--arrow-color: var(--border-normal);
--v-icon-color: var(--foreground-subdued);
--v-input-border-color-focus: var(--primary);
display: flex;
align-items: center;
@@ -302,7 +303,7 @@ body {
color: var(--foreground-normal);
background-color: var(--background-page);
border-color: var(--primary);
border-color: var(--v-input-border-color-focus);
}
&.disabled {

22
app/src/views/public/public-view.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="public-view">
<div class="public-view" :class="{ branded : isBranded }">
<div class="container" :class="{ wide }">
<div class="title-box">
<div
@@ -46,6 +46,10 @@ export default defineComponent({
setup() {
const settingsStore = useSettingsStore();
const isBranded = computed(() => {
return (settingsStore.state.settings?.project_color) ? true : false;
});
const backgroundStyles = computed<string>(() => {
const defaultColor = '#263238';
@@ -73,7 +77,7 @@ export default defineComponent({
return getRootPath() + `assets/${settingsStore.state.settings.project_logo}`;
});
return { version, artStyles, marked, settings: settingsStore.state.settings, foregroundURL, logoURL };
return { version, artStyles, marked, settings: settingsStore.state.settings, foregroundURL, logoURL, isBranded };
},
});
</script>
@@ -87,6 +91,20 @@ export default defineComponent({
height: 100%;
color: #263238;
&.branded {
::v-deep {
.v-button {
--v-button-background-color: var(--foreground-normal);
--v-button-background-color-hover: var(--foreground-normal);
--v-button-background-color-activated: var(--foreground-normal);
}
.v-input {
--v-input-border-color-focus: var(--foreground-normal);
}
}
}
.container {
display: flex;
flex-direction: column;