Merge pull request #203 from react-component/ux-year-panel

css: improve UX, close: ant-design/ant-design#4415
react-component · Jan 11, 2017 · cc32910 · cc32910
2 parents bb94d60 + 25b648f
commit cc32910
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 33 deletions.
diff --git a/assets/index/DecadePanel.less b/assets/index/DecadePanel.less
@@ -107,16 +107,6 @@
   .@{prefixClass}-decade-panel-decade{
     user-select: none;
     -webkit-user-select: none;
-  }
-  .@{prefixClass}-decade-panel-decade:before {
-    content: ">";
-    font-family: "iconfont" !important;
-  }
-}
-
-.@{prefixClass}-decade-panel-last-century-cell {
-  .@{prefixClass}-decade-panel-decade {
-    transform: rotate(180deg);
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+    color: rgba(0, 0, 0, 0.25);
   }
 }
diff --git a/assets/index/YearPanel.less b/assets/index/YearPanel.less
@@ -117,16 +117,6 @@
   .@{prefixClass}-year-panel-year{
     user-select: none;
     -webkit-user-select: none;
-  }
-  .@{prefixClass}-year-panel-year:before {
-    content: ">";
-    font-family: "iconfont" !important;
-  }
-}
-
-.@{prefixClass}-year-panel-last-decade-cell {
-  .@{prefixClass}-year-panel-year {
-    transform: rotate(180deg);
-    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+    color: rgba(0, 0, 0, 0.25);
   }
 }
diff --git a/src/decade/DecadePanel.jsx b/src/decade/DecadePanel.jsx
@@ -69,14 +69,13 @@ class DecadePanel extends React.Component {
           [`${prefixCls}-last-century-cell`]: isLast,
           [`${prefixCls}-next-century-cell`]: isNext,
         };
-        let content;
+        const content = `${dStartDecade}-${dEndDecade}`;
         let clickHandler;
         if (isLast) {
           clickHandler = this.previousCentury;
         } else if (isNext) {
           clickHandler = this.nextCentury;
         } else {
-          content = `${dStartDecade}-${dEndDecade}`;
           clickHandler = chooseDecade.bind(this, dStartDecade);
         }
         return (<td

diff --git a/src/year/YearPanel.jsx b/src/year/YearPanel.jsx
@@ -46,21 +46,13 @@ class YearPanel extends React.Component {
     const currentYear = value.year();
     const startYear = parseInt(currentYear / 10, 10) * 10;
     const previousYear = startYear - 1;
-    const endYear = startYear + 9;
     const years = [];
     let index = 0;
     for (let rowIndex = 0; rowIndex < ROW; rowIndex++) {
       years[rowIndex] = [];
       for (let colIndex = 0; colIndex < COL; colIndex++) {
         const year = previousYear + index;
-        let content;
-        if (year < startYear) {
-          content = '';
-        } else if (year > endYear) {
-          content = '';
-        } else {
-          content = String(year);
-        }
+        const content = String(year);
         years[rowIndex][colIndex] = {
           content,
           year,