Skip to content

Commit d276b2b

Browse files
committed
will merge with dev for photos
1 parent bba6830 commit d276b2b

File tree

4 files changed

+74
-14
lines changed

4 files changed

+74
-14
lines changed

src/App.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<template>
22
<!-- Get passed down to MyLayout.vue
33
& listen for custom events emitted from MyLayout.vue -->
4-
<router-view
5-
v-on:undo="undoTrigger"
6-
v-on:redo="redoTrigger"
7-
v-bind:done-action="doneAction"
8-
v-bind:undone-action="undoneAction"
9-
/>
4+
<router-view v-on:undo="undoTrigger" v-on:redo="redoTrigger" v-bind:done-action="doneAction"
5+
v-bind:undone-action="undoneAction" />
106
</template>
117

128
<script>
@@ -44,7 +40,7 @@ let redoMixin = {
4440
if (this.undoneAction[this.undoneAction.length - 1]) {
4541
if (
4642
action.type ===
47-
this.undoneAction[this.undoneAction.length - 1].type &&
43+
this.undoneAction[this.undoneAction.length - 1].type &&
4844
deepEqual(
4945
action.payload,
5046
this.undoneAction[this.undoneAction.length - 1].payload

src/components/right-sidebar/GetStarted.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<q-tab-panel name="basics">
2222
<BasicFunctions @nextTab="tutorialPage = 'advanced'" />
2323
</q-tab-panel>
24+
2425
<q-tab-panel name="version">
2526
<NewVersionInfo @nextTab="tutorialPage = 'version'" />
2627
</q-tab-panel>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<section id="welcomeTab">
44
<h6 class="tutorialHeading">Welcome to</h6>
55
<img alt="OverVue" src="../../../assets/overvue_layeredlogo.png" id="logo">
6-
<q-btn class="tut-btn" color="secondary" label="What's New in 7.0" @click="versionTab" />
6+
<q-btn class="tut-btn" color="secondary" label="What's New in 7.0" @click="newTab" />
77
<q-btn class="tut-btn" color="secondary" label="View the Readme"
88
@click="openUrl('https://github.com/open-source-labs/OverVue#readme')" />
99
<p id="new-text">New to OverVue?</p>
Lines changed: 69 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,75 @@
11
<template>
22
<section id="new features">
3-
<q-card id="list">
3+
<h6 class="feature list">What's New?</h6>
44

5-
<h6 class="feature list">What's New?</h6>
5+
<p class="info-sub-heading">More Semantic HMTL</p>
6+
<p class="infoContent"></p>
67

7-
<p>More Semantic HMTL</p>
8-
<p>Component Customization</p>
8+
<p class="info-sub-heading">Component Customization</p>
9+
<p class="infoContent"></p>
10+
11+
<p class="info-sub-heading">Drag and Drop for HTML Tags </p>
12+
<p class="infoContent"></p>
13+
14+
<p class="info-sub-heading">Add class, id, and v-model Attributes </p>
15+
<p class="infoContent"></p>
16+
17+
<p class="info-sub-heading">Added Scoped Tags</p>
18+
<p class="infoContent"></p>
19+
20+
<p class="info-sub-heading">Ability to Nest Components</p>
21+
<p class="infoContent"></p>
922

10-
</q-card>
1123
</section>
12-
</template>
24+
</template>
25+
26+
<style scoped lang="scss">
27+
#basicFunctions {
28+
display: flex;
29+
flex-direction: column;
30+
justify-content: center;
31+
align-items: center;
32+
margin: 10px;
33+
}
34+
35+
.tutorialHeading {
36+
margin: .75rem;
37+
font-size: 2rem;
38+
padding-top: 15px;
39+
}
40+
41+
.info-sub-heading {
42+
align-self: flex-start;
43+
font-size: 1.4rem;
44+
margin: .75rem;
45+
margin-bottom: 0px;
46+
}
47+
48+
.infoContent {
49+
margin: .75rem;
50+
align-self: flex-start;
51+
font-size: 1rem;
52+
}
53+
54+
.tut-btn {
55+
margin: 0.75rem;
56+
width: 50%;
57+
min-height: 42px;
58+
height: auto;
59+
}
60+
61+
.tut-image {
62+
margin: 4px;
63+
}
64+
65+
.tut-screenshot {
66+
margin: 4px;
67+
border: 1px solid $primary;
68+
max-width: 300px;
69+
}
70+
71+
#advanced-btn {
72+
margin-top: 30px !important;
73+
margin-bottom: 50px !important;
74+
}
75+
</style>

0 commit comments

Comments
 (0)