This commit is contained in:
afc163
2015-07-22 21:02:45 +08:00
parent b4a4823f6b
commit 7f71f460da
15 changed files with 117 additions and 101 deletions
+31 -28
View File
@@ -3560,11 +3560,11 @@ fieldset[disabled] .ant-btn-ghost.active {
top: 1px;
right: 1px;
display: inline-block;
font-size: 0.83333333;
font-size: 10px \9;
-webkit-transform: scale(0.83333333);
-ms-transform: scale(0.83333333);
transform: scale(0.83333333);
font-size: 0.66666667;
font-size: 8px \9;
-webkit-transform: scale(0.66666667);
-ms-transform: scale(0.66666667);
transform: scale(0.66666667);
width: 26px;
line-height: 26px;
}
@@ -3603,10 +3603,12 @@ fieldset[disabled] .ant-btn-ghost.active {
-moz-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
}
.ant-select-selection:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-select-selection:active {
border-color: #2baee9;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
.ant-select-disabled {
color: #ccc;
@@ -3722,6 +3724,9 @@ fieldset[disabled] .ant-btn-ghost.active {
.ant-select-selection--multiple .ant-select-selection__choice__remove:before {
content: "\e61e";
}
.ant-select .ant-select-selection--single + .ant-select-dropdown .ant-select-dropdown-menu-item-selected {
background-color: #eaf8fe !important;
}
.ant-select .ant-select-selection--multiple + .ant-select-dropdown .ant-select-dropdown-menu-item {
padding: 7px 33px 7px 16px;
}
@@ -3741,7 +3746,6 @@ fieldset[disabled] .ant-btn-ghost.active {
position: absolute;
top: 6px;
right: 0;
background: #eaf8fe;
padding-right: 16px;
color: #2db7f5;
}
@@ -3784,8 +3788,7 @@ fieldset[disabled] .ant-btn-ghost.active {
cursor: pointer;
}
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item:hover,
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-active,
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-selected {
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-active {
background-color: #eaf8fe !important;
}
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-disabled {
@@ -3831,7 +3834,7 @@ fieldset[disabled] .ant-btn-ghost.active {
transform: rotate(270deg);
}
.ant-select-open .ant-select-selection {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -3897,7 +3900,7 @@ fieldset[disabled] .ant-btn-ghost.active {
display: block;
}
.ant-calendar-picker-open .ant-calendar-picker-input {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -4243,10 +4246,10 @@ fieldset[disabled] .ant-calendar .ant-calendar-ok-btn.active {
color: #cccccc;
}
.ant-calendar-time-input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-calendar-time-input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -4258,7 +4261,7 @@ fieldset[disabled] .ant-calendar-time-input {
}
.ant-calendar-time-input[disabled]:hover,
fieldset[disabled] .ant-calendar-time-input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-calendar-time-input {
height: auto;
@@ -5858,10 +5861,10 @@ textarea.ant-calendar-time-input {
color: #cccccc;
}
.ant-pagination-options-quick-jumper input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-pagination-options-quick-jumper input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -5873,7 +5876,7 @@ fieldset[disabled] .ant-pagination-options-quick-jumper input {
}
.ant-pagination-options-quick-jumper input[disabled]:hover,
fieldset[disabled] .ant-pagination-options-quick-jumper input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-pagination-options-quick-jumper input {
height: auto;
@@ -6051,10 +6054,10 @@ label > .anticon {
color: #cccccc;
}
.ant-input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6066,7 +6069,7 @@ fieldset[disabled] .ant-input {
}
.ant-input[disabled]:hover,
fieldset[disabled] .ant-input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-input {
height: auto;
@@ -6688,10 +6691,10 @@ form .ant-calendar-picker {
color: #cccccc;
}
.ant-input-number:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input-number:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6703,7 +6706,7 @@ fieldset[disabled] .ant-input-number {
}
.ant-input-number[disabled]:hover,
fieldset[disabled] .ant-input-number:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-input-number {
height: auto;
@@ -6765,10 +6768,10 @@ textarea.ant-input-number {
font-size: 12px;
}
.ant-input-number:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input-number-focused {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6778,7 +6781,7 @@ textarea.ant-input-number {
cursor: not-allowed;
}
.ant-input-number-disabled:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
.ant-input-number-input-wrap {
overflow: hidden;
@@ -6804,7 +6807,7 @@ textarea.ant-input-number {
cursor: not-allowed;
}
.ant-input-number-input[disabled]:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
.ant-input-number-handler-wrap {
float: right;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+31 -28
View File
@@ -3560,11 +3560,11 @@ fieldset[disabled] .ant-btn-ghost.active {
top: 1px;
right: 1px;
display: inline-block;
font-size: 0.83333333;
font-size: 10px \9;
-webkit-transform: scale(0.83333333);
-ms-transform: scale(0.83333333);
transform: scale(0.83333333);
font-size: 0.66666667;
font-size: 8px \9;
-webkit-transform: scale(0.66666667);
-ms-transform: scale(0.66666667);
transform: scale(0.66666667);
width: 26px;
line-height: 26px;
}
@@ -3603,10 +3603,12 @@ fieldset[disabled] .ant-btn-ghost.active {
-moz-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
}
.ant-select-selection:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-select-selection:active {
border-color: #2baee9;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
.ant-select-disabled {
color: #ccc;
@@ -3722,6 +3724,9 @@ fieldset[disabled] .ant-btn-ghost.active {
.ant-select-selection--multiple .ant-select-selection__choice__remove:before {
content: "\e61e";
}
.ant-select .ant-select-selection--single + .ant-select-dropdown .ant-select-dropdown-menu-item-selected {
background-color: #eaf8fe !important;
}
.ant-select .ant-select-selection--multiple + .ant-select-dropdown .ant-select-dropdown-menu-item {
padding: 7px 33px 7px 16px;
}
@@ -3741,7 +3746,6 @@ fieldset[disabled] .ant-btn-ghost.active {
position: absolute;
top: 6px;
right: 0;
background: #eaf8fe;
padding-right: 16px;
color: #2db7f5;
}
@@ -3784,8 +3788,7 @@ fieldset[disabled] .ant-btn-ghost.active {
cursor: pointer;
}
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item:hover,
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-active,
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-selected {
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-active {
background-color: #eaf8fe !important;
}
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-disabled {
@@ -3831,7 +3834,7 @@ fieldset[disabled] .ant-btn-ghost.active {
transform: rotate(270deg);
}
.ant-select-open .ant-select-selection {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -3897,7 +3900,7 @@ fieldset[disabled] .ant-btn-ghost.active {
display: block;
}
.ant-calendar-picker-open .ant-calendar-picker-input {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -4243,10 +4246,10 @@ fieldset[disabled] .ant-calendar .ant-calendar-ok-btn.active {
color: #cccccc;
}
.ant-calendar-time-input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-calendar-time-input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -4258,7 +4261,7 @@ fieldset[disabled] .ant-calendar-time-input {
}
.ant-calendar-time-input[disabled]:hover,
fieldset[disabled] .ant-calendar-time-input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-calendar-time-input {
height: auto;
@@ -5858,10 +5861,10 @@ textarea.ant-calendar-time-input {
color: #cccccc;
}
.ant-pagination-options-quick-jumper input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-pagination-options-quick-jumper input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -5873,7 +5876,7 @@ fieldset[disabled] .ant-pagination-options-quick-jumper input {
}
.ant-pagination-options-quick-jumper input[disabled]:hover,
fieldset[disabled] .ant-pagination-options-quick-jumper input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-pagination-options-quick-jumper input {
height: auto;
@@ -6051,10 +6054,10 @@ label > .anticon {
color: #cccccc;
}
.ant-input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6066,7 +6069,7 @@ fieldset[disabled] .ant-input {
}
.ant-input[disabled]:hover,
fieldset[disabled] .ant-input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-input {
height: auto;
@@ -6688,10 +6691,10 @@ form .ant-calendar-picker {
color: #cccccc;
}
.ant-input-number:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input-number:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6703,7 +6706,7 @@ fieldset[disabled] .ant-input-number {
}
.ant-input-number[disabled]:hover,
fieldset[disabled] .ant-input-number:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-input-number {
height: auto;
@@ -6765,10 +6768,10 @@ textarea.ant-input-number {
font-size: 12px;
}
.ant-input-number:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input-number-focused {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6778,7 +6781,7 @@ textarea.ant-input-number {
cursor: not-allowed;
}
.ant-input-number-disabled:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
.ant-input-number-input-wrap {
overflow: hidden;
@@ -6804,7 +6807,7 @@ textarea.ant-input-number {
cursor: not-allowed;
}
.ant-input-number-input[disabled]:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
.ant-input-number-handler-wrap {
float: right;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -1
View File
@@ -78,7 +78,7 @@ return /******/ (function(modules) { // webpackBootstrap
return searchData.map(function (s) {
return React.createElement(
Option,
{ sData: s, key: s.title },
{ sData: s, key: s.title, text: '跳转到 ' + s.title },
React.createElement(
'strong',
null,
@@ -109,6 +109,7 @@ return /******/ (function(modules) { // webpackBootstrap
Select,
{ combobox: true, style: { width: 200 },
onSelect: this.handleSelect,
optionLabelProp: 'text',
dropdownMenuStyle: { maxHeight: 200, overflow: 'auto' },
searchPlaceholder: '搜索组件...',
renderDropdownToBody: true,
+1 -1
View File
File diff suppressed because one or more lines are too long
+31 -28
View File
@@ -3560,11 +3560,11 @@ fieldset[disabled] .ant-btn-ghost.active {
top: 1px;
right: 1px;
display: inline-block;
font-size: 0.83333333;
font-size: 10px \9;
-webkit-transform: scale(0.83333333);
-ms-transform: scale(0.83333333);
transform: scale(0.83333333);
font-size: 0.66666667;
font-size: 8px \9;
-webkit-transform: scale(0.66666667);
-ms-transform: scale(0.66666667);
transform: scale(0.66666667);
width: 26px;
line-height: 26px;
}
@@ -3603,10 +3603,12 @@ fieldset[disabled] .ant-btn-ghost.active {
-moz-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
}
.ant-select-selection:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-select-selection:active {
border-color: #2baee9;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
.ant-select-disabled {
color: #ccc;
@@ -3722,6 +3724,9 @@ fieldset[disabled] .ant-btn-ghost.active {
.ant-select-selection--multiple .ant-select-selection__choice__remove:before {
content: "\e61e";
}
.ant-select .ant-select-selection--single + .ant-select-dropdown .ant-select-dropdown-menu-item-selected {
background-color: #eaf8fe !important;
}
.ant-select .ant-select-selection--multiple + .ant-select-dropdown .ant-select-dropdown-menu-item {
padding: 7px 33px 7px 16px;
}
@@ -3741,7 +3746,6 @@ fieldset[disabled] .ant-btn-ghost.active {
position: absolute;
top: 6px;
right: 0;
background: #eaf8fe;
padding-right: 16px;
color: #2db7f5;
}
@@ -3784,8 +3788,7 @@ fieldset[disabled] .ant-btn-ghost.active {
cursor: pointer;
}
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item:hover,
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-active,
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-selected {
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-active {
background-color: #eaf8fe !important;
}
.ant-select-dropdown-menu > .ant-select-dropdown-menu-item-disabled {
@@ -3831,7 +3834,7 @@ fieldset[disabled] .ant-btn-ghost.active {
transform: rotate(270deg);
}
.ant-select-open .ant-select-selection {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -3897,7 +3900,7 @@ fieldset[disabled] .ant-btn-ghost.active {
display: block;
}
.ant-calendar-picker-open .ant-calendar-picker-input {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -4243,10 +4246,10 @@ fieldset[disabled] .ant-calendar .ant-calendar-ok-btn.active {
color: #cccccc;
}
.ant-calendar-time-input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-calendar-time-input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -4258,7 +4261,7 @@ fieldset[disabled] .ant-calendar-time-input {
}
.ant-calendar-time-input[disabled]:hover,
fieldset[disabled] .ant-calendar-time-input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-calendar-time-input {
height: auto;
@@ -5858,10 +5861,10 @@ textarea.ant-calendar-time-input {
color: #cccccc;
}
.ant-pagination-options-quick-jumper input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-pagination-options-quick-jumper input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -5873,7 +5876,7 @@ fieldset[disabled] .ant-pagination-options-quick-jumper input {
}
.ant-pagination-options-quick-jumper input[disabled]:hover,
fieldset[disabled] .ant-pagination-options-quick-jumper input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-pagination-options-quick-jumper input {
height: auto;
@@ -6051,10 +6054,10 @@ label > .anticon {
color: #cccccc;
}
.ant-input:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6066,7 +6069,7 @@ fieldset[disabled] .ant-input {
}
.ant-input[disabled]:hover,
fieldset[disabled] .ant-input:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-input {
height: auto;
@@ -6688,10 +6691,10 @@ form .ant-calendar-picker {
color: #cccccc;
}
.ant-input-number:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input-number:focus {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6703,7 +6706,7 @@ fieldset[disabled] .ant-input-number {
}
.ant-input-number[disabled]:hover,
fieldset[disabled] .ant-input-number:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
textarea.ant-input-number {
height: auto;
@@ -6765,10 +6768,10 @@ textarea.ant-input-number {
font-size: 12px;
}
.ant-input-number:hover {
border-color: #2db7f5;
border-color: #57c5f7;
}
.ant-input-number-focused {
border-color: #2db7f5;
border-color: #57c5f7;
outline: 0;
box-shadow: 0 0 0 2px #d5f1fd;
}
@@ -6778,7 +6781,7 @@ textarea.ant-input-number {
cursor: not-allowed;
}
.ant-input-number-disabled:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
.ant-input-number-input-wrap {
overflow: hidden;
@@ -6804,7 +6807,7 @@ textarea.ant-input-number {
cursor: not-allowed;
}
.ant-input-number-input[disabled]:hover {
border-color: #d9d9d9;
border-color: #e1e1e1;
}
.ant-input-number-handler-wrap {
float: right;
+2 -1
View File
@@ -15,7 +15,7 @@ $(function () {
var AutoComplete = React.createClass({
getOptions() {
return searchData.map(function (s) {
return <Option sData={s} key={s.title}>
return <Option sData={s} key={s.title} text={'跳转到 ' + s.title}>
<strong>{s.title}</strong>
&nbsp;
<span>{s.desc}</span>
@@ -36,6 +36,7 @@ $(function () {
render() {
return <Select combobox style={{width: 200}}
onSelect={this.handleSelect}
optionLabelProp="text"
dropdownMenuStyle={{maxHeight: 200, overflow: 'auto'}}
searchPlaceholder="搜索组件..."
renderDropdownToBody={true}
+10 -5
View File
@@ -18,7 +18,7 @@
position: absolute;
top: 6px;
right: 0;
background: tint(@primary-color, 90%);
//background: tint(@primary-color, 90%);
padding-right: 16px;
color: @primary-color;
}
@@ -51,7 +51,7 @@
position: absolute;
top: 1px;
right: 1px;
.iconfont-size-under-12px(10px);
.iconfont-size-under-12px(8px);
width: 26px;
line-height: 26px;
@@ -81,10 +81,10 @@
.transition(all .3s @ease-in-out);
&:hover {
border-color: @primary-color;
.hover;
}
&:active {
border-color: shade(@primary-color, 5%);
.active;
}
}
@@ -202,6 +202,11 @@
}
}
.@{selectPrefixCls}-selection--single + .@{selectPrefixCls}-dropdown {
.@{selectPrefixCls}-dropdown-menu-item-selected {
background-color: tint(@primary-color, 90%) !important;
}
}
.@{selectPrefixCls}-selection--multiple + .@{selectPrefixCls}-dropdown {
.@{selectPrefixCls}-dropdown-menu-item {
padding: 7px 33px 7px 16px;
@@ -247,7 +252,7 @@
white-space: nowrap;
cursor: pointer;
&:hover, &-active, &-selected {
&:hover, &-active {
background-color: tint(@primary-color, 90%) !important;
}
+2 -2
View File
@@ -14,14 +14,14 @@
// input status
// == when focus or actived
.active(@color: @input-hover-border-color) {
border-color: @color;
border-color: tint(@color, 20%);
outline: 0;
box-shadow: 0 0 0 2px tint(@color, 80%);
}
// == when hoverd
.hover(@color: @input-hover-border-color ) {
border-color: @color;
border-color: tint(@color, 20%);
}
.disabled() {