Merge branch 'develop' into 'test'

'按钮样式' See merge request !154

Merge branch 'develop' into 'test'
0c8b0deb · 姜雷 · 0e6a29f2 · 037e6c04 · 0c8b0deb
Commit 0c8b0deb authored Jun 12, 2019 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

index.scss src/assets/styles/index.scss +6 -0

No files found.
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -100,6 +100,12 @@ body {
 .el-button {
  padding: 0 8px;
 }
+
+.device-footer-btn {
+  flex: 1;
+  padding-left: 20px;
+}
+
 @media screen and (min-width: $bigScreenWidth) {
  #app {
    font-size: 14px;