Commit 7af0b0fd authored by Richard Blechinger's avatar Richard Blechinger
Browse files

Streamline colors

parent f29fdb6d
/* Note that any color adjustments here must also be reflected in tailwind.config.js and tailwind.css */
$primary: #252f3f;
$info: #5029c4;
$link-color: #5029c4;
/* Note that any color adjustments here must also be reflected in custom.css!! */
@tailwind components;
@tailwind utilities;
:root {
--primary: theme('colors.gray.800');
--info: theme('colors.aura.purple');
}
header a,
footer a {
color: theme('colors.gray.50');
}
header a:hover,
footer a:hover {
color: theme('colors.gray.400');
}
.fc-event {
padding: 1px 2px;
background-color: theme('colors.gray.800');
border-color: theme('colors.gray.900');
color: white;
}
.fc-bg {
}
.otherShow {
background-color: theme('colors.gray.300');
border-color: theme('colors.gray.400');
color: theme('colors.gray.900');
}
.otherShow:hover {
color: theme('colors.gray.900');
cursor: pointer;
}
a.currentShow {
background-color: theme('colors.aura.purple');
border-color: theme('colors.indigo.800');
color: white;
}
.conflict {
background-color: theme('colors.red.600');
border-color: theme('colors.red.800');
color: white;
}
.noconflict {
background-color: theme('colors.aura.purple');
border-color: theme('colors.indigo.800');
color: white;
}
.timeslot-discarded {
background-color: theme('colors.red.500');
opacity: 0.5;
text-decoration: line-through !important;
color: white;
}
.timeslot-accepted {
background-color: theme('colors.aura.purple');
border-color: theme('colors.indigo.800');
}
.timeslot-partly {
background-color: theme('colors.aura.purple');
border-color: theme('colors.indigo.800');
opacity: 0.5;
font-weight: bold;
}
......@@ -2650,7 +2650,6 @@
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
"dev": true,
"optional": true,
"requires": {
"normalize-path": "^3.0.0",
"picomatch": "^2.0.4"
......@@ -3133,8 +3132,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
"dev": true,
"optional": true
"dev": true
},
"bindings": {
"version": "1.5.0",
......@@ -3765,7 +3763,6 @@
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
"integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
"dev": true,
"optional": true,
"requires": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
......@@ -3782,7 +3779,6 @@
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"dev": true,
"optional": true,
"requires": {
"fill-range": "^7.0.1"
}
......@@ -3792,7 +3788,6 @@
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"dev": true,
"optional": true,
"requires": {
"to-regex-range": "^5.0.1"
}
......@@ -3801,15 +3796,13 @@
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"dev": true,
"optional": true
"dev": true
},
"to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"dev": true,
"optional": true,
"requires": {
"is-number": "^7.0.0"
}
......@@ -7842,7 +7835,6 @@
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
"dev": true,
"optional": true,
"requires": {
"binary-extensions": "^2.0.0"
}
......@@ -8309,6 +8301,12 @@
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true
},
"klona": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
"integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
"dev": true
},
"launch-editor": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz",
......@@ -10855,7 +10853,6 @@
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
"dev": true,
"optional": true,
"requires": {
"picomatch": "^2.2.1"
}
......@@ -11371,6 +11368,76 @@
"truncate-utf8-bytes": "^1.0.0"
}
},
"sass": {
"version": "1.30.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.30.0.tgz",
"integrity": "sha512-26EUhOXRLaUY7+mWuRFqGeGGNmhB1vblpTENO1Z7mAzzIZeVxZr9EZoaY1kyGLFWdSOZxRMAufiN2mkbO6dAlw==",
"dev": true,
"requires": {
"chokidar": ">=2.0.0 <4.0.0"
}
},
"sass-loader": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.0.tgz",
"integrity": "sha512-ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==",
"dev": true,
"requires": {
"klona": "^2.0.4",
"loader-utils": "^2.0.0",
"neo-async": "^2.6.2",
"schema-utils": "^3.0.0",
"semver": "^7.3.2"
},
"dependencies": {
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"lru-cache": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"dev": true,
"requires": {
"yallist": "^4.0.0"
}
},
"schema-utils": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
"integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.6",
"ajv": "^6.12.5",
"ajv-keywords": "^3.5.2"
}
},
"semver": {
"version": "7.3.4",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
"integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
}
},
"yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
}
}
},
"sax": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
......
@tailwind components;
@tailwind utilities;
a {
color: theme('colors.gray.800') !important;
}
header a,
footer a,
.dropdown-item.active {
color: theme('colors.gray.50') !important;
}
.dropdown-item {
color: theme('colors.gray.800') !important;
}
.fc-event.currentShow {
color: white !important;
}
......@@ -34,10 +34,6 @@
</template>
<script>
import 'bootstrap/dist/css/bootstrap.css'
import 'bootstrap-vue/dist/bootstrap-vue.css'
import {translationVm} from '@/plugins/translation'
import header from './components/Header.vue'
......@@ -132,7 +128,12 @@
}
</script>
<style>
<style lang="scss">
@import '../assets/custom.scss';
@import '~bootstrap/scss/bootstrap.scss';
@import '~bootstrap-vue/dist/bootstrap-vue.css';
html, body {
min-height: 100vh;
}
......@@ -140,12 +141,4 @@
#app {
color: #2e3436;
}
/*
#app .content-width {
margin: auto;
width: 920px;
max-width: 920px;
}
*/
</style>
......@@ -68,19 +68,19 @@
<template v-slot:cell(type)="data">
<b-badge
v-if="data.item.file"
variant="success"
variant="primary"
>
{{ $t('playlistEditor.types.file') }}
</b-badge>
<b-badge
v-else-if="data.item.uri.startsWith('line://')"
variant="info"
variant="primary"
>
{{ $t('playlistEditor.types.lineIn') }}
</b-badge>
<b-badge
v-else-if="data.item.uri.startsWith('http://') || data.item.uri.startsWith('https://')"
variant="light"
variant="primary"
>
{{ $t('playlistEditor.types.stream') }}
</b-badge>
......
......@@ -105,7 +105,7 @@
</template>
<div
v-else
v-else-if="loaded.shows && !selectedShow"
class="tw-text-center"
v-html="this.$t('noAssignedShows', { adminUrl })"
/>
......@@ -344,7 +344,7 @@
hash: data.projected[i].hash,
start: data.projected[i].start,
end: data.projected[i].end,
title: 'new',
title: this.$t('new'),
collisions: [],
solutionChoices: [],
className: 'noconflict',
......@@ -404,7 +404,7 @@
case 'theirs':
this.conflictSolutions[toResolve.hash] = mode
calendarSlot.className = 'timeslot-discarded'
calendarSlot.title = 'new'
calendarSlot.title = this.$t('new')
calendarSlot.start = originalSlot.start
calendarSlot.end = originalSlot.end
for (let theirs of toResolve.collisions) {
......@@ -416,7 +416,7 @@
case 'ours':
this.conflictSolutions[toResolve.hash] = mode
calendarSlot.className = 'timeslot-accepted'
calendarSlot.title = 'new'
calendarSlot.title = this.$t('new')
calendarSlot.start = originalSlot.start
calendarSlot.end = originalSlot.end
for (let theirs of toResolve.collisions) {
......@@ -550,9 +550,11 @@
this.calendarSlots = []
for (let i in this.timeslots) {
let highlighting = 'otherShow'
if (this.timeslots[i].show === this.selectedShow.id) {
highlighting = 'currentShow'
}
this.calendarSlots.push({
id: this.timeslots[i].id,
start: this.timeslots[i].start,
......@@ -581,35 +583,5 @@
</script>
<style>
.otherShow {
background-color: #eee;
}
a.currentShow {
background-color: #17a2b8;
}
.conflict {
background-color: #b00;
}
.noconflict {
background-color: #17a2b8;
}
.timeslot-discarded {
background-color: #b00;
opacity: 0.5;
text-decoration: line-through !important;
}
.timeslot-accepted {
background-color: #17a2b8;
}
.timeslot-partly {
background-color: #17a2b8;
opacity: 0.5;
font-weight: bold;
}
</style>
......@@ -24,7 +24,7 @@
</template>
<div
v-else
v-else-if="loaded.shows && !selectedShow"
class="tw-text-center"
v-html="this.$t('noAssignedShows', { adminUrl })"
/>
......
......@@ -29,7 +29,7 @@
</template>
<div
v-else
v-else-if="loaded.shows && !selectedShow"
class="tw-text-center"
v-html="this.$t('noAssignedShows', { adminUrl })"
/>
......
......@@ -49,8 +49,4 @@ npm
width: 100%;
margin-top: auto;
}
a {
color: #cc149e;
}
</style>
......@@ -102,12 +102,6 @@
</script>
<style scoped>
.header-title a {
text-decoration: none;
color: #c09;
text-shadow: #fff 0 0 2px;
}
.help-image {
width: 24px;
height: 24px;
......
......@@ -47,7 +47,7 @@
<b-dropdown
id="ddshows"
:text="$t('showSelector.selectShow')"
variant="info"
variant="primary"
>
<b-dropdown-item
v-for="(show, index) in shows"
......@@ -62,7 +62,7 @@
<b-button
v-if="isSuperuser"
v-b-popover.hover.top="$t('showCreator.title')"
variant="info"
variant="primary"
@click="$refs.addShowModal.openModal()"
>
+
......
......@@ -209,7 +209,7 @@
<b-progress
:value="deletion.count"
:max="deletion.amount"
variant="info"
variant="primary"
animated
/>
</div>
......
......@@ -31,7 +31,7 @@
<div class="tw-flex tw-flex-col tw-space-y-2">
<b-button
v-if="toResolve.solutionChoices.indexOf('ours') >= 0"
variant="danger"
variant="success"
size="sm"
@click="resolve('ours')"
>
......@@ -40,7 +40,7 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('theirs') >= 0"
variant="success"
variant="danger"
size="sm"
@click="resolve('theirs')"
>
......@@ -49,7 +49,6 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('theirs-start') >= 0"
variant="info"
size="sm"
@click="resolve('theirs-start')"
>
......@@ -58,7 +57,6 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('theirs-end') >= 0"
variant="info"
size="sm"
@click="resolve('theirs-end')"
>
......@@ -67,7 +65,6 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('theirs-both') >= 0"
variant="info"
size="sm"
@click="resolve('theirs-both')"
>
......@@ -76,7 +73,6 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('ours-start') >= 0"
variant="info"
size="sm"
@click="resolve('ours-start')"
>
......@@ -85,7 +81,6 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('ours-end') >= 0"
variant="info"
size="sm"
@click="resolve('ours-end')"
>
......@@ -94,7 +89,6 @@
<b-button
v-if="toResolve.solutionChoices.indexOf('ours-both') >= 0"
variant="info"
size="sm"
@click="resolve('ours-both')"
>
......
......@@ -148,7 +148,7 @@
</b-alert>
<b-button
v-b-modal.modal-add-file
variant="success"
variant="info"
>
{{ $t('fileManager.upload') }}
</b-button>
......@@ -164,7 +164,7 @@
>
<b-button
v-b-modal.modal-add-file
variant="success"
variant="info"
>
{{ $t('fileManager.upload') }}
</b-button>
......
......@@ -47,8 +47,8 @@
button() {
return {
files: this.mode === 'files' ? 'info' : 'outline-info',
playlists: this.mode === 'playlists' ? 'info' : 'outline-info',
files: this.mode === 'files' ? 'primary' : 'outline-primary',
playlists: this.mode === 'playlists' ? 'primary' : 'outline-primary',
}
},
......
......@@ -27,7 +27,7 @@
{{ $t('playlistManager.noPlaylistsAvailable') }}
</b-alert>
<b-button
variant="success"
variant="info"
to="/playlist/new"
>
{{ $t('playlistManager.create') }}
......@@ -40,7 +40,7 @@
style="padding-bottom: 1.5em;"
>
<b-button
variant="success"
variant="info"
to="/playlist/new"
>
{{ $t('playlistManager.create') }}
......
......@@ -4,7 +4,6 @@
<b-row v-if="isSuperuser">
<b-col lg="3">
<b-badge
variant="info"
class="tw-w-10/12 tw-mr-1"
>
{{ $t('showMeta.owners') }}:
......
......@@ -14,7 +14,7 @@
<b-col align="right">
<b-button
v-if="user.steeringUser.is_superuser"
variant="info"
variant="primary"
@click="$router.push({path: 'emissions', query: { show: selectedShow.slug }})"
>
{{ $t('showTimeslots.switchToEmissions') }}
......@@ -318,8 +318,6 @@
const startDate = new Date(item.startTimestamp);
const endDate = new Date(startDate.getTime() + minutesInMs)