Skip to content

Commit 8d42439

Browse files
committed
Merge branch 'dev' of https://github.com/oslabs-beta/OverVue into dev
2 parents e0501ac + 6edce72 commit 8d42439

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,13 @@ li {
169169
height: 35px;
170170
padding-top: 6px;
171171
text-align: center;
172+
color: white;
172173
cursor: move;
173174
}
174175
175176
.list-group-item-selected {
176177
display: inline-block;
177-
margin: 4px 1.5%;
178+
margin: 2px 1.5%;
178179
min-width: 175px;
179180
width: 30%;
180181
border-radius: 0.5cm;

src/components/right-sidebar/CodeSnippet.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export default {
239239
data += " data() {\n return {\n"
240240
htmlBinding.forEach(el => {
241241
if (el.binding !== '') {
242-
data += ` "${el.binding}": "PLACEHOLDER FOR VALUE", `
242+
data += ` ${el.binding}: "PLACEHOLDER FOR VALUE", `
243243
data += '\n'
244244
}
245245
})

src/components/right-sidebar/HTMLQueue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ hr {
322322
}
323323
324324
.currentlyDragging {
325-
opacity: 1;
325+
opacity: .5;
326326
}
327327
328328
.ignoreByDragover {

src/css/quasar.variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
// **************** Taken from OverVue *******************
2828
$primary : #737578;
29-
$secondary : #9c49a3;
29+
$secondary : #42B883;
3030
$accent : #a1ddc2;
3131
$subaccent : #0d0d0d;
3232
$subaccentbtn : #2c384d;

0 commit comments

Comments
 (0)