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

Jump to bottom

supporting 200% and 400% zoom scenarios #482

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

supporting 200% and 400% zoom scenarios #482

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
6 changes: 2 additions & 4 deletions src/scripts/clipperUI/animations/expandFromRightAnimationStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ export class ExpandFromRightAnimationStrategy extends TransitioningAnimationStra

Velocity.animate(el, {
opacity: 1,
right: 20,
width: Constants.Styles.clipperUiWidth
right: 20
}, {
complete: () => {
// The first transition is reversed; once it is done, do the normal transitions
Expand All @@ -58,8 +57,7 @@ export class ExpandFromRightAnimationStrategy extends TransitioningAnimationStra
this.animationTimeoutId = setTimeout(() => {
Velocity.animate(el, {
opacity: 0,
right: 0,
width: 0
right: 0
}, {
complete: () => {
resolve();
Expand Down
28 changes: 27 additions & 1 deletion src/styles/clipper.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,12 @@
position: fixed;
top: @ClipperUITopRightOffset;
right: @ClipperUITopRightOffset;
width: 100px;
// width: 100px;
width: 25%;
max-width: @ClipperUIWidth;
height: 70%;
max-height: 470px;
overflow: scroll;
background: @OneNotePurpleTransparent;
border-radius: @ClipperBorderRadius;
box-shadow: @ClipperBoxShadow;
Expand All @@ -144,6 +149,27 @@
-o-user-select: none;
user-select: none;

::-webkit-scrollbar, ::-webkit-scrollbar-thumb:vertical, ::-webkit-scrollbar-thumb:horizontal {
-webkit-border-radius: @ClipperBorderRadius;
border-radius: @ClipperBorderRadius;
}

::-webkit-scrollbar {
// Corresponds to the vertical and horizontal scrollbars respectively
width: 10px;
height: 10px;
}

// The pointy ends of the scrollbar's bar
::-webkit-scrollbar-thumb:vertical, ::-webkit-scrollbar-thumb:horizontal {
background: @ClipperScrollbarDark;
-moz-background-clip: padding-box;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 2px solid rgba(0, 0, 0, 0);
min-height: 10px;
}

#optionLabel {
margin: 5px;
}
Expand Down
3 changes: 2 additions & 1 deletion src/styles/previewStyles.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@

#previewInnerWrapper {
position: fixed;
width: @OneNotePageWidth;
width: 70%;
max-width: @OneNotePageWidth;
top: @ClipperUITopRightOffset;
bottom: @ClipperUITopRightOffset;
right: @ClipperUIWidth + @ClipperUITopRightOffset + @ClipperUITopRightOffset;
Expand Down