diff --git a/package.json b/package.json
index 3669a297..3f0c4bdc 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,8 @@
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
"path-to-regexp": "2.4.0",
- "screenfull": "3.3.3",
+ "screenfull": "4.0.0",
+ "showdown": "1.8.6",
"sortablejs": "1.7.0",
"tui-editor": "1.2.7",
"vue": "2.5.17",
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 7f8e6fc3..8e7bcba4 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -1,6 +1,6 @@
-
+
@@ -23,7 +23,9 @@ export default {
})
return false
}
- screenfull.toggle()
+ screenfull.toggle().then(() => {
+ this.isFullscreen = screenfull.isFullscreen
+ })
}
}
}
diff --git a/src/icons/svg/exit-fullscreen.svg b/src/icons/svg/exit-fullscreen.svg
new file mode 100644
index 00000000..485c128b
--- /dev/null
+++ b/src/icons/svg/exit-fullscreen.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/screenfull.svg b/src/icons/svg/fullscreen.svg
similarity index 100%
rename from src/icons/svg/screenfull.svg
rename to src/icons/svg/fullscreen.svg
diff --git a/src/lang/en.js b/src/lang/en.js
index ef98af4b..05b34598 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -69,7 +69,6 @@ export default {
logOut: 'Log Out',
dashboard: 'Dashboard',
github: 'Github',
- screenfull: 'Screenfull',
theme: 'Theme',
size: 'Global Size'
},
diff --git a/src/lang/es.js b/src/lang/es.js
index ed71fc15..8575d382 100755
--- a/src/lang/es.js
+++ b/src/lang/es.js
@@ -69,7 +69,6 @@ export default {
logOut: 'Salir',
dashboard: 'Panel de control',
github: 'Github',
- screenfull: 'Pantalla completa',
theme: 'Tema',
size: 'Tamaño global'
},
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 7da0ccee..1fd18355 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -69,7 +69,6 @@ export default {
logOut: '退出登录',
dashboard: '首页',
github: '项目地址',
- screenfull: '全屏',
theme: '换肤',
size: '布局大小'
},
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 65012628..ce5911ee 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -10,9 +10,7 @@
-
-
-
+
@@ -152,12 +150,8 @@ export default {
.avatar-wrapper {
margin-top: 5px;
position: relative;
-<<<<<<< HEAD
line-height: initial;
cursor: pointer;
-=======
-
->>>>>>> c71f311... feature[Navbar]: add header-search component (#1591)
.user-avatar {
width: 40px;
height: 40px;