Skip to content

Commit b541aae

Browse files
authored
Merge pull request #13 from oslabs-beta/emma/add-features
Emma/add features - additional final edits
2 parents 101e4ba + e65b3ce commit b541aae

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/components/Canvas.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ behavior: url(/pie/PIE.htc);
919919
position: absolute;
920920
font-size: 3em;
921921
margin-top: -4%;
922-
margin-left: 23%;
922+
margin-left: 29%;
923923
color: black;
924924
}
925925

src/components/left-sidebar/ComponentTab/CreateMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Description:
3535
<!-- <q-expansion-item group="accordion" label="Create Component" > -->
3636
<LibComponents></LibComponents>
3737
<div class="searchinput">
38-
<q-input v-if ="this.$store.state.displaylibComponent" outlined v-model="input" placeholder="Please input" label="Search Element+ Components"
38+
<q-input outlined v-model="input" placeholder="Please input" label="Search Element+ Components"
3939

4040
color="white"
4141
dark

src/components/left-sidebar/ComponentTab/UpdateMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Description:
114114
id="create-component-btn"
115115
class="sidebar-btn"
116116
color="secondary"
117-
label="Create Component"
117+
label="Done"
118118
@click="resetActiveComponent"
119119
/>
120120
<q-btn

src/components/nav-buttons/GridDensity.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description:
55
-->
66
<template>
77
<div id="gridDensity">
8-
<q-btn-dropdown class="q-btn" color="purple" label="Width">
8+
<q-btn-dropdown class="q-btn" color="secondary" label="Width">
99
<q-list>
1010
<q-item clickable v-close-popup @click="pickGridDensity('width', 5)">
1111
<q-item-section>
@@ -38,7 +38,7 @@ Description:
3838
</q-item>
3939
</q-list>
4040
</q-btn-dropdown>
41-
<q-btn-dropdown color="purple" label="Height">
41+
<q-btn-dropdown color="secondary" label="Height">
4242
<q-list>
4343
<q-item clickable v-close-popup @click="pickGridDensity('height', 5)">
4444
<q-item-section>
@@ -105,7 +105,7 @@ Description:
105105
margin-left: 15px;
106106
}
107107
.q-btn {
108-
padding: 5px 20px;
108+
padding: 0px 20px;
109109
margin-right: 15px;
110110
}
111111
.q-expansion-item {

src/components/right-sidebar/RoutesTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Includes functionality to:
3030
</template>
3131
</q-input>
3232
<Routes></Routes>
33-
<UploadMockup></UploadMockup>
33+
<!-- <UploadMockup></UploadMockup> -->
3434
</div>
3535

3636
</template>

src/components/right-sidebar/tutorial/BasicFunctions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
deleted.)
3939
</p>
4040
<img alt="Routes tab" src="../../../assets/routes.png" class="tut-screenshot">
41-
<h class="tutorial-sub-heading">Uploading mockups</h>
41+
<!-- <h class="tutorial-sub-heading">Uploading mockups</h>
4242
<p class="tutorialContent">You can upload a design mockup in the Routes tab of the right sidebar menu (one mockup
4343
per route). Select the route in the Routes tab, open the ‘Upload Mockup’ sub-menu and click ‘Upload Mockup’. To
4444
clear the image, click the ‘Clear Image’ button.
@@ -48,7 +48,7 @@
4848
<p class="tutorialContent">You can find a visualization of your app hierarchy in the Project Tree tab of the right
4949
sidebar. Routes are blue, components are green. You can also navigate to a component or route by clicking on it in
5050
the project tree.
51-
</p>
51+
</p> -->
5252
<img alt="Project Tree" src="../../../assets/project-tree.png" class="tut-screenshot">
5353
<h class="tutorial-sub-heading">Component Details</h>
5454
<p class="tutorialContent">Under the component details tab, you can access details about the active/selected

0 commit comments

Comments
 (0)