Skip to content

fix: Misaligned button text #1529

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

Open
svvimming wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: Misaligned button text #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1419f28
fix: Misaligned text on login button text/email field + updated gradi…
svvimming Jun 20, 2022
d9b3b91
Merge branch 'main' into fix/misaligned-button-text
svvimming Jun 20, 2022
27b1cb4
chore: fix linting errors
svvimming Jun 20, 2022
19201a6
Merge branch 'main' into fix/misaligned-button-text
orvn Jun 27, 2022
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 packages/website/components/account/filesManager/filesManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const FilesManager = ({ className, content, onFileUpload }) => {
}, [fetchPinsDate, listPinned, isFetchingPinned, apiToken]);
useEffect(() => {
getTokens();
}, []);
}, [getTokens]);

// Set displayed files based on tab selection: 'uploaded' or 'pinned'
useEffect(() => {
Expand Down
5 changes: 2 additions & 3 deletions packages/website/components/account/storageManager/storageManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const StorageManager = ({ className = '', content }) => {
maxSpaceLabel: `${Math.floor(limit / tebibyte)} ${content.max_space_tib_label}`,
unlockLabel: content.unlock_label,
percentUploaded: Math.min((uploaded / limit) * 100, 100),
percentPinned: Math.min((psaPinned / limit) * 100, 100)
percentPinned: Math.min((psaPinned / limit) * 100, 100),
}),
[uploaded, psaPinned, limit, content]
);
Expand Down Expand Up @@ -80,8 +80,7 @@ const StorageManager = ({ className = '', content }) => {
};

const pinnedStorageBarStyles = {
width:
!componentInViewport || percentPinned === 0 ? '0' : `calc( max(${percentPinned}%, 0.25rem) + 2rem)`,
width: !componentInViewport || percentPinned === 0 ? '0' : `calc( max(${percentPinned}%, 0.25rem) + 2rem)`,
left: `calc( max(${percentUploaded}%, 0.25rem) - 2rem)`,
transition: `${percentPinned * 25}ms ease-out ${percentUploaded * 25}ms`,
backgroundPosition: !componentInViewport ? '50% 0' : `0% 0`,
Expand Down
9 changes: 5 additions & 4 deletions packages/website/components/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,18 +240,19 @@

&:before {
@include gradient_BlurryDoubleBG_PinkBlue;
opacity: 0.6;
}

&:after {
transition: all $transitionDuration ease-in;
border: 0.0625rem solid $alto;
background: $charade;
opacity: 0.6;
border: 0.0625rem solid $white;
background: $waterloo;
opacity: 0.5;
@include shadow4;
}

.button-contents {
@include fontWeight_Regular;
@include fontWeight_Semibold;
position: relative;
z-index: 1;
}
Expand Down
5 changes: 5 additions & 0 deletions packages/website/pages/login/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
.button {
width: 10.75rem;
height: 2.75rem;
text-align: center;
width: fit-content;
margin: auto;
padding: 0.25rem 1.25rem;
button {
min-height: 1.875rem;
}
Expand All @@ -36,6 +40,7 @@
width: 100%;
border-radius: 0;
@include hoverInput;
text-align: center;
&::placeholder {
color: $white;
}
Expand Down
8 changes: 5 additions & 3 deletions packages/website/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,12 @@ $gradient_PinkBlue_Reverse: linear-gradient(45deg, $pictonBlue 0%, $royalBlue 48

@mixin gradient_BlurryDoubleBG_PinkBlue {
content: ' ';
width: 100%;
height: 100%;
width: calc(100% + 2px);
height: calc(100% + 2px);
top: -1px;
left: -1px;
position: absolute;
filter: blur(0.1875rem);
filter: blur(0.5rem);
background: linear-gradient(
65deg,
$cerise 0%,
Expand Down