Skip to content

Commit 2b4ce21

Browse files
author
Victor George
committed
Fixes background color and adds a transition to filters (plus math calculation fix) so it is not as jarring as it used to be.
1 parent cf77da2 commit 2b4ce21

File tree

3 files changed

+53
-30
lines changed

3 files changed

+53
-30
lines changed

src/components/App/App.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
body {
44
min-width: 320px;
5-
background-color: $tc-gray-neutral-light;
5+
background-color: $tc-gray-neutral-dark;
66
}
77

88
.ReactModal__Body--open {

src/components/Layout/Layout.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
.main-wrapper {
44
min-height: calc(100vh - 60px); // header and footer width
55
padding-top: 60px;
6+
transition: all 150ms ease-in-out;
67

78
&.with-filters {
89
padding-top: 120px;
10+
min-height: calc(100vh - 120px);
911
}
1012
}
1113

src/components/TopBar/ProjectsToolBar.scss

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
@import 'tc-includes';
33

44
// TODO: move to includes
5-
$tc-rgba-10: rgba(71,71,79,0.38);
6-
$tc-rgba-20: rgba(0,0,0,0.17);
7-
$tc-body-large : 20px;
5+
$tc-rgba-10: rgba(71, 71, 79, 0.38);
6+
$tc-rgba-20: rgba(0, 0, 0, 0.17);
7+
$tc-body-large: 20px;
88

99
.ProjectsToolBar {
1010
margin: 0 auto;
@@ -18,11 +18,11 @@ $tc-body-large : 20px;
1818
justify-content: space-between;
1919

2020
.logo-wrapper {
21-
margin-left: 4*$base-unit;
21+
margin-left: 4 * $base-unit;
2222
}
2323

2424
.welcome-info {
25-
margin-right: 4*$base-unit;
25+
margin-right: 4 * $base-unit;
2626
}
2727

2828
.actions {
@@ -40,22 +40,25 @@ $tc-body-large : 20px;
4040
margin-top: 15px;
4141
display: flex;
4242
}
43+
4344
.search-filter {
4445
width: 97px;
45-
margin-left: 2*$base-unit;
46-
.tc-btn{
46+
margin-left: 2 * $base-unit;
47+
48+
.tc-btn {
4749
display: flex;
4850
align-items: center;
4951
// justify-content: center;
50-
padding: 0 2*$base-unit 0 34px;
52+
padding: 0 2 * $base-unit 0 34px;
5153
text-align: left;
5254
color: $tc-gray-40;
5355
background-color: transparent;
5456
border-radius: 2px;
5557
border: 0;
5658
font-size: 12px;
5759
position: relative;
58-
&:before{
60+
61+
&:before {
5962
display: block;
6063
content: '';
6164
width: 14px;
@@ -66,10 +69,12 @@ $tc-body-large : 20px;
6669
background: url("../../styles/i/icon-filter.png") left top no-repeat;
6770
background-size: 14px 32px;
6871
}
69-
&.active{
72+
73+
&.active {
7074
background: $tc-gray-80;
7175
box-shadow: inset 0px 1px 3px 0px $tc-rgba-10;
72-
&:before{
76+
77+
&:before {
7378
background: url("../../styles/i/icon-filter.png") left -16px no-repeat;
7479
background-size: 14px 32px;
7580
}
@@ -90,40 +95,47 @@ $tc-body-large : 20px;
9095
}
9196

9297
/* .bar__search */
93-
.bar__search{
98+
.bar__search {
9499
position: relative;
95100
min-height: 60px;
101+
height: 60px;
96102
padding: 0 20px;
97103
background-color: $tc-gray-neutral-light;
104+
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
98105
display: flex;
99106
width: 100%;
100-
h2{
107+
108+
h2 {
101109
font-size: $tc-body-large;
102110
line-height: 60px;
103111
color: $tc-black;
104112
width: 120px;
105113
white-space: nowrap;
106114
}
107-
.bar-control{
115+
116+
.bar-control {
108117
width: 120px;
109118
text-align: right;
110119
min-height: 30px;
111120
padding-top: 15px;
112-
.tc-btn{
121+
122+
.tc-btn {
113123
display: inline-block;
114124
height: 30px;
115125
white-space: nowrap;
116126
}
117127
}
118-
.search-panel{
128+
129+
.search-panel {
119130
flex: 1;
120131
margin: 0 auto;
121132
text-align: center;
122133
display: flex;
123134
justify-content: center;
124135
padding-top: 15px;
125136
flex-wrap: wrap;
126-
label{
137+
138+
label {
127139
@include roboto-medium;
128140
width: 83px;
129141
display: inline-block;
@@ -133,12 +145,14 @@ $tc-body-large : 20px;
133145
color: $tc-gray-70;
134146
text-align: right;
135147
}
136-
.search-select-widget{
148+
149+
.search-select-widget {
137150
width: 280px;
138151
margin-left: 10px;
139152
display: inline-block;
140153
}
141154
}
155+
142156
.SwitchButton {
143157
.label {
144158
padding-right: 10px;
@@ -148,15 +162,17 @@ $tc-body-large : 20px;
148162
}
149163

150164
.project-creation-dialog-overlay {
151-
position : fixed;
152-
top : 0;
153-
left : 0;
154-
right : 0;
155-
bottom : 0;
165+
position: fixed;
166+
top: 0;
167+
left: 0;
168+
right: 0;
169+
bottom: 0;
156170
z-index: 21;/* +1 of the z-index of the topbar */
157-
background-color: #fafafb;
171+
background-color: #fafafb;
158172
/*background-color: $tc-gray-neutral-dark;*/
159173
overflow-y: scroll;
174+
opacity: 1;
175+
transition: all .250ms ease-in-out;
160176

161177
.IncompleteProjectConfirmation {
162178
position: static;
@@ -174,6 +190,7 @@ $tc-body-large : 20px;
174190
top: 12px;
175191
z-index: 22;/* +1 from z-index of the modal overlay */
176192
}
193+
177194
.FillProjectDetails .header {
178195
margin: 35px 0 0;
179196
}
@@ -213,23 +230,27 @@ $tc-body-large : 20px;
213230

214231

215232
@media all and (max-width: 1023px) {
216-
.bar__search{
217-
h2{
233+
.bar__search {
234+
h2 {
218235
width: 110px;
219236
}
220-
.search-panel{
237+
238+
.search-panel {
221239
flex: 1;
222240
margin: 0 auto;
223241
text-align: left;
224242
display: flex;
225243
justify-content: flex-start;
226-
label{
244+
245+
label {
227246
width: auto;
228247
margin-left: 30px;
229-
&.first{
248+
249+
&.first {
230250
margin-left: 0;
231251
}
232252
}
253+
233254
.search-select-widget {
234255
width: 170px;
235256
}

0 commit comments

Comments
 (0)