Browse Source

修复主tabs样式冲突内容tabs bug.

daxiong.yang 7 years ago
parent
commit
8a9b0f9430
2 changed files with 23 additions and 23 deletions
  1. 22 22
      src/assets/scss/_base.scss
  2. 1 1
      static/config/index.js

+ 22 - 22
src/assets/scss/_base.scss

317
  &--tabs {
317
  &--tabs {
318
    padding: 55px 0 0;
318
    padding: 55px 0 0;
319
  }
319
  }
320
  .site-tabs__tools {
321
    position: fixed;
322
    top: 50px;
323
    right: 0;
324
    z-index: 931;
325
    height: 40px;
326
    padding: 0 12px;
327
    font-size: 16px;
328
    line-height: 40px;
329
    background-color: $content--background-color;
330
    cursor: pointer;
331
    .el-icon--right {
332
      margin-left: 0;
333
    }
334
  }
335
  > .el-tabs {
320
  > .el-tabs {
336
    .el-tabs__header {
321
    > .el-tabs__header {
337
      position: fixed;
322
      position: fixed;
338
      top: 50px;
323
      top: 50px;
339
      left: 230px;
324
      left: 230px;
342
      padding: 0 55px 0 15px;
327
      padding: 0 55px 0 15px;
343
      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px 0 rgba(0, 0, 0, .04);
328
      box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .12), 0 0 6px 0 rgba(0, 0, 0, .04);
344
      background-color: #fff;
329
      background-color: #fff;
345
    }
346
    .el-tabs__nav-wrap {
347
      margin-bottom: 0;
348
      &:after {
349
        display: none;
330
      > .el-tabs__nav-wrap {
331
        margin-bottom: 0;
332
        &:after {
333
          display: none;
334
        }
350
      }
335
      }
351
    }
336
    }
352
    .el-tabs__content {
337
    > .el-tabs__content {
353
      padding: 0 15px 15px;
338
      padding: 0 15px 15px;
339
      > .site-tabs__tools {
340
        position: fixed;
341
        top: 50px;
342
        right: 0;
343
        z-index: 931;
344
        height: 40px;
345
        padding: 0 12px;
346
        font-size: 16px;
347
        line-height: 40px;
348
        background-color: $content--background-color;
349
        cursor: pointer;
350
        .el-icon--right {
351
          margin-left: 0;
352
        }
353
      }
354
    }
354
    }
355
  }
355
  }
356
}
356
}

+ 1 - 1
static/config/index.js

4
;(function () {
4
;(function () {
5
  window.SITE_CONFIG = {}
5
  window.SITE_CONFIG = {}
6
  // api接口请求地址
6
  // api接口请求地址
7
  window.SITE_CONFIG.baseUrl = '//dev.demo.renren.io/renren-fast'
7
  window.SITE_CONFIG.baseUrl = '//demo.renren.io/renren-fast'
8
8
9
  // 嵌套iframe地址
9
  // 嵌套iframe地址
10
  window.SITE_CONFIG.nestIframeUrl = '//demo.renren.io/renren-fast/'
10
  window.SITE_CONFIG.nestIframeUrl = '//demo.renren.io/renren-fast/'