Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Feed/NewPostMobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
display: flex;
justify-content: flex-end;
> svg {
fill: #FAFAFB;
fill: $tc-gray-neutral-light;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Home/Home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

p {
@include roboto;
font-size: $tc-body-large;
font-size: $tc-body-lg;
color: $tc-gray-70;
letter-spacing: 0;
line-height: $base-unit * 6;
Expand Down
2 changes: 1 addition & 1 deletion src/components/LinksMenu/LinksMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
margin-left: auto;
button {
padding: 0;
background: rgba(0, 0, 0, 0);
background: transparent;
}
}
a {
Expand Down
1 change: 0 additions & 1 deletion src/components/Modal/Modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
height: 15px;
top: $base-unit*3;
right: $base-unit*3;
background-size: $tc-heading-extra-small;
}

.modal-title {
Expand Down
2 changes: 1 addition & 1 deletion src/components/PanelProject/PanelProject.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.project-heading {
@include roboto-medium;
font-size: $tc-heading;
font-size: $tc-heading-sm;
color: $tc-black;
line-height: $base-unit*6;
.text-muted {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Select/Select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
}

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

&:active,
&:focus,
&:hover {
background-color: transparent;
color: rgb(208, 2, 27);
color: $tc-red-110;
}
}

Expand Down
11 changes: 2 additions & 9 deletions src/components/TeamManagement/TeamManagement.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
@import "~tc-ui/src/styles/tc-includes";
// @import "../../styles/variables";
// TODO where do we add these

:global {
$tc-heading-extra-small: 14px;
$tc-body-small: 14px;
$tc-body-extra-small: 12px;

@mixin icon($url) {
background: url("../../assets/images/#{$url}") no-repeat;
}
Expand Down Expand Up @@ -191,7 +185,6 @@
position: absolute;
top: $base-unit*3;
right: $base-unit*3;
background-size: $tc-heading-extra-small;
overflow: hidden;
}

Expand Down Expand Up @@ -331,7 +324,7 @@
margin: $base-unit*2 auto;
@include roboto;
color: $tc-gray-70;
font-size: $tc-body-small;
font-size: 14px;
font-style: italic;
border: 1px solid $tc-red-30;
background: $tc-red-10;
Expand Down Expand Up @@ -376,7 +369,7 @@
padding: 5px 0;
text-align: center;
@include roboto-medium;
font-size: $tc-body-extra-small;
font-size: $tc-label-sm;
line-height: 18px;
box-shadow: none;
background-color: $tc-white;
Expand Down
9 changes: 2 additions & 7 deletions src/components/TopBar/ProjectsToolBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
@import '~tc-ui/src/styles/tc-includes';

:global {
// TODO: move to includes
$tc-rgba-10: rgba($tc-gray-80, 0.38);
$tc-rgba-20: rgba($tc-black, 0.17);
$tc-body-large: 20px;

.ProjectsToolBar {
margin: 0 auto;
width: 100%;
Expand Down Expand Up @@ -242,7 +237,7 @@

&.active {
background: $tc-gray-80;
box-shadow: inset 0px 1px 3px 0px $tc-rgba-10;
box-shadow: inset 0px 1px 3px 0px $tc-gray-80;

svg.icon-search-filter g {
fill: $tc-white;
Expand Down Expand Up @@ -297,7 +292,7 @@
}

h2 {
font-size: $tc-body-large;
font-size: $tc-body-lg;
color: $tc-black;
white-space: nowrap;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

.project-name {
@include roboto-medium;
font-size: $tc-heading-sm;
font-size: $tc-heading-xs;
line-height: $base-unit * 4;
color: $tc-black;
word-break: break-all;
Expand Down
8 changes: 4 additions & 4 deletions src/projects/create/components/ProjectSubmitted.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
width: 90%;

.title {
color: #1E1E1F;
color: $tc-gray-100;
font-size: 32px;
font-weight: 300;
line-height: 35px;
Expand All @@ -21,7 +21,7 @@
}

.sub-title {
color: #85807C;
color: $tc-gray-50;
font-size: 12px;
font-weight: 400;
line-height: 20px;
Expand All @@ -30,7 +30,7 @@
}

.content {
color: #151516;
color: $tc-gray-100;
font-size: 15px;
font-weight: 400;
margin-top: 50px;
Expand All @@ -43,7 +43,7 @@
}

.project-link-container {
background-color: #F1F0F0;
background-color: $tc-gray-neutral-light;
border-radius: 6px;
height: 60px;
width: 100%;
Expand Down
7 changes: 2 additions & 5 deletions src/projects/detail/ProjectDetail.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
@import '~tc-ui/src/styles/tc-includes';

:global {
// FIXME: bad names for variables;
$gray-color: $tc-gray-50;
$title-color: $tc-gray-80;
// FIXME: repeated mixin use! Use global
@mixin flexBox {
display: flex;
Expand Down Expand Up @@ -46,7 +43,7 @@
@include flexWidth(2);
border-radius: 4px;
.title {
color: $title-color;
color: $tc-gray-80;
@include roboto;
}
.right-area-item {
Expand All @@ -61,7 +58,7 @@
.big-titles {
@include roboto-light;
font-size: 28px;
color: $gray-color;
color: $tc-gray-50;
line-height: 30px;
margin-bottom: 20px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

:global {
//TODO Additional variables - need to find a home for these
$gray-color: $tc-gray-50;
$title-color: $tc-gray-80;
$sideBarWidth: 280px;
$sideBarMaxWidth: 360px;

Expand Down Expand Up @@ -188,14 +186,14 @@

.optional {
background: $tc-gray-10;
color: $gray-color;
color: $tc-gray-50;
}
}

.gray-text {
@include roboto;
font-size: 15px;
color: $gray-color;
color: $tc-gray-50;
line-height: 25px;

strong {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

> h2 {
font-size: $tc-heading-md;
font-size: $tc-heading-sm;
background-color: $tc-gray-neutral-light;
color: $tc-black;
padding: 3 * $base_unit;
Expand Down
15 changes: 3 additions & 12 deletions src/projects/detail/components/ProjectSpecSidebar.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
@import '~tc-ui/src/styles/tc-includes';

:global {
//TODO Additional variables - need to find a home for these
// FIXME: remove non-standard variables! Deep nesting, non-standard line-height;
// FIXME: Deep nesting, non-standard line-height;
// FIXME: non-standard units (use $base-unit and $corner-radius)
$gray-color: $tc-gray-50;
$title-color: $tc-gray-80;
$hr-color-base: $tc-black;
$hr-color-darker: lighten($hr-color-base, 13.5%);
$hr-color-dark: lighten($hr-color-base, 20%);
$hr-color: lighten($hr-color-base, 33.5%);
$hr-color-light: lighten($hr-color-base, 46.7%);
$hr-color-lighter: lighten($hr-color-base, 93.5%);

.projectSpecSidebar {
padding: 20px 0;
Expand Down Expand Up @@ -79,7 +70,7 @@
display: block;
height: 1px;
border: 0;
border-top: 1px solid $hr-color-lighter;
border-top: 1px solid $tc-gray-30;
margin: 1em 0;
padding: 0;

Expand All @@ -92,7 +83,7 @@
@include roboto;
font-size: 13px;
line-height: 25px;
color: $gray-color;
color: $tc-gray-50;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~tc-ui/src/styles/tc-includes';

.container {
background-color: #fff;
background-color: $tc-white;
width: 100%;

/* use global style here as this style was extracted from the old component */
Expand Down
Loading