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

Shrink timeline height and make years fade out #2778

Merged
merged 2 commits into from
Aug 1, 2017
Merged

Shrink timeline height and make years fade out #2778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09b284e
Shrink timeline height to 55px and make years fade out as hours fade in.
fbarl Jul 31, 2017
ead3861
Address the comments.
fbarl Aug 1, 2017
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
4 changes: 2 additions & 2 deletions client/app/scripts/components/time-travel-timeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,11 @@ class TimeTravelTimeline extends React.Component {
const ticks = this.getTicksForPeriod(period, focusedTimestamp);

const verticalShift = this.getVerticalShiftForPeriod(period);
const transform = `translate(0, ${62 - (verticalShift * 15)})`;
const transform = `translate(0, ${49 - (verticalShift * 16)})`;

This comment was marked as abuse.

Sign in to view


// Ticks quickly fade in from the bottom and then slowly
// start fading out as they are being pushed to the top.
const opacity = verticalShift > 1 ? (6 - verticalShift) / 5 : verticalShift;
const opacity = verticalShift > 1 ? (5 - verticalShift) / 4 : verticalShift;

This comment was marked as abuse.

Sign in to view


return (
<g className={period} transform={transform} style={{ opacity }}>
Expand Down
10 changes: 5 additions & 5 deletions client/app/styles/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@

&.time-travel-open {
.details-wrapper {
margin-top: 85px;
margin-top: $timeline-height + 15px;
}
}
}
Expand Down Expand Up @@ -264,7 +264,7 @@
height: 0;

&.visible {
height: 105px;
height: $timeline-height + 35px;
margin-bottom: 15px;
margin-top: -5px;
}
Expand All @@ -277,7 +277,7 @@
.time-travel-timeline {
align-items: center;
display: flex;
height: 70px;
height: $timeline-height;

svg {
@extend .grabbable;
Expand Down Expand Up @@ -321,11 +321,11 @@

&:before {
top: 0;
height: 70px;
height: $timeline-height;
}

&:after {
top: 70px;
top: $timeline-height;
height: 9px;
opacity: 0.15;
}
Expand Down
2 changes: 2 additions & 0 deletions client/app/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ $link-opacity-default: 0.8;
$search-border-color: transparent;
$search-border-width: 1px;

$timeline-height: 55px;

/* specific elements */
$body-background-color: linear-gradient(30deg, $background-color 0%, $background-lighter-color 100%);
$label-background-color: fade-out($background-average-color, .3);