Skip to content

Commit c86a1e9

Browse files
author
bars92
committed
- fixed table inside table in months view.
- fixed ui layout and styles + removed some colors
1 parent b7f2e08 commit c86a1e9

File tree

5 files changed

+58
-74
lines changed

5 files changed

+58
-74
lines changed

DateTime.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,6 @@ var Datetime = createClass({
330330
var date = this.state.selectedDate || this.state.viewDate;
331331

332332
var pickerSwitches = [];
333-
pickerSwitches.push(
334-
React.createElement('div', {key: 'swt', className: 'rdtSwitch time-switch ' + (!showDate ? 'inner-content' : 'unselected-left'), onClick: this.showView('time')}, React.createElement('span', {key: 'ht'},[React.createElement('i', {key: 'wi', className: 'wait icon'}), date.format( formats.time )]))
335-
);
336-
337333
if (!this.props.timeOnly) {
338334
pickerSwitches.push(
339335
React.createElement('div', {
@@ -344,6 +340,10 @@ var Datetime = createClass({
344340
);
345341
}
346342

343+
pickerSwitches.push(
344+
React.createElement('div', {key: 'swt', className: 'rdtSwitch time-switch ' + (!showDate ? 'inner-content' : 'unselected-left'), onClick: this.showView('time')}, React.createElement('span', {key: 'ht'},[React.createElement('i', {key: 'wi', className: 'wait icon'}), date.format( formats.time )]))
345+
);
346+
347347
return React.createElement('div', {className: className},
348348
children.concat(
349349
React.createElement('div',

css/react-datetime.css

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
.rdtPicker {
99
display: none;
1010
position: absolute;
11-
width: 250px;
11+
width: 260px;
1212
padding: 4px;
1313
margin-top: 1px;
1414
z-index: 99999 !important;
@@ -79,19 +79,19 @@
7979
}
8080

8181
.inner-content {
82-
background: #fff;
8382
border: none;
8483
}
8584

8685
.cancelBtn {
87-
margin-left: 139px !important;
8886
font-size: 12px;
8987
color: red;
9088
padding-top: 4px;
89+
display: inline-block;
9190
}
9291

9392
.saveBtn {
9493
margin-left: 10px !important;
94+
display: inline-block;
9595
}
9696

9797
input {
@@ -103,7 +103,8 @@ input {
103103
}
104104

105105
.time-switch {
106-
float: right;
106+
width: 40%;
107+
display: inline-block;
107108
padding-right: 15px;
108109
padding-top: 6px;
109110
padding-bottom: 5px;
@@ -112,7 +113,8 @@ input {
112113

113114
.date-switch {
114115
padding-top: 6px;
115-
float: left;
116+
width: 60%;
117+
display: inline-block;
116118
padding-left: 13px;
117119
padding-bottom: 5px;
118120
padding-right: 10px;
@@ -121,7 +123,6 @@ input {
121123
.unselected-right,
122124
.unselected-left {
123125
border-bottom: 1px solid #e2e2e2;
124-
padding-bottom: 3px;
125126
}
126127

127128
.rdtPicker td span.rdtOld {
@@ -133,9 +134,6 @@ input {
133134
color: #999999;
134135
cursor: not-allowed;
135136
}
136-
.rdtPicker th {
137-
border-bottom: 1px solid #f9f9f9;
138-
}
139137
.rdtPicker .dow {
140138
width: 14.2857%;
141139
border-bottom: none;
@@ -157,9 +155,6 @@ input {
157155
.rdtPicker thead tr:first-child th {
158156
cursor: pointer;
159157
}
160-
.rdtPicker thead tr:first-child th:hover {
161-
background: #eeeeee;
162-
}
163158

164159
.rdtPicker tfoot{
165160
border-top: 1px solid #f9f9f9;
@@ -191,7 +186,6 @@ td.rdtYear:hover {
191186
}
192187

193188
.rdtCounters {
194-
display: inline-block;
195189
font-size: 12px
196190
}
197191

@@ -213,23 +207,24 @@ td.rdtYear:hover {
213207
}
214208

215209
.rdtCounter .rdtBtn {
216-
height: 40%;
217-
line-height: 40px;
218-
cursor: pointer;
219-
}
220-
.rdtCounter .rdtBtn:hover {
221-
background: #fff;
210+
height: 40%;
211+
line-height: 40px;
212+
cursor: pointer;
213+
font-size: 9px !important;
222214
}
223215
.rdtCounter .rdtCount {
224216
height: 20%;
225217
font-size: 1.2em;
226-
border: none !important;
227-
background: inherit !important;
218+
border: none !important;
219+
background: inherit !important;
228220
}
229221

230222
.rdtCount {
231223
padding-top: 0 !important;
232224
padding-bottom: 0 !important;
225+
font-size: 15px !important;
226+
padding: 0 !important;
227+
text-align: center;
233228
}
234229

235230
.rdtCount:hover {

0 commit comments

Comments
 (0)