diff --git a/src/admin/components/primary-menu.vue b/src/admin/components/primary-menu.vue
index d81002e9e..a670fc95b 100644
--- a/src/admin/components/primary-menu.vue
+++ b/src/admin/components/primary-menu.vue
@@ -15,6 +15,7 @@
+
@@ -54,7 +55,7 @@ export default {
},
created () {
this.isCompressed = (this.$route.params.id != undefined);
- this.activeRoute = this.$route.to;
+ this.activeRoute = this.$route.name;
}
}
@@ -89,7 +90,11 @@ export default {
-webkit-transition: opacity 0.15s linear, visibility 0.15s linear;
}
}
-
+ .separator {
+ height: 2px;
+ background-color: $primary-darker;
+ width: 100%;
+ }
li{
a {
color: white;
diff --git a/src/admin/components/secondary-menu.vue b/src/admin/components/secondary-menu.vue
index 1ed2ca0e1..ce1ee31b9 100644
--- a/src/admin/components/secondary-menu.vue
+++ b/src/admin/components/secondary-menu.vue
@@ -1,6 +1,13 @@
-
@@ -30,7 +30,8 @@
options: {
type: String
},
- value: [String, Number, Array]
+ value: [String, Number, Array],
+ id: ''
},
watch: {
checked: function(val){
diff --git a/src/classes/field-types/date/Date.vue b/src/classes/field-types/date/Date.vue
index 6204612fd..f69509119 100644
--- a/src/classes/field-types/date/Date.vue
+++ b/src/classes/field-types/date/Date.vue
@@ -1,8 +1,9 @@
+ :id="id"
+ v-model="dateValue"
+ @blur="onBlur"
+ @input="onInput($event)">