Skip to content

Commit 5cf72ca

Browse files
committed
fixed bug not allowing decrementing layers in component display right-click modal; fixed styling on delete button hover in routes tab
1 parent ce77dc4 commit 5cf72ca

File tree

5 files changed

+39
-16
lines changed

5 files changed

+39
-16
lines changed

src/components/dashboard_items/RouteDisplay.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Includes functionality to:
1919
class="input-add"
2020
@click="resetActiveComponent"
2121
reactive-rules
22-
:rules="[val => !Object.keys(this.componentMap).includes(val) || 'A component with this name already exists' ]"
22+
:rules="[val => !Object.keys(this.componentMap).includes(val) || 'A component/route with this name already exists' ]"
2323
>
2424
<template v-slot:append>
2525
<q-btn

src/components/dashboard_items/Routes.vue

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@ Description:
1313
@click="selectRoute(route)"
1414
>
1515
<q-list bordered separator class="list-item">
16-
<q-item clickable v-ripple :class="route === activeRoute ? 'panel-block is-active list-item' : 'panel-block list-item'">
17-
<q-item-section>{{route}}</q-item-section>
18-
<span v-if="route !== 'HomeView'">
19-
<q-btn round flat icon="highlight_off" v-on:click.stop="deleteSelectedRoute(route)" />
20-
</span>
16+
<q-item clickable dense v-ripple :class="route === activeRoute ? 'panel-block is-active list-item' : 'panel-block list-item'">
17+
<q-item-section>
18+
<div class="block-container">
19+
<div class="block-info">
20+
{{route}}
21+
</div>
22+
<span v-if="route !== 'HomeView'">
23+
<q-btn round flat icon="highlight_off" v-on:click.stop="deleteSelectedRoute(route)" />
24+
</span>
25+
</div>
26+
</q-item-section>
2127
</q-item>
2228
</q-list>
2329
</a>
@@ -47,9 +53,11 @@ export default {
4753
</script>
4854

4955
<style lang="scss" scoped>
56+
5057
.panel-block {
5158
background: $secondary !important;
52-
color: $menutext !important;;
59+
color: $menutext !important;
60+
min-height: 45px;
5361
}
5462
.is-active {
5563
background: $secondary !important;

src/components/file_system_interface/ExportProject.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -522,11 +522,8 @@ export default {
522522
};
523523
</script>
524524
525-
<style>
526-
.nav-btn {
527-
min-height: 30px !important;
528-
text-transform: capitalize;
529-
}
525+
<style scoped>
526+
530527
.center{
531528
display:inline-block;
532529
text-align: center;

src/components/home_sidebar_items/ComponentTab/UploadImage.vue

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Description:
77
<template>
88
<div id="uploadImgMenuItem">
99
<q-list>
10-
<q-expansion-item expand-separator :label="this.activeRoute">
10+
<q-expansion-item expand-separator :label="this.mockupUploadLabel">
1111
<div class="upload">
1212
<q-btn
1313
class="upload-btn"
@@ -55,6 +55,7 @@ export default {
5555
return {
5656
files: [],
5757
source: "",
58+
mockupUploadLabel: `Upload mockup image for ${this.$store.state.activeRoute}`,
5859
};
5960
},
6061
computed: {
@@ -114,6 +115,7 @@ export default {
114115
watch: {
115116
// once you change your active route, the mockup image should change as well
116117
activeRoute: function () {
118+
this.mockupUploadLabel = `Upload mockup image for ${this.activeRoute}`
117119
if (this.imagePath[this.activeRoute]) {
118120
// if there is a uploaded image
119121
this.source = "file:///" + this.imagePath[this.activeRoute];
@@ -126,6 +128,7 @@ export default {
126128
</script>
127129

128130
<style lang="scss">
131+
129132
#uploadImgMenuItem {
130133
display: flex;
131134
flex-direction: column;
@@ -141,12 +144,15 @@ export default {
141144
.upload-btn {
142145
text-transform: capitalize;
143146
font-size: 12px;
147+
width: 150px;
148+
height: auto;
149+
min-height: 42px;
144150
}
145151
146152
.upload {
147-
margin: 0.5rem;
153+
margin: 1rem;
148154
display: flex;
149-
justify-content: space-evenly;
155+
justify-content: space-around;
150156
}
151157
152158
.file-path {

src/css/app.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@ main {
2525
}
2626
.q-btn {
2727
align-items: center;
28-
height: 20px;
28+
}
29+
30+
.nav-btn {
31+
min-height: 30px !important;
2932
width: 65px;
33+
text-transform: capitalize;
3034
}
35+
3136
.q-item {
3237
background: $subsecondary;
3338
}
@@ -38,6 +43,13 @@ main {
3843
color: $menutext;
3944
}
4045

46+
.block-container {
47+
display: flex;
48+
flex-direction: row;
49+
justify-content: space-between;
50+
align-items: center;
51+
}
52+
4153
.q-field--outlined .q-field__control {
4254
padding: 0 0 0 12px;
4355
}

0 commit comments

Comments
 (0)