From 8133e8cf3b37b2be764616493ade7c7a7678fce1 Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Fri, 27 Nov 2015 16:15:05 +0800
Subject: add gregorianCalendarLocale prop

---
 assets/index.less          | 11 +----------
 assets/index/Combobox.less |  4 ----
 assets/index/Header.less   |  7 +------
 assets/index/Panel.less    | 38 ++++++++++++++++++++++++--------------
 assets/index/Picker.less   | 42 ++++++++++++++++--------------------------
 assets/index/Select.less   | 12 ++++++------
 6 files changed, 48 insertions(+), 66 deletions(-)
 delete mode 100644 assets/index/Combobox.less

(limited to 'assets')

diff --git a/assets/index.less b/assets/index.less
index 36156cb..f4caf00 100644
--- a/assets/index.less
+++ b/assets/index.less
@@ -1,23 +1,14 @@
 @prefixClass: rc-time-picker;
 
 .@{prefixClass} {
-  display: inline;
+  display: inline-block;
   box-sizing: border-box;
   * {
     box-sizing: border-box;
   }
 }
 
-@font-face {
-  font-family: 'anticon';
-  src: url('//at.alicdn.com/t/font_1434092639_4910953.eot');
-  /* IE9*/
-  src: url('//at.alicdn.com/t/font_1434092639_4910953.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('//at.alicdn.com/t/font_1434092639_4910953.woff') format('woff'), /* chrome、firefox */ url('//at.alicdn.com/t/font_1434092639_4910953.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('//at.alicdn.com/t/font_1434092639_4910953.svg#iconfont') format('svg');
-  /* iOS 4.1- */
-}
-
 @import "./index/Picker";
 @import "./index/Panel";
 @import "./index/Header";
-@import "./index/Combobox";
 @import "./index/Select";
diff --git a/assets/index/Combobox.less b/assets/index/Combobox.less
deleted file mode 100644
index a796d0a..0000000
--- a/assets/index/Combobox.less
+++ /dev/null
@@ -1,4 +0,0 @@
-.@{prefixClass} {
-  &-combobox {
-  }
-}
diff --git a/assets/index/Header.less b/assets/index/Header.less
index ac3d662..7ad3d9f 100644
--- a/assets/index/Header.less
+++ b/assets/index/Header.less
@@ -1,8 +1,7 @@
-.@{prefixClass} {
+.@{prefixClass}-panel {
   &-input {
     margin: 0;
     padding: 0;
-    border: 0;
     width: 100%;
     cursor: auto;
     line-height: 1.5;
@@ -48,7 +47,3 @@
     color: #666;
   }
 }
-
-.narrow .@{prefixClass}-input-wrap {
-  max-width: 111px;
-}
diff --git a/assets/index/Panel.less b/assets/index/Panel.less
index a11c4aa..be7914f 100644
--- a/assets/index/Panel.less
+++ b/assets/index/Panel.less
@@ -1,15 +1,25 @@
-.@{prefixClass}-panel-inner {
-  display: inline-block;
-  position: relative;
-  outline: none;
-  border: 1px solid #ccc;
-  list-style: none;
-  font-size: 12px;
-  text-align: left;
-  background-color: #fff;
-  border-radius: 3px;
-  box-shadow: 0 1px 5px #ccc;
-  background-clip: padding-box;
-  border: 1px solid #ccc;
-  line-height: 1.5;
+.@{prefixClass}-panel {
+  z-index: 1070;
+  width: 170px;
+  position: absolute;
+  box-sizing: border-box;
+
+  * {
+    box-sizing: border-box;
+  }
+
+  &-inner {
+    display: inline-block;
+    position: relative;
+    outline: none;
+    list-style: none;
+    font-size: 12px;
+    text-align: left;
+    background-color: #fff;
+    border-radius: 3px;
+    box-shadow: 0 1px 5px #ccc;
+    background-clip: padding-box;
+    border: 1px solid #ccc;
+    line-height: 1.5;
+  }
 }
diff --git a/assets/index/Picker.less b/assets/index/Picker.less
index dc1fbbd..76bf834 100644
--- a/assets/index/Picker.less
+++ b/assets/index/Picker.less
@@ -1,28 +1,18 @@
-.@{prefixClass}-panel {
-  z-index: 1070;
-  position: absolute;
-
-  &.slide-up-enter.slide-up-enter-active&-placement-topLeft,
-  &.slide-up-enter.slide-up-enter-active&-placement-topRight,
-  &.slide-up-appear.slide-up-appear-active&-placement-topLeft,
-  &.slide-up-appear.slide-up-appear-active&-placement-topRight {
-    animation-name: antSlideDownIn;
-  }
-
-  &.slide-up-enter.slide-up-enter-active&-placement-bottomLeft,
-  &.slide-up-enter.slide-up-enter-active&-placement-bottomRight,
-  &.slide-up-appear.slide-up-appear-active&-placement-bottomLeft,
-  &.slide-up-appear.slide-up-appear-active&-placement-bottomRight {
-    animation-name: antSlideUpIn;
-  }
-
-  &.slide-up-leave.slide-up-leave-active&-placement-topLeft,
-  &.slide-up-leave.slide-up-leave-active&-placement-topRight {
-    animation-name: antSlideDownOut;
-  }
-
-  &.slide-up-leave.slide-up-leave-active&-placement-bottomLeft,
-  &.slide-up-leave.slide-up-leave-active&-placement-bottomRight {
-    animation-name: antSlideUpOut;
+.@{prefixClass} {
+  &-input {
+    width: 100%;
+    position: relative;
+    display: inline-block;
+    padding: 4px 7px;
+    height: 28px;
+    cursor: text;
+    font-size: 12px;
+    line-height: 1.5;
+    color: #666;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #d9d9d9;
+    border-radius: 6px;
+    transition: border .2s cubic-bezier(0.645, 0.045, 0.355, 1), background .2s cubic-bezier(0.645, 0.045, 0.355, 1), box-shadow .2s cubic-bezier(0.645, 0.045, 0.355, 1);
   }
 }
diff --git a/assets/index/Select.less b/assets/index/Select.less
index 995d09e..e93e8f7 100644
--- a/assets/index/Select.less
+++ b/assets/index/Select.less
@@ -1,4 +1,4 @@
-.@{prefixClass}-select {
+.@{prefixClass}-panel-select {
   float: left;
   overflow-y:auto;
   font-size: 12px;
@@ -38,13 +38,13 @@
     cursor: pointer;
     user-select: none;
 
-    &.selected {
-      background: #edfaff;
-      color: #2db7f5;
-    }
-
     &:hover {
       background: #edfaff;
     }
   }
+
+  &-option-selected {
+    background: #edfaff;
+    color: #2db7f5;
+  }
 }
-- 
cgit v1.2.3