mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-10 07:33:08 +02:00
Fix bug
This commit is contained in:
parent
63e2dbbb0d
commit
f1d65a66b4
5 changed files with 22 additions and 18 deletions
|
@ -210,7 +210,6 @@
|
|||
"vue": "2.5.17",
|
||||
"vue-chartjs": "3.4.0",
|
||||
"vue-cropperjs": "2.2.1",
|
||||
"vue-js-modal": "1.3.24",
|
||||
"vue-json-tree-view": "2.1.4",
|
||||
"vue-loader": "15.4.1",
|
||||
"vue-router": "3.0.1",
|
||||
|
|
|
@ -126,3 +126,13 @@ pre
|
|||
|
||||
[data-fa]
|
||||
display inline-block
|
||||
|
||||
.modal-backdrop
|
||||
z-index 10000 !important
|
||||
|
||||
.modal-content-wrapper
|
||||
z-index 10001 !important
|
||||
|
||||
.modal-content
|
||||
padding 0 !important
|
||||
background-color transparent !important
|
||||
|
|
|
@ -37,9 +37,12 @@
|
|||
<div class="tl">
|
||||
<mk-welcome-timeline :max="20"/>
|
||||
</div>
|
||||
<modal name="signup" width="500px" height="auto" scrollable>
|
||||
<header :class="$style.signupFormHeader">%i18n:@signup%</header>
|
||||
<mk-signup :class="$style.signupForm"/>
|
||||
|
||||
<modal name="signup">
|
||||
<div :class="$style.modal">
|
||||
<header :class="$style.signupFormHeader">%i18n:@signup%</header>
|
||||
<mk-signup :class="$style.signupForm"/>
|
||||
</div>
|
||||
</modal>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -88,10 +91,10 @@ export default Vue.extend({
|
|||
this.$refs.pointer.style.left = x.left + 'px';
|
||||
},
|
||||
signup() {
|
||||
this.$modal.show('signup');
|
||||
this.$modal.push('signup');
|
||||
},
|
||||
signin() {
|
||||
this.$modal.show('signin');
|
||||
this.$modal.push('signin');
|
||||
},
|
||||
dark() {
|
||||
this.$store.commit('device/set', {
|
||||
|
@ -265,6 +268,10 @@ root(isDark)
|
|||
</style>
|
||||
|
||||
<style lang="stylus" module>
|
||||
.modal
|
||||
width 500px
|
||||
background #fff !important
|
||||
|
||||
.signupForm
|
||||
padding 24px 48px 48px 48px
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
import Vue from 'vue';
|
||||
import Vuex from 'vuex';
|
||||
import VueRouter from 'vue-router';
|
||||
import VModal from 'vue-js-modal';
|
||||
import * as TreeView from 'vue-json-tree-view';
|
||||
import VAnimateCss from 'v-animate-css';
|
||||
import Element from 'element-ui';
|
||||
|
@ -28,7 +27,6 @@ switch (lang) {
|
|||
|
||||
Vue.use(Vuex);
|
||||
Vue.use(VueRouter);
|
||||
Vue.use(VModal);
|
||||
Vue.use(TreeView);
|
||||
Vue.use(VAnimateCss);
|
||||
Vue.use(Element, { locale: elementLocale });
|
||||
|
|
|
@ -17,13 +17,3 @@ body
|
|||
display flex
|
||||
flex-direction column
|
||||
min-height 100%
|
||||
|
||||
.modal-backdrop
|
||||
z-index 10000 !important
|
||||
|
||||
.modal-content-wrapper
|
||||
z-index 10001 !important
|
||||
|
||||
.modal-content
|
||||
padding 0 !important
|
||||
background-color transparent !important
|
||||
|
|
Loading…
Reference in a new issue