Skip to content
This repository was archived by the owner on Mar 12, 2025. It is now read-only.

Commit fd77a93

Browse files
authored
Merge pull request #4 from topcoder-platform/develop
Improve user interface
2 parents afa8620 + 2846650 commit fd77a93

File tree

7 files changed

+343
-63
lines changed

7 files changed

+343
-63
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ node_modules/
44
.DS_Store
55
ui/node_modules/
66
ui/build/
7+
.env

ui/src/App.css

Lines changed: 156 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
.app {
22
width: 100%;
3+
height: 100%;
4+
}
5+
6+
.cols{
7+
display: flex;
8+
height: 100%;
39
}
410

511
.left-nav {
612
width: 300px;
7-
background-color: #444444;
8-
color: #EEEEEE;
13+
background-color: #2f4050;
14+
color: #a7b1c2;
915
font-size: 13px;
16+
overflow: auto;
1017
}
1118

1219
.logo {
1320
height: 80px;
1421
width: 100%;
15-
padding-left: 60px;
16-
padding-right: 60px;
17-
padding-top: 22px;
18-
padding-bottom: 22px;
19-
background-color: #333333;
22+
background-color: #2B3C4B;
23+
display: flex;
24+
align-items: center;
25+
justify-content: center;
2026
}
2127

2228
.left-nav-item {
2329
padding-left: 30px;
24-
margin-top: 30px;
30+
margin-top: 20px;
2531
margin-bottom: 20px;
2632
}
2733

@@ -31,10 +37,13 @@
3137
margin-right: 10px;
3238
}
3339

40+
.topic-select.form-control:not([size]):not([multiple]){
41+
height: 32px;
42+
}
43+
3444
.filter {
35-
padding-left: 0px;
36-
text-align: center;
37-
font-style: italic;
45+
padding-left: 30px;
46+
margin-bottom: 10px;
3847
}
3948

4049
.filter-control {
@@ -45,21 +54,49 @@
4554
color: #000000;
4655
}
4756

57+
.timestamp-control .DayPickerInput{
58+
width: 100%;
59+
}
60+
61+
.timestamp-control input{
62+
display: block;
63+
width: 90%;
64+
padding: .375rem .75rem;
65+
font-size: 13px;
66+
line-height: 1.5;
67+
color: #495057;
68+
background-color: #fff;
69+
background-clip: padding-box;
70+
border: 1px solid #ced4da;
71+
border-radius: .25rem;
72+
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
73+
}
74+
4875
.apply-button {
4976
margin-left: 30px;
5077
}
5178

5279
.main-content {
53-
background-color: #F5F5F5;
54-
padding: 20px;
80+
background-color: #f3f3f4;
5581
width: calc(100% - 300px);
82+
display: flex;
83+
flex-direction: column;
5684
}
5785

5886
.error-msg {
5987
color: red;
6088
margin-bottom: 30px;
6189
}
6290

91+
.page-heading{
92+
font-size: 24px;
93+
padding-top: 20px;
94+
padding-bottom: 10px;
95+
padding-left: 25px;
96+
font-weight: 100;
97+
background-color: #fff;
98+
}
99+
63100
.message-input {
64101
width: 75%;
65102
margin-right: 20px;
@@ -72,18 +109,14 @@
72109
}
73110

74111
.view-button {
75-
vertical-align: top;
112+
vertical-align: bottom;
76113
}
77114

78115
.get-button {
79-
vertical-align: top;
116+
vertical-align: bottom;
80117
margin-left: 10px;
81118
}
82119

83-
.send-message-button {
84-
vertical-align: text-bottom;
85-
}
86-
87120
.loading-img-container {
88121
position: fixed;
89122
top: 0;
@@ -101,3 +134,107 @@
101134
left: 50%;
102135
z-index: 99999;
103136
}
137+
138+
.btn{
139+
font-size: 12px;
140+
}
141+
142+
.form-control{
143+
font-size: 13px;
144+
margin-top: 5px;
145+
}
146+
147+
.form-control:focus {
148+
border-color: #ced4da;
149+
box-shadow: none;
150+
}
151+
152+
.page-body{
153+
padding: 25px 25px 70px;
154+
position: relative;
155+
height: calc(100% - 66px);
156+
}
157+
158+
.table{
159+
background-color: #fff;
160+
table-layout: fixed;
161+
}
162+
163+
.table thead th{
164+
border: none;
165+
}
166+
167+
.table thead th:nth-child(1){
168+
width: 200px;
169+
}
170+
171+
.table thead th:nth-child(3){
172+
width: 220px;
173+
}
174+
175+
.table thead th:nth-child(4){
176+
width: 200px;
177+
}
178+
179+
.table td{
180+
white-space: nowrap;
181+
overflow: hidden;
182+
text-overflow: ellipsis;
183+
}
184+
185+
.table td:nth-child(2){
186+
cursor: pointer;
187+
}
188+
189+
.table tr{
190+
border-bottom: 1px solid #e7eaec;
191+
}
192+
193+
.btn-primary,
194+
.btn-primary:not(:disabled):not(.disabled):active{
195+
background-color: #f8ac59;
196+
border-color: #f8ac59;
197+
}
198+
199+
.btn-primary:hover{
200+
background-color: #f7a54a;
201+
border-color: #f7a54a;
202+
}
203+
204+
.btn-primary:focus{
205+
box-shadow: none;
206+
}
207+
208+
.send-message-button,
209+
.send-message-button:not(:disabled):not(.disabled):active {
210+
vertical-align: text-bottom;
211+
background-color: #23c6c8;
212+
border-color: #23c6c8;
213+
}
214+
215+
.send-message-button:hover {
216+
background-color: #21b9bb;
217+
border-color: #21b9bb;
218+
}
219+
220+
.selected-topic{
221+
color: #676a6c;
222+
}
223+
224+
.msg-input-group{
225+
display: flex;
226+
align-items: center;
227+
position: absolute;
228+
bottom: 25px;
229+
left: 25px;
230+
right: 20px;
231+
}
232+
233+
.msg-input-group .form-control{
234+
margin-top: 1px;
235+
}
236+
237+
.table-wrap{
238+
height: 100%;
239+
overflow: auto;
240+
}

0 commit comments

Comments
 (0)