Sfoglia il codice sorgente

Fix pageHeader responsive issue

afc163 8 anni fa
parent
commit
74b4f30faa
2 ha cambiato i file con 25 aggiunte e 30 eliminazioni
  1. 6 6
      src/routes/Dashboard/Workplace.js
  2. 19 24
      src/routes/Dashboard/Workplace.less

+ 6 - 6
src/routes/Dashboard/Workplace.js

@@ -148,17 +148,17 @@ export default class Workplace extends PureComponent {
       </div>
       </div>
     );
     );
 
 
-    const pageHeaderExtra = (
-      <div className={styles.pageHeaderExtra}>
-        <div>
+    const extraContent = (
+      <div className={styles.extraContent}>
+        <div className={styles.statItem}>
           <p>项目数</p>
           <p>项目数</p>
           <p>56</p>
           <p>56</p>
         </div>
         </div>
-        <div>
+        <div className={styles.statItem}>
           <p>团队内排名</p>
           <p>团队内排名</p>
           <p>8<span> / 24</span></p>
           <p>8<span> / 24</span></p>
         </div>
         </div>
-        <div>
+        <div className={styles.statItem}>
           <p>项目访问</p>
           <p>项目访问</p>
           <p>2,223</p>
           <p>2,223</p>
         </div>
         </div>
@@ -168,7 +168,7 @@ export default class Workplace extends PureComponent {
     return (
     return (
       <PageHeaderLayout
       <PageHeaderLayout
         content={pageHeaderContent}
         content={pageHeaderContent}
-        extraContent={pageHeaderExtra}
+        extraContent={extraContent}
       >
       >
         <Row gutter={24}>
         <Row gutter={24}>
           <Col xl={16} lg={24} md={24} sm={24} xs={24}>
           <Col xl={16} lg={24} md={24} sm={24} xs={24}>

+ 19 - 24
src/routes/Dashboard/Workplace.less

@@ -40,25 +40,26 @@
   }
   }
 }
 }
 
 
-.pageHeaderExtra {
+.extraContent {
   .clearfix();
   .clearfix();
   float: right;
   float: right;
-  & > div {
+  white-space: nowrap;
+  .statItem {
     padding: 0 32px;
     padding: 0 32px;
     position: relative;
     position: relative;
-    float: left;
-    & > p:first-child {
+    display: inline-block;
+    > p:first-child {
       color: @text-color-secondary;
       color: @text-color-secondary;
       font-size: @font-size-base;
       font-size: @font-size-base;
       line-height: 22px;
       line-height: 22px;
       margin-bottom: 4px;
       margin-bottom: 4px;
     }
     }
-    & > p {
+    > p {
       color: @heading-color;
       color: @heading-color;
       font-size: 30px;
       font-size: 30px;
       line-height: 38px;
       line-height: 38px;
       margin: 0;
       margin: 0;
-      & > span {
+      > span {
         color: @text-color-secondary;
         color: @text-color-secondary;
         font-size: 20px;
         font-size: 20px;
       }
       }
@@ -72,11 +73,11 @@
       height: 40px;
       height: 40px;
       content: '';
       content: '';
     }
     }
-  }
-  & > div:last-child {
-    padding-right: 0;
-    &:after {
-      display: none;
+    &:last-child {
+      padding-right: 0;
+      &:after {
+        display: none;
+      }
     }
     }
   }
   }
 }
 }
@@ -163,12 +164,6 @@
   color: @disabled-color;
   color: @disabled-color;
 }
 }
 
 
-@media screen and (min-width: @screen-xl) {
-  .pageHeaderExtra {
-    min-width: 345px;
-  }
-}
-
 @media screen and (max-width: @screen-xl)  and (min-width: @screen-lg) {
 @media screen and (max-width: @screen-xl)  and (min-width: @screen-lg) {
   .activeCard {
   .activeCard {
     margin-bottom: 24px;
     margin-bottom: 24px;
@@ -176,9 +171,9 @@
   .members {
   .members {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .pageHeaderExtra {
+  .extraContent {
     margin-left: -44px;
     margin-left: -44px;
-    & > div {
+    .statItem {
       padding: 0 16px;
       padding: 0 16px;
     }
     }
   }
   }
@@ -191,10 +186,10 @@
   .members {
   .members {
     margin-bottom: 0;
     margin-bottom: 0;
   }
   }
-  .pageHeaderExtra {
+  .extraContent {
     float: none;
     float: none;
     margin-right: 0;
     margin-right: 0;
-    & > div {
+    .statItem {
       padding: 0 16px;
       padding: 0 16px;
       text-align: left;
       text-align: left;
       &:after {
       &:after {
@@ -205,7 +200,7 @@
 }
 }
 
 
 @media screen and (max-width: @screen-md) {
 @media screen and (max-width: @screen-md) {
-  .pageHeaderExtra {
+  .extraContent {
     margin-left: -16px;
     margin-left: -16px;
   }
   }
   .projectList {
   .projectList {
@@ -222,8 +217,8 @@
       margin-left: 0;
       margin-left: 0;
     }
     }
   }
   }
-  .pageHeaderExtra {
-    & > div {
+  .extraContent {
+    .statItem {
       float: none;
       float: none;
     }
     }
   }
   }