Skip to content

Commit 278e648

Browse files
authored
🔀 Merge pull request gchq#179 from Lissy93/REFACTOR/quick-stuff
[REFACTOR] - Style improvments
2 parents 1974e25 + be7369f commit 278e648

8 files changed

Lines changed: 64 additions & 12 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
- 📏 Customizable layout, sizes, text, component visibility, behavior and colors etc
7070
- 🖼️ Option for full-screen background image, custom nav-bar links, html footer, title, and more
7171
- 🚀 Easy to setup with Docker, or on bare metal, or with 1-Click cloud deployment
72-
- 🤏 Small bundle size, fully responsive UI and PWA makes the app easy to use on any device
7372
- ⚙️ Easy single-file YAML-based configuration, with option to configure app directly through the UI
73+
- 🤏 Small bundle size, fully responsive UI and PWA makes the app easy to use on any device
7474
- ✨ Under active development with improvements and new features added regularly
7575
- 🆓 100% free and open source
7676
- 🔐 Strong focus on privacy
@@ -446,9 +446,9 @@ If you're having trouble getting things up and running, feel free to ask a quest
446446

447447
Found a bug, or something that isn't working as you'd expect? Please raise it as an issue so that it can be resolved. Feature requests are also welcome. Similarlty, feedback is very useful, as it helps me know what areas of Dashy need some improvement.
448448

449-
- [Raise a Bug 🐛](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%90%9B+Bug&template=bug-report---.md&title=%5BBUG%5D)
450-
- [Submit a Feature Request 🦄](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%A6%84+Feature+Request&template=feature-request---.md&title=%5BFEATURE_REQUEST%5D)
451-
- [Share Feedback 🌈](https://github.com/Lissy93/dashy/issues/new?assignees=&labels=%F0%9F%8C%88+Feedback&template=share-feedback---.md&title=%5BFEEDBACK%5D)
449+
- [Raise a Bug 🐛](https://github.com/Lissy93/dashy/issues/new?assignees=lissy93&labels=%F0%9F%90%9B+Bug&template=bug.yml&title=%5BBUG%5D+%3Ctitle%3E)
450+
- [Submit a Feature Request 🦄](https://github.com/Lissy93/dashy/issues/new?template=feature-request.yml)
451+
- [Share Feedback 🌈](https://github.com/Lissy93/dashy/issues/new?assignees=&labels=%F0%9F%8C%88+Feedback&template=share-feedback.md&title=%5BFEEDBACK%5D)
452452

453453
**Issue Status** [![Resolution Time](http://isitmaintained.com/badge/resolution/lissy93/dashy.svg) ![Open Issues](http://isitmaintained.com/badge/open/lissy93/dashy.svg) ![Closed Issues](https://badgen.net/github/closed-issues/lissy93/dashy)](https://isitmaintained.com/project/lissy93/dashy) [![GitHub Discussions](https://img.shields.io/github/discussions/lissy93/dashy)
454454
](https://github.com/Lissy93/dashy/discussions)

docs/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ All content is located either in the [`./README.md`](/README.md) or [`/docs/`](/
2525
## Raise a bug
2626
If you've found a bug, then please do raise it as an issue. This will help me know if there's something that needs fixing. Try and include as much detail as possible, such as your environment, steps to reproduce, any console output and maybe an example screenshot or recording if necessary.
2727

28-
[![Raise a Bug](https://img.shields.io/badge/Raise_a-Bug-%23dc2d76?style=for-the-badge&logo=dependabot)](https://github.com/Lissy93/dashy/issues/new?assignees=Lissy93&labels=%F0%9F%90%9B+Bug&template=bug-report---.md&title=%5BBUG%5D)
28+
[![Raise a Bug](https://img.shields.io/badge/Raise_a-Bug-%23dc2d76?style=for-the-badge&logo=dependabot)](https://github.com/Lissy93/dashy/issues/new?assignees=lissy93&labels=%F0%9F%90%9B+Bug&template=bug.yml&title=%5BBUG%5D+%3Ctitle%3E)
2929

3030
## Join the discussion
3131
I've enabled the discussion feature on GitHub, here you can share tips and tricks, useful information, or your dashboard. You can also ask questions, and offer basic support to other users.

docs/showcase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
## Submitting your Dashboard
7171

7272
#### How to Submit
73-
- [Open an Issue](https://git.io/Jceik)
73+
- [Open an Issue](https://git.io/JEtgM)
7474
- [Open a PR](https://github.com/Lissy93/dashy/compare)
7575

7676
#### What to Include

docs/showcase/readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
See: [Showcase](/docs/showcase.md).

docs/troubleshooting.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ Alternatively, as a workaround, you have several options:
5757

5858
In V 1.6.5 an update was made that in the future will become a breaking change. You will need to update you config to reflect this before V 2.0.0 is released. In the meantime, your previous config will continue to function normally, but you will see a validation warning. The change means that the structure of the `appConfig.auth` object is now an object, which has a `users` property.
5959

60+
For more info, see [this announcement](https://github.com/Lissy93/dashy/discussions/177).
61+
6062
You can fix this by replacing:
6163

6264
```yaml
@@ -68,11 +70,10 @@ auth:
6870
with
6971
7072
```yaml
71-
appConfig:
72-
auth:
73-
users:
74-
- user: xxx
75-
hash: xxx
73+
auth:
74+
users:
75+
- user: xxx
76+
hash: xxx
7677
```
7778
7879
---

src/components/Configuration/CustomCss.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ div.css-editor-outer {
7575
display: flex;
7676
flex-direction: column;
7777
78+
div.css-wrapper {
79+
display: flex;
80+
flex-direction: column;
81+
}
7882
h2.css-input-title {
7983
margin: 0.5rem 0 0.2rem;
8084
}

src/components/Workspace/SideBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<nav class="side-bar">
3-
<div v-for="(section, index) in sections" :key="index">
3+
<div v-for="(section, index) in sections" :key="index" class="side-bar-section">
44
<div @click="openSection(index)" class="side-bar-item-container">
55
<SideBarItem
66
class="item"

src/styles/color-themes.scss

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,12 +915,57 @@ html[data-theme="dashy-docs"] {
915915
@include make-colors(#dcff5a, #ceb73f);
916916
}
917917

918+
nav.side-bar {
919+
div div.side-bar-item-container div {
920+
padding: 0.15rem 0;
921+
color: var(--background);
922+
}
923+
924+
div.side-bar-section:nth-child(1n) {
925+
div.side-bar-item-container div.side-bar-item {
926+
@include make-colors(#db78fc, #b83ddd);
927+
}
928+
.sub-side-bar { background: #b83ddd80; }
929+
}
930+
div.side-bar-section:nth-child(2n) {
931+
div.side-bar-item-container div.side-bar-item {
932+
@include make-colors(#5c85f7, #3d48dd);
933+
}
934+
.sub-side-bar { background: #3d48dd80; }
935+
}
936+
div.side-bar-section:nth-child(3n) {
937+
div.side-bar-item-container div.side-bar-item {
938+
@include make-colors(#41ef90, #1e9554);
939+
}
940+
.sub-side-bar { background: #1e955480; }
941+
}
942+
div.side-bar-section:nth-child(4n) {
943+
div.side-bar-item-container div.side-bar-item {
944+
@include make-colors(#dcff5a, #ceb73f);
945+
}
946+
.sub-side-bar { background: #ceb73f80; }
947+
}
948+
}
949+
918950
// Section items
919951
div.collapsable:nth-child(1n) { .item-wrapper:hover { .item {box-shadow: 0 2px 3px #db78fc; .tile-title { color: #db78fc; } } } }
920952
div.collapsable:nth-child(2n) { .item-wrapper:hover { .item { box-shadow: 0 2px 3px #5c85f7; .tile-title { color: #5c85f7; } } } }
921953
div.collapsable:nth-child(3n) { .item-wrapper:hover { .item { box-shadow: 0 2px 3px #41ef90; .tile-title { color: #41ef90; } } } }
922954
div.collapsable:nth-child(4n) { .item-wrapper:hover { .item { box-shadow: 0 2px 3px #dcff5a; .tile-title { color: #dcff5a; } } } }
923955

956+
957+
div.config-buttons {
958+
.config-button {
959+
border: none;
960+
color: var(--background);
961+
font-weight: bold;
962+
svg path { fill: var(--background); }
963+
&:nth-child(1n) { @include make-colors(#db78fc, #b83ddd); }
964+
&:nth-child(2n) { @include make-colors(#41ef90, #1e9554); }
965+
&:nth-child(3n) { @include make-colors(#5c85f7, #3d48dd); }
966+
&:nth-child(4n) { @include make-colors(#dcff5a, #ceb73f); }
967+
}
968+
}
924969

925970
a.nav-item, a.nav-item:hover, a.nav-item.router-link-active {
926971
border: none;

0 commit comments

Comments
 (0)