Skip to content

Commit d08b89f

Browse files
authored
Merge pull request #15 from drewngyen/master
fixed dashboard and added sudo media query
2 parents 7d582c7 + 6295933 commit d08b89f

File tree

3 files changed

+51
-12
lines changed

3 files changed

+51
-12
lines changed

src/components/ComponentDisplay.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ export default {
9393
/* height: 500px; */
9494
/* width: 500px; */
9595
/* original is 70vh */
96-
height: 87vh;
96+
height: 95vh;
9797
width: 100vw;
9898
position: relative;
99+
background: darkslategray;
99100
background-color: rgba(124, 126, 145, 0.44);
100101
/* background-color: #269; */
101102
background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;

src/components/Footer.vue

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
2-
<q-footer reveal elevated class="gradient text-white" :style="{ height: `${height}vh` }">
2+
<q-footer reveal class="gradient text-white" :style="{ height: `${height}vh` }">
33
<q-toolbar>
4-
<q-btn flat color="subaccentbtn" round @click="openBottomDrawer">
5-
<i :class="[open ? down : up]"></i>
4+
<q-btn flat color="subaccent" round @click="openBottomDrawer">
5+
<i :class="[open ? down : up]" id="btn" ></i>
66
</q-btn>
77
<q-toolbar-title>Dashboard</q-toolbar-title>
88
</q-toolbar>
@@ -15,15 +15,19 @@
1515
indicator-color="secondary"
1616
align="left"
1717
>
18-
<q-tab name="code" label="Code" />
19-
<q-tab name="tree" label="Tree" />
20-
<q-tab name="html" label="HTML Elements" />
18+
<q-tab name="code" label="Code" id="label-text"/>
19+
<q-tab name="detail" label="Component Details" id="label-text"/>
20+
<q-tab name="tree" label="Tree" id="label-text"/>
21+
<q-tab name="html" label="HTML Elements" id="label-text"/>
2122
</q-tabs>
2223

2324
<q-tab-panels v-model="tab" animated class="bg-primary text-white">
2425
<q-tab-panel name="code">
2526
</q-tab-panel>
2627

28+
<q-tab-panel name="detail">
29+
</q-tab-panel>
30+
2731
<q-tab-panel name="tree">
2832
<Tree />
2933
</q-tab-panel>
@@ -56,27 +60,60 @@ export default {
5660
},
5761
methods: {
5862
openBottomDrawer () {
59-
this.height === 35 ? (this.height = 6.5) : (this.height = 35)
63+
let minHeight = (window.outerHeight < 900) ? 4.5 : 2.5
64+
this.height === 35 ? (this.height = minHeight) : (this.height = 35)
6065
this.open === true ? this.open = false : this.open = true
6166
}
6267
}
6368
}
6469
</script>
6570

66-
<style lang="stylus">
71+
<style lang="stylus" scoped>
72+
i {
73+
font-size: 11px;
74+
}
75+
.q-btn {
76+
background: $secondary;
77+
font-size: 8px;
78+
margin: 5px;
79+
}
80+
// styling for the entire footer
6781
.q-footer {
6882
// height: 35vh;
6983
transition-timing-function: ease-in;
7084
transition: 0.2s;
85+
background: #313131;
86+
}
87+
// changes the footer toolbar height
88+
.q-toolbar {
89+
min-height: 25px !important;
90+
padding: 0 6px !important;
91+
}
92+
.q-toolbar__title {
93+
font-size 14px;
94+
text-transform: uppercase;
95+
// font-weight: 700;
96+
padding: 5px;
97+
}
98+
// this class selector does not change anything
99+
.q-tab__label {
100+
// font-size not changing
101+
font-size: 10px !important;
102+
line-height: 1.718em;
103+
font-weight: 500;
104+
}
105+
// changes the tab label styling
106+
#label-text {
107+
font-size: 4px !important;
108+
text-transform: capitalize;
71109
}
72-
73110
.q-tab-panel {
74111
background: rgb(69,77,102);
75112
background: linear-gradient(180deg, rgba(69,77,102,1) 0%, rgba(54,60,78,1) 100%);
76113
}
77-
114+
// changes the length of the tab panels
78115
.q-tab-panels {
79-
height: 24vh;
116+
height: 31vh;
80117
}
81118
82119
.q-tabs {

src/components/UploadImage.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
flat
88
bordered
99
style="max-width: 100%"
10+
accept=".jpg, image/*"
1011
/>
1112
</div>
1213
</template>

0 commit comments

Comments
 (0)