Skip to content

Commit 8f3ca48

Browse files
committed
Merge branch 'stretchMockup' of https://github.com/JojuOlaode/OverVue into visualStretch
2 parents dfb2765 + f8c9766 commit 8f3ca48

File tree

5 files changed

+47
-35
lines changed

5 files changed

+47
-35
lines changed

src/components/ComponentDisplay.vue

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
@deactivated="onDeactivated(componentData)"
1919
@dragging="onDrag"
2020
@resizing="onResize"
21-
@dblclick.native="onDoubleClick(componentData)"
2221
@dragstop="finishedDrag"
2322
@resizestop="finishedResize"
2423
:onDragStart="recordInitialPosition"
@@ -177,7 +176,29 @@ export default {
177176
console.log('mockBg is working', this.imagePath[this.activeRoute])
178177
return this.imagePath[this.activeRoute]
179178
? {
180-
background: `url("${this.userImage}") center/contain no-repeat`
179+
background: `url("${this.userImage}") center/contain no-repeat rgba(223, 218, 218, 0.886)`,
180+
// 'background-color': 'rgba(223, 218, 218, 0.886)',
181+
// 'background-size': '100px 100px, 100px 100px, 20px 20px, 20px 20px',
182+
// 'background-position':' -2px -2px, -2px -2px, -1px -1px, -1px -1px',
183+
// 'background-image': `-webkit-linear-gradient(white 2px, transparent 2px),
184+
// -webkit-linear-gradient(0, white 2px, transparent 2px),
185+
// -webkit-linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
186+
// -webkit-linear-gradient(0, rgba(255, 255, 255, 0.3) 1px, transparent 1px)`,
187+
// 'background-image': `-moz-linear-gradient(white 2px, transparent 2px),
188+
// -moz-linear-gradient(0, white 2px, transparent 2px),
189+
// -moz-linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
190+
// -moz-linear-gradient(0, rgba(255, 255, 255, 0.3) 1px, transparent 1px)`,
191+
// 'background-image': `linear-gradient(white 2px, transparent 2px),
192+
// linear-gradient(90deg, white 2px, transparent 2px),
193+
// linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px),
194+
// linear-gradient(90deg, rgba(255, 255, 255, 0.3) 1px, transparent 1px)`,
195+
// '-pie-background': `linear-gradient(white 2px, transparent 2px) -2px -2px / 100px,
196+
// linear-gradient(90deg, white 2px, transparent 2px) -2px -2px / 100px,
197+
// linear-gradient(rgba(255, 255, 255, 0.3) 1px, transparent 1px) -1px -1px /
198+
// 20px, linear-gradient(90deg, rgba(255, 255, 255, 0.3) 1px, transparent 1px) -1px -1px /
199+
// 20px, #269`,
200+
// 'background-image': `url(${this.userImage})`,
201+
// behavior: 'url(/pie/PIE.htc)',
181202
}
182203
: {}
183204
}
@@ -346,12 +367,6 @@ export default {
346367
// console.log("We just clicked without making a new active component")
347368
// }
348369
},
349-
onDoubleClick (compData) {
350-
if (!(componentData.componentName === this.activeComponent)) {
351-
this.setActiveComponent(componentData.componentName)
352-
}
353-
this.activeComponentData.isActive = true
354-
},
355370
handleAddChild () {
356371
// render modal with childrenmultiselect in it
357372
this.modalOpen = true
@@ -374,11 +389,6 @@ export default {
374389
if (e.target.innerText === '-' && payload.z > 0) payload.z--
375390
this.updateComponentLayer(payload)
376391
},
377-
// @dblclick.native="onDoubleClick(componentData)"
378-
// onDoubleClick (compData) {
379-
// this.setActiveComponent(compData.componentName)
380-
// this.activeComponentData.isActive = true
381-
// }
382392
handleClick (event) {
383393
if (event.target.className === 'component-display grid-bg') {
384394
if (!(this.activeComponent === '')) this.setActiveComponent('')
@@ -395,11 +405,9 @@ export default {
395405
top: -18px;
396406
left: 2px;
397407
color: black;
408+
-webkit-text-stroke: 0.4px white;
398409
font-weight: 800;
399-
/* background: rgba(0, 0, 0, 0.678); */
400-
/* width: 1rem; */
401410
line-height: 1.2;
402-
/* margin: 10px; */
403411
z-index: -1;
404412
}
405413
.component-children {

src/components/Footer.vue

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<q-tab name="html" label="HTML Elements" id="label-text" />
2323
</q-tabs>
2424

25-
<q-tab-panels v-model="tab" animated class="bg-primary text-white full-footer">
25+
<q-tab-panels v-model="tab" animated class="html-bg text-white" >
2626
<q-tab-panel name="code">
2727
<CodeSnippet />
2828
</q-tab-panel>
@@ -35,7 +35,7 @@
3535
<Tree />
3636
</q-tab-panel>
3737

38-
<q-tab-panel name="html">
38+
<q-tab-panel name="html" :style="{height: `${height}vh`}">
3939
<HomeQueue />
4040
</q-tab-panel>
4141
</q-tab-panels>
@@ -172,14 +172,18 @@ i {
172172
background: black;
173173
}
174174
175-
.full-footer {
176-
// height: 100vh;
177-
padding-bottom: 0px;
178-
}
175+
// .full-footer {
176+
// // height: 100vh;
177+
178+
// }
179179
180180
#footer-cards {
181181
height: 100%;
182182
border-radius: 0px;
183183
background: #737578;
184184
}
185+
.html-bg {
186+
// give html background color of grey
187+
background-color: #202122;
188+
}
185189
</style>

src/components/HomeQueue.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ export default {
137137

138138
<style lang="stylus" scoped>
139139
.home-queue {
140-
height: 100%;
140+
overflow: scroll;
141+
padding-bottom: 40px;
141142
}
142143
li {
143144
list-style-type: none;
@@ -149,6 +150,7 @@ li {
149150
.list-group-item {
150151
display: inline-block;
151152
margin: 2px 1.5%;
153+
min-width: 145px;
152154
width: 30%;
153155
border-radius: 0.5cm;
154156
border: 2px solid $secondary;

src/components/HomeSideDropDown.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<div class="q-pa-md" style="max-width: 350px">
33
<q-list padding bordered class="rounded-borders drawer-menu">
44
<q-expansion-item dense dense-toggle expand-separator label="Components">
5-
<q-card>
6-
<q-card-section>
7-
<div class="input-container">
8-
<ComponentList />
9-
</div>
10-
</q-card-section>
11-
</q-card>
5+
<q-card>
6+
<q-card-section>
7+
<div class="input-container" style='height: 130px'>
8+
<ComponentList />
9+
</div>
10+
</q-card-section>
11+
</q-card>
1212
</q-expansion-item>
1313
<q-expansion-item dense dense-toggle expand-separator label="Routes">
1414
<q-card>
1515
<q-card-section>
16-
<div class="input-container">
16+
<div class="input-container" style='height: 150px'>
1717
<RouteDisplay />
1818
<br />
1919
</div>
@@ -48,13 +48,15 @@ export default {
4848
</script>
4949

5050
<style lang="stylus">
51+
5152
.input-add {
5253
margin: 0em 1em 0em 1em;
5354
}
5455
5556
.input-container {
5657
margin-top: 1rem;
5758
background: $subsecondary;
59+
overflow-y: auto;
5860
}
5961
6062
.red {

src/layouts/MyLayout.vue

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,4 @@ export default {
141141
background: $subprimary;
142142
// background: #272822;
143143
}
144-
145-
::-webkit-scrollbar {
146-
display: none;
147-
}
148144
</style>

0 commit comments

Comments
 (0)