Skip to content

Commit eb49398

Browse files
authored
Merge pull request #559 from appirio-tech/design-style-4
Design style 4
2 parents 37a7a09 + 3a3749f commit eb49398

File tree

8 files changed

+537
-365
lines changed

8 files changed

+537
-365
lines changed

src/components/ActionCard/Comment.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Comment = ({avatarUrl, authorName, date, children, active, self}) => (
1717
{date}
1818
</div>
1919
</div>
20-
<div className="comment-body">
20+
<div className="comment-body draftjs-post">
2121
<p>
2222
{children}
2323
</p>

src/components/FileList/FileList.scss

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// reset styles of panel class, we need panel class to activate the modal-overlay
55
border: none;
66
box-shadow: none;
7-
> h4 {
87

8+
> h4 {
99
@include roboto-medium;
1010
font-size: 15px;
1111
color: $tc-gray-50;
@@ -20,45 +20,56 @@
2020
padding: 15px 0;
2121
width: 100%;
2222
align-items: stretch;
23+
2324
.icon-col {
2425
padding-top: 3px;
2526
width: 60px;
2627
}
28+
2729
.content-col {
2830
flex: 2;
2931

3032
h4 {
3133
@include roboto-bold;
3234
font-size: 15px;
3335
color: $tc-gray-80;
36+
max-width: 380px;
3437
}
38+
3539
p {
3640
@include roboto;
3741
font-size: 13px;
38-
color: $tc-gray-60;
39-
line-height: 25px;
42+
font-weight: 400;
43+
color: $tc-gray-70;
44+
line-height: 20px;
4045
}
46+
4147
.title {
4248
width: 100%;
4349
display: flex;
4450
line-height: 25px;
4551
}
52+
4653
.size {
4754
@include roboto;
4855
font-size: 15px;
4956
color: $tc-gray-60;
5057
margin-left: auto;
5158
}
59+
5260
.edit-icons {
5361
margin-left: 5px;
62+
5463
i {
5564
cursor: pointer;
5665
}
5766
}
67+
5868
.title-edit {
5969
display: flex;
6070
align-items: center;
6171
margin-bottom: 10px;
72+
6273
input {
6374
@include roboto-bold;
6475
font-size: 15px;
@@ -83,22 +94,25 @@
8394
resize: none;
8495
}
8596
}
97+
8698
.icon-trash,
8799
.icon-edit {
88100
margin-left: 13px;
89101
vertical-align: middle;
90102
}
103+
91104
.icon-trash {
92105
margin-left: 22px;
93106
}
107+
94108
.icon-save {
95109
margin-right: 25px;
96110
}
111+
97112
.icon-close {
98113
margin-right: 10px;
99114
}
100115
}
101116

102117
.delete-file-modal {
103-
104118
}

0 commit comments

Comments
 (0)