Skip to content

Commit 185f10d

Browse files
committed
styling updates for tutorial tabs and store sub-tabs
1 parent f14f570 commit 185f10d

File tree

11 files changed

+33
-59
lines changed

11 files changed

+33
-59
lines changed

src/components/ComponentDisplay.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ export default {
465465
}
466466
.active {
467467
background-color: $accent;
468-
border: 1px dashed rgb(227, 203, 71);
468+
border: 1px dashed $accent;
469469
}
470470
.btn {
471471
font-size: 25px;

src/components/dashboard_items/Dashboard.vue

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Description:
77

88
<template>
99
<span v-if="showTutorial === false">
10-
<q-card id="dashboard-cards" class="bord" >
10+
<q-card id="dashboard-cards" >
1111
<q-tabs
1212
v-model="tab"
1313
class="bg-subaccent text-white"
@@ -24,7 +24,7 @@ Description:
2424
<q-tab name="routes" label="Routes" id="label-text"
2525
></q-tab>
2626
</q-tabs>
27-
<q-tab-panels v-model="tab" animated class="html-bg text-white">
27+
<q-tab-panels v-model="tab" animated>
2828
<q-tab-panel name="detail">
2929
<ComponentDetails />
3030
</q-tab-panel>
@@ -120,9 +120,6 @@ export default {
120120
</script>
121121

122122
<style lang="scss" scoped>
123-
i {
124-
font-size: 11px;
125-
}
126123
127124
.home-sidebar {
128125
margin: 1rem;
@@ -150,14 +147,14 @@ i {
150147
}
151148
152149
.q-tab-panel {
153-
/* // matchs the code editor bg */
150+
/* // matches the code editor bg */
154151
background: $subprimary;
155152
}
156153
157154
// changes the length of the tab panels
158155
.q-tab-panels {
159156
padding: 0px !important;
160-
// border-top: 3px solid black;
157+
background: $subprimary;
161158
}
162159
163160
.q-tabs {
@@ -175,17 +172,9 @@ i {
175172
border-radius: 0px;
176173
background: $subprimary;
177174
}
178-
.html-bg {
179-
/* // give html background color of grey */
180-
background-color: #202122;
181-
}
182175
183176
.inner-div {
184177
height: 100%;
185178
}
186179
187-
// .bord {
188-
// border-left: 3px solid black;
189-
// border-right: 3px solid black;
190-
// }
191180
</style>

src/components/dashboard_items/GetStarted.vue

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<q-card id="dashboard-cards" class="board" >
2+
<q-card id="dashboard-cards" class="sidebar-border" >
33
<q-tabs
44
v-model="tutorialPage"
55
class="bg-subaccent text-white"
@@ -13,25 +13,22 @@
1313
name="landing"
1414
label="Welcome to Overvue"
1515
id="label-text"
16-
style="border-right: 3px solid black"
1716
>
1817
</q-tab>
1918
<q-tab
2019
name="basics"
2120
label="Basic Functions"
2221
id="label-text"
23-
style="border-right: 3px solid black"
2422
>
2523
</q-tab>
2624
<q-tab
2725
name="advanced"
2826
label="Advanced Functions"
2927
id="label-text"
30-
style="border-right: 3px solid black"
3128
>
3229
</q-tab>
3330
</q-tabs>
34-
<q-tab-panels v-model="tutorialPage" animated class="html-bg text-white">
31+
<q-tab-panels v-model="tutorialPage" animated>
3532
<q-tab-panel name="landing">
3633
<Landing @nextTab="tutorialPage = 'basics'"/>
3734
</q-tab-panel>
@@ -66,17 +63,6 @@ export default {
6663
</script>
6764

6865
<style lang="scss" scoped>
69-
i {
70-
font-size: 11px;
71-
}
72-
73-
.home-sidebar {
74-
margin: 1rem;
75-
justify-content: center;
76-
border-radius: 5px;
77-
padding: 0px;
78-
background: $subsecondary;
79-
}
8066
8167
.q-btn {
8268
font-size: 8px;
@@ -110,35 +96,18 @@ i {
11096
11197
.q-tab-panels {
11298
padding: 0px !important;
113-
border-top: 3px solid black;
99+
background: $subprimary;
114100
}
115101
116102
.q-tabs {
117-
background: #11120f;
118-
}
119-
120-
.toolbar-background {
121-
background: black;
122-
}
123-
124-
#dashboard-cards {
125-
display: flex;
126-
flex-direction: column;
127-
height: 100%;
128-
border-radius: 0px;
129-
background: #737578;
130-
}
131-
.html-bg {
132-
/* // give html background color of grey */
133-
background-color: #202122;
103+
background: $subprimary;
134104
}
135105
136106
.inner-div {
137107
height: 100%;
138108
}
139109
140-
.board {
110+
.sidebar-border {
141111
border-left: 3px solid black;
142-
border-right: 3px solid black;
143112
}
144113
</style>

src/components/dashboard_items/RouteDisplay.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Includes functionality to:
88
<div class="route-display">
99
<q-input
1010
@keyup.enter="handleEnterKeyPress"
11-
color="menutext"
11+
color="white"
1212
dark
1313
outlined
1414
bottom-slots

src/components/home_sidebar_items/ComponentTab/AddProps.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<q-input
44
@keyup.enter="createNewProp(textProps)"
5-
color="menutext"
5+
color="white"
66
dark
77
outlined
88
bottom-slots

src/components/home_sidebar_items/ComponentTab/ComponentTab.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export default {
4646
height: 100%;
4747
// matches the code editor bg
4848
background: $subprimary;
49+
padding: 0px;
4950
// changes the length of the tab panels
5051
}
5152
.q-tab-panels {

src/components/home_sidebar_items/ComponentTab/CreateComponent.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Description:
1818
v-on:keyup.delete.stop
1919
v-model="componentNameInputValue"
2020
label="Set component name *"
21-
color="menutext"
21+
color="white"
2222
dark
2323
dense
2424
outlined
@@ -179,7 +179,7 @@ export default {
179179
flex-direction: column;
180180
justify-content: flex-start;
181181
align-items: stretch;
182-
margin: 20px;
182+
margin: 4px;
183183
}
184184
.create-component-form {
185185
display: flex;

src/components/home_sidebar_items/ComponentTab/EditDeleteComponents.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Description:
88
<template>
99
<div class="edit-component-div">
1010
<div>
11-
<button class="menu-link" @click="resetActiveComponent"><i class="fa fa-arrow-left" aria-hidden="true"></i> Create Component Menu</button>
11+
<button class="menu-link" @click="resetActiveComponent"><i class="fa fa-arrow-left" aria-hidden="true"></i>&nbsp; &nbsp; Create Component Menu</button>
1212
<q-card class="expansion-item" dark flat>
1313
<div
1414
class="text-body2"
@@ -20,6 +20,7 @@ Description:
2020
v-on:keyup.delete.stop
2121
v-model="newName"
2222
:placeholder="this.activeComponent"
23+
color="white"
2324
dark
2425
dense
2526
outlined

src/components/home_sidebar_items/StoreTab/StoreTab.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Functionality:
2222
<q-tab-panel name="state">
2323
<q-input
2424
@keyup.enter="createNewState(textState)"
25-
color="menutext"
25+
color="white"
2626
dark
2727
outlined
2828
v-model="textState"
@@ -217,6 +217,10 @@ i {
217217
padding: 0 !important;
218218
}
219219
220+
.q-tabs {
221+
background: #11120F;
222+
}
223+
220224
#store-cards {
221225
height: 80%;
222226
border-radius: 0;

src/css/app.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
// font-family: 'Montserrat', sans-serif;
55
// font-family: 'Mukta', sans-serif;
66
// font-family: 'Nunito Sans', sans-serif;
7+
body {
8+
font-family: 'Mukta', sans-serif;
9+
color: $menutext;
10+
}
711

812
main {
913
background: #5b6e6e;

0 commit comments

Comments
 (0)