Skip to content

Commit 43f5424

Browse files
committed
fixed sidebar button height; updated undo/redo button styling; updated mockup upload buttons
1 parent a5ccc0a commit 43f5424

File tree

7 files changed

+13
-24
lines changed

7 files changed

+13
-24
lines changed

src/components/ComponentDisplay.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ li:hover{
640640
position: absolute;
641641
}
642642
.active {
643-
background-color: $accent;
643+
background-color: rgba($accent, .7);
644644
border: 1px dashed $accent;
645645
}
646646
.minorAction {

src/components/home_sidebar_items/ComponentTab/CreateComponent.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Description:
4949

5050
<q-btn
5151
id="create-component-btn"
52+
class="sidebar-btn"
5253
v-if="activeComponent === ''"
5354
color="secondary"
5455
label="Create Component"
@@ -180,6 +181,7 @@ export default {
180181
flex-direction: column;
181182
justify-content: flex-start;
182183
align-items: stretch;
184+
margin: 4px;
183185
}
184186
.create-component-form {
185187
display: flex;

src/components/home_sidebar_items/ComponentTab/EditDeleteComponents.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ export default {
296296
flex-direction: column;
297297
justify-content: flex-start;
298298
align-items: stretch;
299-
margin: 20px;
299+
margin: 4px;
300300
}
301301
302302
.menu-link{

src/components/home_sidebar_items/ComponentTab/ImportComponent.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<q-btn
33
id="import-component-btn"
4+
class="sidebar-btn"
45
size="md"
56
color="secondary"
67
:label=title
@@ -258,7 +259,7 @@ export default {
258259
<style scoped>
259260
#import-component-btn{
260261
width: 100%;
261-
margin: 10px 0px;
262+
margin: 30px 0px;
262263
}
263264
</style>
264265

src/components/home_sidebar_items/ComponentTab/UploadImage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export default {
142142
}
143143
144144
.upload-btn {
145-
text-transform: capitalize;
145+
text-transform: uppercase;
146146
font-size: 12px;
147147
width: 150px;
148148
height: auto;

src/css/app.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ main {
3333
text-transform: capitalize;
3434
}
3535

36+
.sidebar-btn {
37+
min-height: 42px !important;
38+
}
39+
3640
.q-item {
3741
background: $subsecondary;
3842
}

src/layouts/MyLayout.vue

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,7 @@ Description:
4444
<i v-else class="fa fa-redo" id="unavailable" aria-hidden="true"></i>
4545
</q-btn>
4646
</div></q-toolbar-title>
47-
<!-- <SlackLoginWindow /> -->
4847
<div></div>
49-
<!-- <i
50-
v-if="doneAction.length"
51-
class="fa fa-backward"
52-
aria-hidden="true"
53-
@click="undo"
54-
></i>
55-
<i
56-
v-else
57-
class="fa fa-backward"
58-
id="unavailable"
59-
aria-hidden="true"
60-
></i>
61-
<i
62-
v-if="undoneAction.length"
63-
class="fa fa-forward"
64-
aria-hidden="true"
65-
@click="redo"
66-
></i>
67-
<i v-else class="fa fa-forward" id="unavailable" aria-hidden="true"></i> -->
6848

6949
<SaveProjectComponent />
7050
<OpenProjectComponent />
@@ -312,6 +292,8 @@ q-btn > i {
312292
flex-grow: 1;
313293
align-items: center;
314294
margin-right: 5px;
295+
width: 40px;
296+
border: 1px solid rgba($primary, .5);
315297
}
316298
317299
// Must change style lang='scss'

0 commit comments

Comments
 (0)