Skip to content

Commit 2b6d018

Browse files
committed
Merge branch 'dev' into issue-1985-notifications-reader
2 parents dbb181d + 6e7e943 commit 2b6d018

File tree

27 files changed

+54
-99
lines changed

27 files changed

+54
-99
lines changed

src/components/Feed/NewPostMobile.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
display: flex;
2323
justify-content: flex-end;
2424
> svg {
25-
fill: #FAFAFB;
25+
fill: $tc-gray-neutral-light;
2626
}
2727
}
2828

src/components/Home/Home.scss

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

111111
p {
112112
@include roboto;
113-
font-size: $tc-body-large;
113+
font-size: $tc-body-lg;
114114
color: $tc-gray-70;
115115
letter-spacing: 0;
116116
line-height: $base-unit * 6;

src/components/LinksMenu/LinksMenu.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
margin-left: auto;
5959
button {
6060
padding: 0;
61-
background: rgba(0, 0, 0, 0);
61+
background: transparent;
6262
}
6363
}
6464
a {

src/components/Modal/Modal.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
height: 15px;
1616
top: $base-unit*3;
1717
right: $base-unit*3;
18-
background-size: $tc-heading-extra-small;
1918
}
2019

2120
.modal-title {

src/components/PanelProject/PanelProject.scss

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

88
.project-heading {
99
@include roboto-medium;
10-
font-size: $tc-heading;
10+
font-size: $tc-heading-sm;
1111
color: $tc-black;
1212
line-height: $base-unit*6;
1313
.text-muted {

src/components/Select/Select.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
}
5555

5656
.Select-item-icon {
57-
color:rgb(153, 153, 153);
58-
border-right-color: rgb(220, 220, 224);
57+
color:$tc-gray-40;
58+
border-right-color: $tc-gray-10;
5959
padding: 0 5px 1px;
6060

6161
&:active,
6262
&:focus,
6363
&:hover {
6464
background-color: transparent;
65-
color: rgb(208, 2, 27);
65+
color: $tc-red-110;
6666
}
6767
}
6868

src/components/TeamManagement/TeamManagement.scss

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
@import "~tc-ui/src/styles/tc-includes";
2-
// @import "../../styles/variables";
3-
// TODO where do we add these
42

53
:global {
6-
$tc-heading-extra-small: 14px;
7-
$tc-body-small: 14px;
8-
$tc-body-extra-small: 12px;
9-
104
@mixin icon($url) {
115
background: url("../../assets/images/#{$url}") no-repeat;
126
}
@@ -191,7 +185,6 @@
191185
position: absolute;
192186
top: $base-unit*3;
193187
right: $base-unit*3;
194-
background-size: $tc-heading-extra-small;
195188
overflow: hidden;
196189
}
197190

@@ -331,7 +324,7 @@
331324
margin: $base-unit*2 auto;
332325
@include roboto;
333326
color: $tc-gray-70;
334-
font-size: $tc-body-small;
327+
font-size: 14px;
335328
font-style: italic;
336329
border: 1px solid $tc-red-30;
337330
background: $tc-red-10;
@@ -376,7 +369,7 @@
376369
padding: 5px 0;
377370
text-align: center;
378371
@include roboto-medium;
379-
font-size: $tc-body-extra-small;
372+
font-size: $tc-label-sm;
380373
line-height: 18px;
381374
box-shadow: none;
382375
background-color: $tc-white;

src/components/TopBar/ProjectsToolBar.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
@import '~tc-ui/src/styles/tc-includes';
33

44
:global {
5-
// TODO: move to includes
6-
$tc-rgba-10: rgba($tc-gray-80, 0.38);
7-
$tc-rgba-20: rgba($tc-black, 0.17);
8-
$tc-body-large: 20px;
9-
105
.ProjectsToolBar {
116
margin: 0 auto;
127
width: 100%;
@@ -242,7 +237,7 @@
242237

243238
&.active {
244239
background: $tc-gray-80;
245-
box-shadow: inset 0px 1px 3px 0px $tc-rgba-10;
240+
box-shadow: inset 0px 1px 3px 0px $tc-gray-80;
246241

247242
svg.icon-search-filter g {
248243
fill: $tc-white;
@@ -297,7 +292,7 @@
297292
}
298293

299294
h2 {
300-
font-size: $tc-body-large;
295+
font-size: $tc-body-lg;
301296
color: $tc-black;
302297
white-space: nowrap;
303298

src/projects/components/projectsCard/ProjectCardHeader.scss

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

2424
.project-name {
2525
@include roboto-medium;
26-
font-size: $tc-heading-sm;
26+
font-size: $tc-heading-xs;
2727
line-height: $base-unit * 4;
2828
color: $tc-black;
2929
word-break: break-all;

src/projects/create/components/ProjectSubmitted.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
width: 90%;
1010

1111
.title {
12-
color: #1E1E1F;
12+
color: $tc-gray-100;
1313
font-size: 32px;
1414
font-weight: 300;
1515
line-height: 35px;
@@ -21,7 +21,7 @@
2121
}
2222

2323
.sub-title {
24-
color: #85807C;
24+
color: $tc-gray-50;
2525
font-size: 12px;
2626
font-weight: 400;
2727
line-height: 20px;
@@ -30,7 +30,7 @@
3030
}
3131

3232
.content {
33-
color: #151516;
33+
color: $tc-gray-100;
3434
font-size: 15px;
3535
font-weight: 400;
3636
margin-top: 50px;
@@ -43,7 +43,7 @@
4343
}
4444

4545
.project-link-container {
46-
background-color: #F1F0F0;
46+
background-color: $tc-gray-neutral-light;
4747
border-radius: 6px;
4848
height: 60px;
4949
width: 100%;

0 commit comments

Comments
 (0)