Skip to content

Commit d597c78

Browse files
author
Victor George
committed
Fixes
1 parent 019d2e2 commit d597c78

File tree

7 files changed

+56
-34
lines changed

7 files changed

+56
-34
lines changed

src/components/NotificationItem/NotificationItem.scss

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,43 @@
44
.notification-item-link {
55
display: block;
66

7-
& + &,
8-
.notification-item + & {
7+
.notification-item {
98
border-top: 1px solid $tc-gray-10;
9+
10+
&:first-child {
11+
border: none;
12+
}
1013
}
1114
}
1215

1316
.notification-item {
1417
display: flex;
1518
background-color: $tc-white;
1619
justify-content: space-between;
20+
transition: 150ms all;
21+
22+
&:hover {
23+
background-color: $tc-dark-blue-10;
24+
}
1725

1826
& + &,
1927
.notification-item-link + & {
2028
border-top: 1px solid $tc-gray-10;
2129
}
2230

23-
> .icon {
31+
.icon {
2432
align-items: center;
2533
// border-left: 2px solid #55a5ff;
2634
display: flex;
2735
flex: 0 0 44px;
2836
justify-content: center;
2937
}
3038

31-
> .body {
39+
.body {
3240
flex: 1;
3341
padding: 15px 0;
3442

35-
> .content {
43+
.content {
3644
@include roboto;
3745
color: $tc-black;
3846
font-size: 13px;
@@ -52,13 +60,22 @@
5260
}
5361
}
5462

55-
> .mark-read {
63+
.mark-read {
5664
align-items: center;
5765
display: flex;
58-
flex: 0 0 55px;
66+
flex: 0 0 40px;
5967
justify-content: flex-end;
68+
transition: all 150ms;
6069

61-
> button {
70+
&:hover {
71+
background-color: $tc-dark-blue-30;
72+
73+
svg {
74+
fill: $tc-dark-blue-90;
75+
}
76+
}
77+
78+
button {
6279
background: none;
6380
border: 0;
6481
display: block;
@@ -67,13 +84,8 @@
6784
padding: 0;
6885
width: 42px;
6986

70-
> svg {
87+
svg {
7188
fill: $tc-gray-20;
72-
transition: all 150ms;
73-
74-
&:hover {
75-
fill: $tc-dark-blue-90;
76-
}
7789
}
7890
}
7991
}

src/components/NotificationsDropdown/NotificationsDropdown.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ body.noScroll {
99
// project override for dropdown shadow
1010
.Dropdown {
1111
box-shadow: 0 3px 30px 2px rgba(0, 0, 0, 0.5);
12+
cursor: default;
13+
user-select: none;
1214
}
1315

1416
.notifications-dropdown {

src/components/NotificationsDropdown/NotificationsDropdownContainer.jsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ class NotificationsDropdownContainer extends React.Component {
2222
}
2323

2424
// Make sure the body isn't scrollable when mouse is over the drop-down menu
25-
freezeBodyToggle(){
26-
document.body.classList.toggle('noScroll')
25+
freezeBody(){
26+
document.body.classList.add('noScroll')
27+
}
28+
29+
unfreezeBody(){
30+
document.body.classList.remove('noScroll')
2731
}
2832

2933
render() {
@@ -61,7 +65,7 @@ class NotificationsDropdownContainer extends React.Component {
6165
</NotificationsEmpty>
6266
</div>
6367
) : ([
64-
<div key="body" className="notifications-dropdown-body" onMouseEnter={this.freezeBodyToggle} onMouseLeave={this.freezeBodyToggle} >
68+
<div key="body" className="notifications-dropdown-body" onMouseEnter={this.freezeBody} onMouseLeave={this.unfreezeBody} >
6569
{globalSource && globalSource.notifications.length &&
6670
<NotificationsSection
6771
{...globalSource}
@@ -79,7 +83,7 @@ class NotificationsDropdownContainer extends React.Component {
7983
/>
8084
)}
8185
</div>,
82-
<Link key="footer" to="/notifications" className="notifications-read-all tc-btn-link">Read all notifications</Link>
86+
<Link key="footer" to="/notifications" className="notifications-read-all tc-btn-link">View all notifications</Link>
8387
])}
8488
</NotificationsDropdown>
8589
)

src/components/NotificationsDropdownHeader/NotificationsDropdownHeader.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
.notifications-dropdown-header {
55
align-items: center;
66
background: $tc-gray-neutral-light;
7-
border-bottom: 1px solid $tc-gray-10;
7+
border-bottom: 1px solid $tc-gray-20;
88
display: flex;
99
justify-content: space-between;
1010
padding: 0 15px;
1111

12-
> .header {
12+
.header {
1313
@include roboto-medium;
1414
color: $tc-gray-70;
1515
font-size: 12px;
@@ -18,7 +18,7 @@
1818
text-transform: uppercase;
1919
}
2020

21-
> .mark-all {
21+
.mark-all {
2222
@include roboto;
2323
background: none;
2424
border: 0;

src/components/NotificationsSectionTitle/NotificationsSectionTitle.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
.notifications-section-title {
55
align-items: center;
66
background-color: $tc-gray-20;
7+
// border-bottom: 1px solid $tc-gray-20;
78
display: flex;
89
justify-content: space-between;
910

10-
> .title {
11-
@include roboto-medium;
12-
11+
.title {
12+
@include roboto-bold;
1313
color: $tc-gray-80;
1414
font-size: 13px;
15-
line-height: 38px;
15+
line-height: 30px;
1616
margin-left: 15px;
1717
}
1818

19-
> .controls {
20-
> .mark-all {
19+
.controls {
20+
.mark-all {
2121
@include roboto;
2222
background: none;
2323
border: 0;
@@ -38,16 +38,16 @@
3838
margin-top: 0;
3939
}
4040

41-
> .title {
41+
.title {
4242
color: $tc-black;
4343
font-size: 20px;
4444
font-weight: 400;
4545
line-height: 30px;
4646
margin-left: 0;
4747
}
4848

49-
> .controls {
50-
> .mark-all {
49+
.controls {
50+
.mark-all {
5151
height: 20px;
5252
line-height: 20px;
5353
padding: 0;

src/projects/list/components/Projects/ProjectsGridView.jsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,15 @@ const ProjectsGridView = props => {
112112
<div className="spacing">
113113
<div className="user-block">
114114
<UserTooltip usr={m} id={item.id}/>
115-
<div className="project-segment">
116-
<ProjectSegmentSelect currentSegment={item.segment || 'self-service'}/>
117-
</div>
115+
118116
</div>
119117
</div>
120118
)
119+
// TODO: Restore user segment when we support it
120+
// <div className="project-segment">
121+
// <ProjectSegmentSelect currentSegment={item.segment || 'self-service'}/>
122+
// </div>
123+
// Hiding the user segment for the momemnt
121124
}
122125
}, {
123126
id: 'managers',

src/projects/list/components/Projects/ProjectsGridView.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@
310310
text-overflow: ellipsis;
311311

312312
&:hover {
313-
background-color: $tc-gray-neutral-dark;
313+
background-color: $tc-dark-blue-30;
314+
color: $tc-black;
314315
}
315316
}
316317

0 commit comments

Comments
 (0)