aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNotkea2020-02-02 05:37:19 +0100
committerGitHub2020-02-02 05:37:19 +0100
commit95e4b72df24b0074a078cebdccc478f42537eff7 (patch)
treee044161bada71da698849be4be55c26b5949cb3c
parent56901340cb510ee9012bb4a122b95831258e9789 (diff)
parenta79b9ceb26f385b4e1806ab7f5c4bcaceeeccfd6 (diff)
downloadldgallery-95e4b72df24b0074a078cebdccc478f42537eff7.tar.gz
Merge pull request #79 from pacien/oz-viewer
Oz viewer - code review fixes
-rw-r--r--viewer/src/assets/scss/theme.scss2
-rw-r--r--viewer/src/components/LdBreadcrumb.vue4
-rw-r--r--viewer/src/components/LdCommand.vue8
-rw-r--r--viewer/src/plugins/fontawesome.ts4
-rw-r--r--viewer/src/tools.ts2
5 files changed, 11 insertions, 9 deletions
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index 1b474e8..f46b9f5 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -33,7 +33,7 @@ $loader-color: #272727;
33// Overrides - Buefy 33// Overrides - Buefy
34$link: $panel-top-txtcolor; 34$link: $panel-top-txtcolor;
35$link-hover: lightblue; 35$link-hover: lightblue;
36$disabled-color: rgba($link, 0.3); 36$disabled-color: #656589;
37$control-radius: 0; 37$control-radius: 0;
38$input-radius: 0; 38$input-radius: 0;
39$loading-background: $panel-top-bgcolor; 39$loading-background: $panel-top-bgcolor;
diff --git a/viewer/src/components/LdBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue
index 8c5b7eb..171e96a 100644
--- a/viewer/src/components/LdBreadcrumb.vue
+++ b/viewer/src/components/LdBreadcrumb.vue
@@ -42,8 +42,10 @@ export default class LdBreadcrumb extends Vue {
42</script> 42</script>
43 43
44<style lang="scss"> 44<style lang="scss">
45@import "@/assets/scss/theme.scss";
46
45.ld-breadcrumb { 47.ld-breadcrumb {
46 border-left: 2px solid rgba(white, 0.1); 48 border-left: 1px solid $disabled-color;
47 padding-left: 15px; 49 padding-left: 15px;
48 display: flex; 50 display: flex;
49 list-style: none; 51 list-style: none;
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index 07cb354..8c6ccfc 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -19,16 +19,16 @@
19 19
20<template> 20<template>
21 <div class="flex command-btns"> 21 <div class="flex command-btns">
22 <div class="link" title="$t('title.tags')" @click="$uiStore.toggleFullWidth()"> 22 <div class="link" :title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
23 <fa-icon :icon="commandTagsIcon()" size="lg" /> 23 <fa-icon :icon="commandTagsIcon()" size="lg" />
24 </div> 24 </div>
25 <router-link to="/" :class="{'disabled': isRoot()}" title="$t('title.home')"> 25 <router-link to="/" :class="{'disabled': isRoot()}" :title="$t('title.home')">
26 <fa-icon icon="home" size="lg" /> 26 <fa-icon icon="home" size="lg" />
27 </router-link> 27 </router-link>
28 <div class="link" title="$t('title.back')" @click="$router.go(-1)"> 28 <div class="link" :title="$t('title.back')" @click="$router.go(-1)">
29 <fa-icon icon="arrow-left" size="lg" /> 29 <fa-icon icon="arrow-left" size="lg" />
30 </div> 30 </div>
31 <router-link :class="{'disabled': isRoot()}" title="$t('title.parent')" :to="parent()"> 31 <router-link :class="{'disabled': isRoot()}" :title="$t('title.parent')" :to="parent()">
32 <fa-icon icon="folder" size="xs" /> 32 <fa-icon icon="folder" size="xs" />
33 <fa-icon icon="level-up-alt" size="lg" /> 33 <fa-icon icon="level-up-alt" size="lg" />
34 </router-link> 34 </router-link>
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index a15f4ce..d70746d 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -33,7 +33,7 @@ import {
33 faTags, 33 faTags,
34 faAngleRight, 34 faAngleRight,
35 faWindowClose, 35 faWindowClose,
36 faQuestionCircle, 36 faFile,
37} from "@fortawesome/free-solid-svg-icons"; 37} from "@fortawesome/free-solid-svg-icons";
38 38
39library.add( 39library.add(
@@ -48,7 +48,7 @@ library.add(
48 faTags, 48 faTags,
49 faAngleRight, 49 faAngleRight,
50 faWindowClose, 50 faWindowClose,
51 faQuestionCircle, 51 faFile,
52); 52);
53 53
54config.autoAddCss = false; 54config.autoAddCss = false;
diff --git a/viewer/src/tools.ts b/viewer/src/tools.ts
index 94fdf33..124e183 100644
--- a/viewer/src/tools.ts
+++ b/viewer/src/tools.ts
@@ -52,7 +52,7 @@ export default class Tools {
52 return "folder"; 52 return "folder";
53 case "other": 53 case "other":
54 default: 54 default:
55 return "question-circle"; 55 return "file";
56 } 56 }
57 } 57 }
58 58