Merge pull request #9 from Lissy93/new-themes

Adds new themes: Minimal, material and material dark
Lissy93 · Jun 2, 2021 · 1c1dd4f · 1c1dd4f
2 parents 484a625 + af57d8e
commit 1c1dd4f
Show file tree

Hide file tree

Showing 22 changed files with 608 additions and 148 deletions.
diff --git a/README.md b/README.md
@@ -105,6 +105,7 @@ All fields are optional, unless otherwise stated.
 **`section`**
 - `name` - String: (required) The title of that section
 - `items` - Item[]: (required) An array of items - _See **`item`** below_
+- `icon` - String: (optional) An single icon to be displayed next to the title _See **`icon`** below_
 - `displayData`: An object with the following fields (all optional)
   - `collapsed` - Boolean: If true, the section will  be collapsed initially (defaults to `false`) 
   - `color` - String: A custom accent color for the section, as a hex code or HTML color (e.g. `#fff`)

diff --git a/public/conf.yml b/public/conf.yml
@@ -13,6 +13,7 @@ appConfig:
   fontAwesomeKey: 0821c65656
 sections:
 - name: Getting Started
+  icon: far fa-star
   items:
   - title: Source
     description: Source code and documentation on GitHub

diff --git a/src/App.vue b/src/App.vue
@@ -82,6 +82,7 @@ export default {
 @import '@/styles/global-styles.scss';
 @import '@/styles/color-palette.scss';
 @import '@/styles/color-themes.scss';
+@import '@/styles/typography.scss';
 
 body {
   background: var(--background);

diff --git a/src/assets/fonts/PTMono-Regular.ttf b/src/assets/fonts/PTMono-Regular.ttf
diff --git a/src/assets/fonts/Raleway-Variable.ttf b/src/assets/fonts/Raleway-Variable.ttf
diff --git a/src/components/Configuration/ConfigContainer.vue b/src/components/Configuration/ConfigContainer.vue
@@ -192,9 +192,9 @@ a.config-button, button.config-button {
 
 div.code-container {
   background: var(--config-code-background);
-  #conf-yaml {
-    font-family: 'Inconsolata', sans-serif;
-    .hljs-attr {
+  #conf-yaml span {
+    font-family: var(--font-monospace), monospace !important;
+    &.hljs-attr {
       font-weight: bold !important;
     }
   }
@@ -252,7 +252,7 @@ a.hyperlink-wrapper {
   display: flex;
   flex-direction: column;
   padding-top: 2rem;
-  background: var(--background-darker);
+  background: var(--config-settings-background);
   height: calc(100% - 2rem);
   h2 {
     margin: 1rem auto;
@@ -271,6 +271,7 @@ a.hyperlink-wrapper {
   border-radius: var(--curve-factor);
   text-align: left;
   opacity: var(--dimming-factor);
+  color: var(--config-settings-color);
   background: var(--config-settings-background);
   p.sub-title {
     font-weight: bold;

diff --git a/src/components/Configuration/CustomCss.vue b/src/components/Configuration/CustomCss.vue
@@ -3,6 +3,7 @@
     <prism-editor class="my-editor" v-model="customCss" :highlight="highlighter" line-numbers />
     <button class="save-button" @click="save()">Save Changes</button>
     <p>Note, you will need to refresh the page for your changes to take effect</p>
+    <p>To remove all custom styles, delete the contents and hit Save Changes</p>
   </div>
 </template>
 
@@ -30,7 +31,7 @@ export default {
   },
   methods: {
     validate(css) {
-      return css.match(/((?:^\s*)([\w#.@*,:\-.:>,*\s]+)\s*{(?:[\s]*)((?:[A-Za-z\- \s]+[:]\s*['"0-9\w .,/()\-!%]+;?)*)*\s*}(?:\s*))/gmi);
+      return css === '' || css.match(/((?:^\s*)([\w#.@*,:\-.:>,*\s]+)\s*{(?:[\s]*)((?:[A-Za-z\- \s]+[:]\s*['"0-9\w .,/()\-!%]+;?)*)*\s*}(?:\s*))/gmi);
     },
     save() {
       let msg = '';
@@ -40,6 +41,7 @@ export default {
         localStorage.setItem(localStorageKeys.APP_CONFIG, JSON.stringify(appConfig));
         msg = 'Changes saved succesfully';
         this.inject(this.customCss);
+        if (this.customCss === '') setTimeout(() => { location.reload(); }, 1500); // eslint-disable-line no-restricted-globals
       } else {
         msg = 'Error - Invalid CSS';
       }

diff --git a/src/components/Configuration/EditSiteMeta.vue b/src/components/Configuration/EditSiteMeta.vue
@@ -89,7 +89,7 @@ export default {
   display: flex;
   flex-direction: column;
   padding: 1rem 0;
-  background: var(--background-darker);
+  background: var(--config-settings-background);
   height: calc(100% - 1rem);
   h2 {
     margin: 1rem auto;
@@ -117,6 +117,7 @@ div.form {
     min-width: 24rem;
     span {
       font-size: 1.2rem;
+      color: var(--config-settings-color);
     }
     input {
       color: var(--config-settings-color);

diff --git a/src/components/LinkItems/Collapsable.vue b/src/components/LinkItems/Collapsable.vue
@@ -11,6 +11,7 @@
         tabIndex="-1"
     >
     <label :for="`collapsible-${uniqueKey}`" class="lbl-toggle" tabindex="-1">
+      <Icon v-if="icon" :icon="icon" size="small" class="section-icon" />
       <h3>{{ title }}</h3>
     </label>
     <div class="collapsible-content">
@@ -24,18 +25,23 @@
 <script>
 
 import { localStorageKeys } from '@/utils/defaults';
+import Icon from '@/components/LinkItems/ItemIcon.vue';
 
 export default {
   name: 'CollapsableContainer',
   props: {
     uniqueKey: String,
     title: String,
+    icon: String,
     collapsed: Boolean,
     cols: Number,
     rows: Number,
     color: String,
     customStyles: String,
   },
+  components: {
+    Icon,
+  },
   data() {
     return {
       isOpen: !this.collapsed,
@@ -96,105 +102,104 @@ export default {
 @import '@/styles/media-queries.scss';
 
 .collapsable {
-    padding: var(--item-group-padding);
-    margin: 10px;
+  padding: var(--item-group-padding);
+  margin: 10px;
+  border-radius: var(--curve-factor);
+  background: var(--item-group-outer-background);
+  box-shadow: var(--item-group-shadow);
+  height: fit-content;
+  width: 100%;
+  width: stretch;
+
+  grid-row-start: span 1;
+  &.row-2 { grid-row-start: span 2; }
+  &.row-3 { grid-row-start: span 3; }
+  &.row-4 { grid-row-start: span 4; }
+
+  grid-column-start: span 1;
+  @include tablet-up {
+    &.col-2 { grid-column-start: span 2; }
+    &.col-3 { grid-column-start: span 2; }
+    &.col-4 { grid-column-start: span 2; }
+  }
+  @include laptop-up {
+    &.col-2 { grid-column-start: span 2; }
+    &.col-3 { grid-column-start: span 3; }
+    &.col-4 { grid-column-start: span 3; }
+  }
+  @include monitor-up {
+    &.col-2 { grid-column-start: span 2; }
+    &.col-3 { grid-column-start: span 3; }
+    &.col-4 { grid-column-start: span 4; }
+  }
+
+  .wrap-collabsible {
+    margin-bottom: 1.2rem 0;
+  }
+
+  input[type='checkbox'] {
+    display: none;
+  }
+
+  label.lbl-toggle {
+    outline: none;
+    display: block;
+    padding: 0.25rem;
+    cursor: pointer;
     border-radius: var(--curve-factor);
-    background: var(--item-group-outer-background);
-    box-shadow: var(--item-group-shadow);
-    height: fit-content;
-    width: 100%;
-    width: stretch;
-
-    grid-row-start: span 1;
-    &.row-2 { grid-row-start: span 2; }
-    &.row-3 { grid-row-start: span 3; }
-    &.row-4 { grid-row-start: span 4; }
-
-    grid-column-start: span 1;
-    @include tablet-up {
-      &.col-2 { grid-column-start: span 2; }
-      &.col-3 { grid-column-start: span 2; }
-      &.col-4 { grid-column-start: span 2; }
-    }
-    @include laptop-up {
-      &.col-2 { grid-column-start: span 2; }
-      &.col-3 { grid-column-start: span 3; }
-      &.col-4 { grid-column-start: span 3; }
-    }
-    @include monitor-up {
-      &.col-2 { grid-column-start: span 2; }
-      &.col-3 { grid-column-start: span 3; }
-      &.col-4 { grid-column-start: span 4; }
-    }
-
-    .wrap-collabsible {
-        margin-bottom: 1.2rem 0;
-    }
-
-    input[type='checkbox'] {
-        display: none;
-    }
-
-    label {
-        outline: none;
-    }
-
-    .lbl-toggle {
-        display: block;
-        padding: 0.25rem;
-        cursor: pointer;
-        border-radius: var(--curve-factor);
-        transition: all 0.25s ease-out;
-        text-align: left;
-        color: var(--item-group-heading-text-color); //var(--item-group-background);
-
-        h3 {
-            margin: 0;
-            padding: 0;
-            display: inline;
-        }
-    }
-
-    .lbl-toggle:hover {
-        color: var(--item-group-heading-text-color-hover);
-    }
-
-    .lbl-toggle::before {
-        content: ' ';
-        display: inline-block;
-        border-top: 5px solid transparent;
-        border-bottom: 5px solid transparent;
-        border-left: 5px solid currentColor;
-        vertical-align: middle;
-        margin-right: .7rem;
-        transform: translateY(-2px);
-
-        transition: transform .2s ease-out;
-    }
-
-    .toggle:checked + .lbl-toggle::before {
-        transform: rotate(90deg) translateX(-3px);
-    }
-
-    .collapsible-content {
-        max-height: 0px;
-        overflow: hidden;
-        transition: max-height .25s ease-in-out;
-        background: var(--item-group-background);
-        border-radius: 0 0 var(--curve-factor) var(--curve-factor);
-    }
-
-    .toggle:checked + .lbl-toggle + .collapsible-content {
-        max-height: 1000px;
+    transition: all 0.25s ease-out;
+    text-align: left;
+    color: var(--item-group-heading-text-color); //var(--item-group-background);
+    h3 {
+      margin: 0;
+      padding: 0;
+      display: inline;
     }
-
-    .toggle:checked + .lbl-toggle {
-        border-bottom-right-radius: 0;
-        border-bottom-left-radius: 0;
-    }
-
-    .collapsible-content .content-inner {
-        padding: 0.5rem;
+    .section-icon {
+      display: inline;
+      margin-right: 0.5rem;
     }
+  }
+
+  .lbl-toggle:hover {
+    color: var(--item-group-heading-text-color-hover);
+  }
+
+  .lbl-toggle::before {
+    content: ' ';
+    display: inline-block;
+    border-top: 5px solid transparent;
+    border-bottom: 5px solid transparent;
+    border-left: 5px solid currentColor;
+    vertical-align: middle;
+    margin-right: .7rem;
+    transform: translateY(-2px);
+    transition: transform .2s ease-out;
+  }
+
+  .toggle:checked + .lbl-toggle::before {
+    transform: rotate(90deg) translateX(-3px);
+  }
+
+  .collapsible-content {
+    max-height: 0px;
+    overflow: hidden;
+    transition: max-height .25s ease-in-out;
+    background: var(--item-group-background);
+    border-radius: 0 0 var(--curve-factor) var(--curve-factor);
+  }
+
+  .toggle:checked + .lbl-toggle + .collapsible-content {
+    max-height: 3000px;
+  }
+
+  .toggle:checked + .lbl-toggle {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  .collapsible-content .content-inner {
+    padding: 0.5rem;
+  }
 }
 </style>
diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue
@@ -4,17 +4,19 @@
       :target="target === 'newtab' ? '_blank' : ''"
       :class="`item ${!icon? 'short': ''} size-${itemSize}`"
       v-tooltip="getTooltipOptions()"
-      v-bind:style="customStyles"
       rel="noopener noreferrer" tabindex="0"
       :id="`link-${id}`"
+      :style="`--open-icon: ${getUnicodeOpeningIcon()}; ${customStyles}`"
     >
       <!-- Item Text -->
-      <div class="tile-title" :id="`tile-${id}`" >
+      <div :class="`tile-title  ${!icon? 'bounce': ''}`" :id="`tile-${id}`" >
         <span class="text">{{ title }}</span>
         <div class="overflow-dots">...</div>
+        <p class="description">{{ description }}</p>
       </div>
       <!-- Item Icon -->
-      <Icon :icon="icon" :url="url" :size="itemSize" :color="color" v-bind:style="customStyles" />
+      <Icon :icon="icon" :url="url" :size="itemSize" :color="color"
+        v-bind:style="customStyles" class="bounce" />
       <!-- Small icon, showing opening method on hover -->
       <ItemOpenMethodIcon class="opening-method-icon" :isSmall="!icon" :openingMethod="target"
         :position="itemSize === 'medium'? 'bottom right' : 'top right'"/>
@@ -89,6 +91,14 @@ export default {
         delay: { show: 600, hide: 200 },
       };
     },
+    getUnicodeOpeningIcon() {
+      switch (this.target) {
+        case 'newtab': return '"\\f360"';
+        case 'sametab': return '"\\f24d"';
+        case 'iframe': return '"\\f2d0"';
+        default: return '"\\f054"';
+      }
+    },
   },
   mounted() {
     this.manageTitleEllipse();
@@ -205,7 +215,7 @@ export default {
     }
     .tile-title {
       height: fit-content;
-      min-height: 1rem;
+      min-height: 1.2rem;
       span.text {
         text-align: left;
         padding-left: 10%;
@@ -228,6 +238,15 @@ export default {
   &.size-large {
     height: 100px;
   }
+
+  p.description {
+    display: none;
+  }
+  &:before {
+    display: none;
+    font-family: FontAwesome;
+    content: var(--open-icon, "\f054") !important;
+  }
 }
 
 </style>