Skip to content

Design style 4 #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fnisen merged 9 commits into from
Nov 23, 2016
Merged

Design style 4 #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2eb4ac9
fixed #254 issue
sirakovaDimitrina Nov 17, 2016
f0e097d
fixed #258 issue
sirakovaDimitrina Nov 17, 2016
a722f92
fixed #294 issue
sirakovaDimitrina Nov 17, 2016
33a8ca6
fixed #365 issue
sirakovaDimitrina Nov 17, 2016
61ec64f
fixed #549 issue
sirakovaDimitrina Nov 22, 2016
e69f38a
fixed #365 , #550 issues
sirakovaDimitrina Nov 22, 2016
61026b8
Typography and color fixes
Nov 23, 2016
eb75cf7
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
Nov 23, 2016
3a3749f
Fixes the label of the feature picker to say `Save and close` instead…
Nov 23, 2016
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/ActionCard/Comment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const Comment = ({avatarUrl, authorName, date, children, active, self}) => (
{date}
</div>
</div>
<div className="comment-body">
<div className="comment-body draftjs-post">
<p>
{children}
</p>
Expand Down
22 changes: 18 additions & 4 deletions src/components/FileList/FileList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
// reset styles of panel class, we need panel class to activate the modal-overlay
border: none;
box-shadow: none;
> h4 {

> h4 {
@include roboto-medium;
font-size: 15px;
color: $tc-gray-50;
Expand All @@ -20,45 +20,56 @@
padding: 15px 0;
width: 100%;
align-items: stretch;

.icon-col {
padding-top: 3px;
width: 60px;
}

.content-col {
flex: 2;

h4 {
@include roboto-bold;
font-size: 15px;
color: $tc-gray-80;
max-width: 380px;
}

p {
@include roboto;
font-size: 13px;
color: $tc-gray-60;
line-height: 25px;
font-weight: 400;
color: $tc-gray-70;
line-height: 20px;
}

.title {
width: 100%;
display: flex;
line-height: 25px;
}

.size {
@include roboto;
font-size: 15px;
color: $tc-gray-60;
margin-left: auto;
}

.edit-icons {
margin-left: 5px;

i {
cursor: pointer;
}
}

.title-edit {
display: flex;
align-items: center;
margin-bottom: 10px;

input {
@include roboto-bold;
font-size: 15px;
Expand All @@ -83,22 +94,25 @@
resize: none;
}
}

.icon-trash,
.icon-edit {
margin-left: 13px;
vertical-align: middle;
}

.icon-trash {
margin-left: 22px;
}

.icon-save {
margin-right: 25px;
}

.icon-close {
margin-right: 10px;
}
}

.delete-file-modal {

}
Loading