Skip to content
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

Sidebar, option design changes #177

Merged
merged 1 commit into from
Dec 28, 2018
+14 −11
Merged

Sidebar, option design changes #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/components/Option.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ class Option extends React.Component<OptionProps> {
},
css({
marginLeft: "10px",
color: isSelected ? colors.violet.base : colors.gray.light
color: isSelected ? colors.violet.base : colors.gray.light,
fontSize: "20px"
})
);
return multiSelect ? <i className={iconClass} /> : null;
Expand Down
1 change: 1 addition & 0 deletions src/components/__tests__/__snapshots__/option.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ exports[`Option component snapshot for multi select 1`] = `
.emotion-1 {
margin-left: 10px;
color: #E0E0E0;
font-size: 20px;
}

.emotion-2 {
Expand Down
1 change: 1 addition & 0 deletions src/components/__tests__/__snapshots__/optionGroup.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@ Array [
.emotion-1 {
margin-left: 10px;
color: #E0E0E0;
font-size: 20px;
}

<div
Expand Down
10 changes: 5 additions & 5 deletions src/components/__tests__/__snapshots__/sidebar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ Array [
.emotion-0 {
background-color: #ffffff;
border-radius: 3px;
height: 50px;
width: 50px;
height: 40px;
width: 40px;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -85,13 +85,13 @@ Array [
-ms-flex-pack: center;
justify-content: center;
cursor: pointer;
margin-left: -70px;
margin-left: -60px;
margin-top: 20px;
position: absolute;
}

.emotion-0 i {
font-size: 25px;
font-size: 14px;
color: #101721;
}

Expand All @@ -114,7 +114,7 @@ Array [
.emotion-0 i {
float: right;
color: #6B7785;
font-size: 20px;
font-size: 14px;
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/components/styles/Sidebar.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ export const sidebarWrapperStyle = css({
export const closeStyle = css({
backgroundColor: colors.white.base,
borderRadius: constants.borderRadius,
height: 50,
width: 50,
height: 40,
width: 40,
display: "flex",
alignItems: "center",
justifyContent: "center",
cursor: "pointer",
marginLeft: -70,
marginLeft: -60,
marginTop: 20,
position: "absolute",
i: {
fontSize: 25,
fontSize: 14,
color: colors.gray.darker
},
"@media (max-width: 800px)": {
Expand All @@ -37,7 +37,7 @@ export const closeStyle = css({
i: {
float: "right",
color: colors.gray.dark,
fontSize: 20
fontSize: 14
}
}
});
Expand Down