Skip to content

Commit 08e8065

Browse files
committed
additional styling updates and form validation
Co-Authored by Aram Paparian <[email protected]>
1 parent 54d6ad3 commit 08e8065

20 files changed

+103
-103
lines changed

src/components/ComponentDisplay.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ Description:
3939
<q-menu context-menu>
4040
<q-list color="black" class="menu">
4141
<q-item clickable v-ripple v-close-popup @click="handleExportComponent">
42-
<q-item-section style="color: white"
42+
<q-item-section style="color: menutext"
4343
>Export Component</q-item-section
4444
>
4545
<q-item-section avatar>
4646
<q-icon color="primary" name="upload" />
4747
</q-item-section>
4848
</q-item>
4949
<q-item clickable v-ripple v-close-popup @click="handleAddChild">
50-
<q-item-section style="color: white"
50+
<q-item-section style="color: menutext"
5151
>Update Children</q-item-section
5252
>
5353
<q-item-section avatar>
5454
<q-icon color="primary" name="add" />
5555
</q-item-section>
5656
</q-item>
5757
<q-item clickable v-ripple v-close-popup>
58-
<q-item-section class="layer" style="color: white"
58+
<q-item-section class="layer" style="color: menutext"
5959
>Layer</q-item-section
6060
>
6161
<q-btn
@@ -65,7 +65,7 @@ Description:
6565
label="-"
6666
@click="(e) => handleLayer(e)"
6767
/>
68-
<p id="counter" style="color: white">{{ componentData.z }}</p>
68+
<p id="counter" style="color: menutext">{{ componentData.z }}</p>
6969
<q-btn
7070
class="btn"
7171
color="transparent"
@@ -403,7 +403,7 @@ export default {
403403
top: -18px;
404404
left: 2px;
405405
color: black;
406-
-webkit-text-stroke: 0.4px white;
406+
-webkit-text-stroke: 0.4px $menutext;
407407
font-weight: 800;
408408
line-height: 1.2;
409409
z-index: -1;
@@ -455,9 +455,9 @@ export default {
455455
margin-bottom: 0px !important;
456456
}
457457
.component-box {
458-
color: white;
459-
border: 1.2px dashed rgb(231, 203, 75);
460-
background-color: rgba(172, 83, 83, 0.42);
458+
color: $menutext;
459+
border: 1.2px dashed $darktext;
460+
background-color: rgba($darktext, .42);
461461
-webkit-transition: background-color 200ms linear;
462462
-ms-transition: background-color 200ms linear;
463463
transition: background-color 200ms linear;
@@ -477,7 +477,7 @@ export default {
477477
.btn:hover,
478478
.btn:focus,
479479
.btn:active {
480-
color: white;
480+
color: $menutext;
481481
background-color: transparent;
482482
}
483483
#counter {

src/components/dashboard_items/Dashboard.vue

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ Description:
1717
dense
1818
breakpoint="1050"
1919
>
20-
<q-tab
21-
name="detail"
22-
label="Component Details"
23-
id="label-text"
20+
<q-tab name="detail" label="Component Details" id="label-text"
2421
></q-tab>
2522
<q-tab name="tree" label="Project Tree" id="label-text"
2623
></q-tab>
@@ -146,18 +143,10 @@ i {
146143
padding: 5px;
147144
}
148145
149-
/* this class selector does not change anything */
150-
.q-tab__label {
151-
/* // font-size not changing */
152-
font-size: 10px !important;
153-
line-height: 1.718em;
154-
font-weight: 500;
155-
}
156-
157146
/* // changes the tab label styling */
158147
#label-text {
159148
font-size: 4px !important;
160-
text-transform: capitalize;
149+
text-transform: uppercase;
161150
}
162151
163152
.q-tab-panel {

src/components/dashboard_items/HTMLQueue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ li {
142142
min-width: 175px;
143143
width: 30%;
144144
border-radius: 0.5cm;
145-
border: 2px solid white;
145+
border: 2px solid $menutext;
146146
background-color: $secondary;
147147
height: 35px;
148148
padding-top: 6px;

src/components/dashboard_items/RouteDisplay.vue

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,30 @@ Includes functionality to:
55
-->
66

77
<template>
8-
<div>
8+
<div class="route-display">
99
<q-input
1010
@keyup.enter="handleEnterKeyPress"
11-
standout="bg-secondary text-white"
11+
color="menutext"
12+
dark
13+
outlined
1214
bottom-slots
1315
v-model="newRoute"
14-
label="Enter new route"
16+
label="Add new route"
1517
dense
18+
no-error-icon
1619
class="input-add"
1720
@click="resetActiveComponent"
18-
></q-input>
19-
21+
reactive-rules
22+
:rules="[val => !Object.keys(this.componentMap).includes(val) || 'A component with this name already exists' ]"
23+
>
24+
<template v-slot:append>
25+
<q-btn
26+
flat
27+
icon="add"
28+
@click="handleEnterKeyPress"
29+
/>
30+
</template>
31+
</q-input>
2032
<Routes></Routes>
2133
</div>
2234
</template>
@@ -65,13 +77,8 @@ export default {
6577

6678
<style scoped>
6779
.route-display {
68-
border: 1px solid rgba(208, 208, 208, 0.694);
6980
overflow: auto;
70-
height: 60%;
71-
padding: 0;
72-
margin: 1rem;
73-
padding: 0.5rem;
74-
border-radius: 5px;
81+
padding: 1rem;
7582
}
7683
7784
i:hover {

src/components/dashboard_items/Routes.vue

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Description:
55
-->
66

77
<template>
8-
<div class="home-sidebar">
8+
<div>
9+
<p>Click to view route</p>
910
<a
1011
:class="route === activeRoute ? 'panel-block is-active' : 'panel-block'"
1112
v-for="route in Object.keys(routes)"
@@ -47,9 +48,5 @@ export default {
4748
</script>
4849

4950
<style scoped>
50-
.route-view {
51-
margin: 1rem;
52-
display: flex;
53-
flex-direction: column;
54-
}
51+
5552
</style>

src/components/dashboard_items/Tree.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export default {
185185
padding: 8px;
186186
margin: 6px;
187187
min-height: 28px;
188-
color: #FFFFFF;
188+
color: $menutext;
189189
background-color: $secondary;
190190
text-align: center;
191191
line-height: 28px;
@@ -195,12 +195,12 @@ export default {
195195
.tree-node-active {
196196
background-color: $accent;
197197
color: $darktext;
198-
border: 2px solid white;
198+
border: 2px solid $menutext;
199199
}
200200
201201
.tree-node-activeRoute {
202-
background-color: #155158;
203-
border: 2px solid white;
202+
background-color: $darktext;
203+
border: 2px solid $menutext;
204204
}
205205
206206

src/components/dashboard_items/tutorial/AdvancedFunctions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<!--Typescript option, mock image?, nested HTML elements, import component/limitations -->
3-
Advanced Functions Here!
4-
<q-btn
3+
<p>Advanced Functions Here!</p>
4+
<q-btn
55
id="tut-btn"
66
color="secondary"
77
label="Get Started with OverVue"

src/components/home_sidebar_items/ComponentTab/AddProps.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<div>
33
<q-input
4-
@keyup.enter.native="createNewProp(textProps)"
5-
color="white"
4+
@keyup.enter="createNewProp(textProps)"
5+
color="menutext"
66
dark
77
outlined
88
bottom-slots
@@ -31,7 +31,7 @@
3131
:searchable="false"
3232
@search-change="stopDelete($event)"
3333
>
34-
<span slot="noResult">No props found.</span>
34+
<template v-slot:noResult>No props found.</template>
3535
</VueMultiselect>
3636
</div>
3737
<br />

src/components/home_sidebar_items/ComponentTab/CreateComponent.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ Description:
1818
v-on:keyup.delete.stop
1919
v-model="componentNameInputValue"
2020
label="Set component name *"
21-
color="white"
21+
color="menutext"
2222
dark
2323
dense
2424
outlined
2525
item-aligned
2626
padding="5px"
2727
class="input-add"
28+
no-error-icon
2829
reactive-rules
2930
:rules="[ val => val.length != 0 || 'Please set a component name', val => !Object.keys(this.componentMap).includes(val) || 'A component with this name already exists' ]"
3031
></q-input>

src/components/home_sidebar_items/ComponentTab/CreateComponentHTMLQueue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ li {
148148
min-width: 175px;
149149
width: 30%;
150150
border-radius: 0.5cm;
151-
border: 2px solid white;
151+
border: 2px solid $menutext;
152152
background-color: $secondary;
153153
height: 35px;
154154
padding-top: 6px;

0 commit comments

Comments
 (0)