graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 17:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug

Browse source
This commit is contained in:
syuilo 2018-09-01 15:38:03 +09:00
parent 63e2dbbb0d
commit f1d65a66b4
5 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -210,7 +210,6 @@
"vue": "2.5.17", "vue": "2.5.17",
"vue-chartjs": "3.4.0", "vue-chartjs": "3.4.0",
"vue-cropperjs": "2.2.1", "vue-cropperjs": "2.2.1",
"vue-js-modal": "1.3.24",
"vue-json-tree-view": "2.1.4", "vue-json-tree-view": "2.1.4",
"vue-loader": "15.4.1", "vue-loader": "15.4.1",
"vue-router": "3.0.1", "vue-router": "3.0.1",

10
src/client/app/app.styl
View file

@ -126,3 +126,13 @@ pre
[data-fa] [data-fa]
display inline-block 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

13
src/client/app/desktop/views/pages/welcome.vue
View file

@ -37,9 +37,12 @@
<div class="tl"> <div class="tl">
<mk-welcome-timeline :max="20"/> <mk-welcome-timeline :max="20"/>
</div> </div>
<modal name="signup" width="500px" height="auto" scrollable>
<modal name="signup">
<div :class="$style.modal">
<header :class="$style.signupFormHeader">%i18n:@signup%</header> <header :class="$style.signupFormHeader">%i18n:@signup%</header>
<mk-signup :class="$style.signupForm"/> <mk-signup :class="$style.signupForm"/>
</div>
</modal> </modal>
</div> </div>
</template> </template>
@ -88,10 +91,10 @@ export default Vue.extend({
this.$refs.pointer.style.left = x.left + 'px'; this.$refs.pointer.style.left = x.left + 'px';
}, },
signup() { signup() {
this.$modal.show('signup'); this.$modal.push('signup');
}, },
signin() { signin() {
this.$modal.show('signin'); this.$modal.push('signin');
}, },
dark() { dark() {
this.$store.commit('device/set', { this.$store.commit('device/set', {
@ -265,6 +268,10 @@ root(isDark)
</style> </style>
<style lang="stylus" module> <style lang="stylus" module>
.modal
width 500px
background #fff !important
.signupForm .signupForm
padding 24px 48px 48px 48px padding 24px 48px 48px 48px

2
src/client/app/init.ts
View file

@ -5,7 +5,6 @@
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import VModal from 'vue-js-modal';
import * as TreeView from 'vue-json-tree-view'; import * as TreeView from 'vue-json-tree-view';
import VAnimateCss from 'v-animate-css'; import VAnimateCss from 'v-animate-css';
import Element from 'element-ui'; import Element from 'element-ui';
@ -28,7 +27,6 @@ switch (lang) {
Vue.use(Vuex); Vue.use(Vuex);
Vue.use(VueRouter); Vue.use(VueRouter);
Vue.use(VModal);
Vue.use(TreeView); Vue.use(TreeView);
Vue.use(VAnimateCss); Vue.use(VAnimateCss);
Vue.use(Element, { locale: elementLocale }); Vue.use(Element, { locale: elementLocale });

10
src/client/app/mobile/style.styl
View file

@ -17,13 +17,3 @@ body
display flex display flex
flex-direction column flex-direction column
min-height 100% 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