ZZJ
2021-10-09 af2924fb5678f9dd72a210aeec230ae019823a43
zzjv2.1
1个文件已修改
24 ■■■■■ 已修改文件
src/pages/settings/views/generalSettings.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/settings/views/generalSettings.vue
@@ -665,28 +665,7 @@
      }
      .bar-group {
        overflow: auto;
<<<<<<< HEAD
        height: 400px;
      }
      .bar {
        height: 48px;
        background-color: #f8f8f8;
        border-radius: 10px;
        line-height: 48px;
        box-sizing: border-box;
        padding: 0 20px 0 20px;
        font-weight: 700;
        display: flex;
        justify-content: space-between;
        margin-bottom: 2px;
        border: 2px solid #fff;
        .name {
          font-size: 14px;
        }
        .btns {
          width: 52px;
=======
        height: 520px;
        height: calc(100% - 132px);
        .general-bar {
          height: 48px;
          background-color: #f8f8f8;
@@ -695,7 +674,6 @@
          box-sizing: border-box;
          padding: 0 20px 0 20px;
          font-weight: 700;
>>>>>>> 0892efe5131551631fe287cfda29e59e4f2f6707
          display: flex;
          justify-content: space-between;
          margin-bottom: 2px;