diff --git a/.DS_Store b/.DS_Store index 5008ddf..184911d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/common/css/reset.scss b/common/css/reset.scss index c3a30e0..2178bac 100644 --- a/common/css/reset.scss +++ b/common/css/reset.scss @@ -24,6 +24,68 @@ form { display: block; } +view, +image, +text { + box-sizing: border-box; + flex-shrink: 0; +} + +.flex-row { + display: flex; + flex-direction: row; +} + +.flex-col { + display: flex; + flex-direction: column; +} + +.justify-start { + display: flex; + justify-content: flex-start; +} + +.justify-center { + display: flex; + justify-content: center; +} + +.justify-end { + display: flex; + justify-content: flex-end; +} + +.justify-evenly { + display: flex; + justify-content: space-evenly; +} + +.justify-around { + display: flex; + justify-content: space-around; +} + +.justify-between { + display: flex; + justify-content: space-between; +} + +.items-start { + display: flex; + align-items: flex-start; +} + +.items-center { + display: flex; + align-items: center; +} + +.items-end { + display: flex; + align-items: flex-end; +} + cover-view { line-height: 1.5; white-space: normal; diff --git a/pages.json b/pages.json index b812eea..43b3238 100644 --- a/pages.json +++ b/pages.json @@ -65,7 +65,7 @@ "enablePullDownRefresh": false, "navigationStyle": "custom", "app-plus": { - "softinputMode": "adjustResize" + "softinputMode": "adjustPan" } } }, diff --git a/pages/login/index.vue b/pages/login/index.vue index 1827263..38ab9c3 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -1,5 +1,5 @@