Skip to content

Commit d8b2933

Browse files
Merge pull request #8 from oslabs-beta/html_display
File Structure Update
2 parents 384238a + 515f844 commit d8b2933

File tree

7 files changed

+27
-37
lines changed

7 files changed

+27
-37
lines changed

src/components/ComponentDisplay.vue

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ Description:
3333
<div class="component-title">
3434
<p>{{ componentData.componentName }}</p>
3535
</div>
36-
<div class="component-html-info">
37-
<p>Elements in Component:</p>
38-
<p
39-
class="list-of-elements"
36+
<!-- <div class="component-html-info"> -->
37+
<!-- <p>Elements in Component:</p> -->
38+
<!-- <p
39+
class="component-html-info"
4040
v-for="htmlElement in componentMap[componentData.componentName]
4141
.htmlList"
4242
:key="htmlElement"
4343
>
4444
{{ htmlElement.text }}
45-
</p>
46-
</div>
45+
</p> -->
46+
<!-- </div> -->
4747
<q-menu context-menu>
4848
<q-list color="black" class="menu">
4949
<q-item clickable v-ripple v-close-popup @click="handleAddChild">
@@ -405,19 +405,10 @@ export default {
405405
line-height: 1.2;
406406
z-index: -1;
407407
}
408-
/* .component-html-info {
409-
position: relative;
410-
font-size: 16px;
411-
top: -18px;
412-
left: 2px;
413-
color: black;
414-
-webkit-text-stroke: 0.4px white;
415-
font-weight: 800;
416-
line-height: 1.2;
417-
z-index: -1;
418-
} */
408+
419409
.component-html-info {
420410
display: flex;
411+
font-size: 14px;
421412
/* flex-basis: auto; */
422413
flex-direction: column;
423414
/* flex-wrap: wrap; */
@@ -496,4 +487,4 @@ export default {
496487
#counter {
497488
margin-top: 20px;
498489
}
499-
</style>
490+
</style>

src/components/HomeSideDropDown.vue

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<!--
22
Description:
3-
Displays dropdown for Components, Routes, and Vuex
4-
Functionality includes: N/A
5-
-->
3+
Displays dropdown for Components, Routes, and Vuex in Home Sidebar
4+
-->
65

76
<template>
87
<div class="q-pa-md" style="max-width: 350px">
@@ -16,7 +15,7 @@ Description:
1615
</q-expansion-item>
1716
<q-expansion-item dense dense-toggle expand-separator label="Routes">
1817
<q-card>
19-
<div class="input-container" style='height: 150px'>
18+
<div class="input-container" style="height: 150px">
2019
<RouteDisplay />
2120
<br />
2221
</div>
@@ -37,31 +36,31 @@ Description:
3736

3837
<script>
3938
import RouteDisplay from '../components/RouteDisplay'
40-
import ComponentList from './HomeSideDropDownItems/ComponentList'
41-
import VuexForm from './HomeSideDropDownItems/VuexForm'
39+
import ComponentList from './home_sidebar_items/ComponentList'
40+
import VuexForm from './home_sidebar_items/VuexForm'
4241
4342
export default {
4443
components: {
4544
RouteDisplay,
4645
VuexForm,
4746
ComponentList
48-
}
4947
}
48+
}
5049
</script>
5150

5251
<style lang="stylus">
5352
54-
.input-add {
55-
margin: 0em 1em 0em 1em;
56-
}
53+
.input-add {
54+
margin: 0em 1em 0em 1em;
55+
}
5756
5857
.input-container {
59-
margin-top: 1rem;
60-
background: $subsecondary;
61-
overflow-y: auto;
62-
}
58+
margin-top: 1rem;
59+
background: $subsecondary;
60+
overflow-y: auto;
61+
}
6362
6463
.red {
65-
background: red;
66-
}
64+
background: red;
65+
}
6766
</style>

src/components/ChildrenMultiselect.vue renamed to src/components/unused_features/ChildrenMultiselect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Description:
33
Is not imported in current version of OverVue
44
Functionality includes: N/A
55
-->
6-
6+
<!--
77
<template>
88
<div id="child-select">
99
<br />

src/components/EditQueue.vue renamed to src/components/unused_features/EditQueue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Description:
33
Is not imported in current version of OverVue
44
Functionality includes: N/A
55
-->
6-
6+
<!--
77
<template>
88
<div>
99
<p class="panel-heading">Selected Elements</p>

src/components/Toolbar.vue renamed to src/components/unused_features/Toolbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Description:
33
Is not imported in current version of OverVue
44
Functionality includes: N/A
55
-->
6-
6+
<!--
77
<template>
88
<div class="home-sidebar">
99
<q-btn-group>

0 commit comments

Comments
 (0)