github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1577 from QingWei-Li/timepicker/remove-flex 

TimeSelect: remove flexbox style, fixed #1335
pull/1581/head
baiyaaaaa 2016-12-06 18:24:30 +08:00 committed by GitHub
parent 8fe68e5385 929e7f2554
commit 8a245d6ba0
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/theme-default/src/date-picker/time-picker.css
View File

@ -15,7 +15,6 @@
@e content { @e content {
font-size: 0; font-size: 0;
display: flex;
position: relative; position: relative;
overflow: hidden; overflow: hidden;

5
packages/theme-default/src/date-picker/time-range-picker.css
View File

@ -9,14 +9,14 @@
position: relative; position: relative;
text-align: center; text-align: center;
padding: 10px; padding: 10px;
display: flex;
} }
@e cell { @e cell {
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
padding: 4px 7px 7px; padding: 4px 7px 7px;
flex: 1; width: 50%;
display: inline-block;
} }
@e header { @e header {
@ -26,7 +26,6 @@
} }
@e body { @e body {
display: flex;
border-radius:2px; border-radius:2px;
border: 1px solid var(--datepicker-border-color); border: 1px solid var(--datepicker-border-color);
} }

3
packages/theme-default/src/date-picker/time-spinner.css
View File

@ -5,7 +5,8 @@
@e wrapper { @e wrapper {
height: 190px; height: 190px;
overflow: hidden; overflow: hidden;
flex: 1; display: inline-block;
width: calc(100% / 3);
vertical-align: top; vertical-align: top;
position: relative; position: relative;
-ms-overflow-style: none; -ms-overflow-style: none;

2
packages/theme-default/src/spinner.css
View File

@ -3,8 +3,8 @@
@component-namespace el { @component-namespace el {
@b time-spinner { @b time-spinner {
display: flex;
width: 100%; width: 100%;
white-space: nowrap;
} }
@b spinner { @b spinner {