diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 88cab075c..c4d81f37e 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -15,14 +15,14 @@
-

- {{$L(item.name)}} -

+ +
{{$L('未开启通知权限')}} diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue index f3c96ab9e..c18cde007 100644 --- a/resources/assets/js/pages/manage/setting/index.vue +++ b/resources/assets/js/pages/manage/setting/index.vue @@ -21,6 +21,7 @@ @click="toggleRoute(item.path)">{{$L(item.name)}}
  • {{$L('版本')}}: {{version}} diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss index ab31c11f3..e78f23e87 100644 --- a/resources/assets/sass/components/mobile.scss +++ b/resources/assets/sass/components/mobile.scss @@ -41,6 +41,7 @@ > li { flex: 1; + width: 0; height: 100%; display: flex; flex-direction: column; @@ -60,6 +61,10 @@ .tabbar-title { font-size: 12px; line-height: 18px; + max-width: 92%; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } .tabbar-badge { @@ -135,6 +140,7 @@ .tabbar-title { padding-top: 6px; font-size: 13px; + max-width: 92%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index 4ee136930..cbe6fca1e 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -279,6 +279,7 @@ body { .adaption { display: flex; align-items: center; + overflow-x: auto; .ivu-btn { height: 38px; diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index bb574b468..241f6f700 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -64,7 +64,8 @@ align-items: center; justify-content: space-evenly; padding: 2px 0 12px; - > p { + > div { + max-width: 25%; position: relative; line-height: 1; padding: 0 6px; @@ -76,6 +77,11 @@ right: -8px; transform: scale(0.7); } + .nav-title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } &.active { color: #555555; font-weight: 500; diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss index 32a65fd56..0ba0f54c6 100755 --- a/resources/assets/sass/pages/page-setting.scss +++ b/resources/assets/sass/pages/page-setting.scss @@ -44,8 +44,14 @@ padding: 0 20px; margin: 5px 0; position: relative; - display: flex; - align-items: center; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + + &.flex { + display: flex; + align-items: center; + } .ivu-badge { transform: scale(0.8); @@ -154,6 +160,12 @@ height: 34px; line-height: 32px; min-width: 94px; + > span { + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } } .setting-auto-day {