Skip to content

Bug/NFTPAR 1070 horizontal paddings #84

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
a-mikhailova wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

Bug/NFTPAR 1070 horizontal paddings #84

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e557a88
Merge pull request #54 from UniqueNetwork/bugfix/NFTPAR-1002-collecti…
kpozdnikin Dec 22, 2021
9cff7e8
fix: header layout
a-mikhailova Jan 11, 2022
3d684e1
Merge branch 'develop' into bug/NFTPAR-1070-horizontal-paddings
a-mikhailova Jan 11, 2022
6dcc5a9
NFTPAR-1071 decrease mobile-heading
a-mikhailova Jan 11, 2022
8202fe6
bug-NFTPAR-1072-footer-layout
a-mikhailova Jan 12, 2022
3f65b54
feat: preview-button in process
a-mikhailova Jan 13, 2022
95add33
fix: hook to universalize and move to common folder
a-mikhailova Jan 13, 2022
f005320
fix: preview-button works correct
a-mikhailova Jan 13, 2022
a7c0e4d
fix: (paddings) px to gap
a-mikhailova Jan 14, 2022
1744898
Merge branch 'develop' into bug/NFTPAR-1070-horizontal-paddings
a-mikhailova Jan 16, 2022
1286797
bug/NFTPAR-1058-modal-layout
a-mikhailova Jan 16, 2022
ffb8b77
fix: more files
a-mikhailova Jan 16, 2022
ebadbed
Merge branch 'develop' into bug/NFTPAR-1070-horizontal-paddings
a-mikhailova Jan 17, 2022
f626fbf
Merge branch 'develop' into bug/NFTPAR-1070-horizontal-paddings
a-mikhailova Jan 17, 2022
4bf676f
fix: eslint for *.tsx
a-mikhailova Jan 17, 2022
97c6026
fix: disclaimer layout mostly
a-mikhailova Jan 18, 2022
2d66437
fix: add files
a-mikhailova Jan 18, 2022
fe1844d
bug/NFTPAR-1121-faq-heading-size
a-mikhailova Jan 18, 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
115 changes: 59 additions & 56 deletions packages/apps/src/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@
background-color: transparent;
padding: 0;
width: auto;
height: 64px;
margin-right: calc((var(--gap) / 2) * 3);

img {
width: auto;
max-width: 130px;
height: 50px;
width: 100%;
}
}
}
Expand Down Expand Up @@ -86,13 +85,11 @@
padding-right: 10.25px;
display: flex;
align-items: center;
margin-bottom: 3px;
}

&:hover {
.item-icon{

svg{
.item-icon {
svg {
fill: var(--button-color);
}
}
Expand Down Expand Up @@ -121,7 +118,7 @@
.account-selector-block {
max-width: 500px;

.address{
.address {
text-align: left;
}
}
Expand Down Expand Up @@ -149,6 +146,7 @@
justify-content: space-between;
align-items: center;
max-width: var(--max-header-width);
height: 64px;
}
}

Expand All @@ -159,7 +157,6 @@
}

.manage-balances {

&.popup {
position: absolute;
display: none;
Expand Down Expand Up @@ -216,7 +213,7 @@
}
}

.popup-link{
.popup-link {
& a {
cursor: pointer;
color: var(--button-color);
Expand Down Expand Up @@ -315,8 +312,7 @@
height: 16px;
color: var(--link-color);
display: inline-block;
background: url("../../react-components/src/AccountButtonGroup/images/warning-alert.svg")
no-repeat;
background: url("../../react-components/src/AccountButtonGroup/images/warning-alert.svg") no-repeat;
background-size: contain;
}
}
Expand Down Expand Up @@ -352,6 +348,11 @@
.menu-mobile-header {
.menu-icon {
cursor: pointer;
height: 32px;
}

.icon {
height: 100%;
}
}

Expand All @@ -362,7 +363,7 @@

a.create-account-btn {
padding: 8px 24px;
border:1px solid var(--button-color);
border: 1px solid var(--button-color);
border-radius: 4px !important;
color: var(--link-color);
font-family: var(--font-roboto);
Expand All @@ -372,17 +373,17 @@

&:hover {
background-color: var(--button-background-hover);
color: var(--link-color)!important;
color: var(--link-color) !important;
}

&.active{
&.active {
pointer-events: none;
border-color: var(--button-background-disabled-border);
color:var(--button-background-disabled);
color: var(--button-background-disabled);
background: transparent;
}

&:before{
&:before {
display: none;
}
}
Expand Down Expand Up @@ -431,6 +432,7 @@
display: flex;
align-items: center;
grid-column-gap: var(--gap);
height: 100%;
}

.app-user {
Expand Down Expand Up @@ -476,9 +478,26 @@
text-align: center;
margin-bottom: var(--gap);
}

&--link {
display: block;
width: 100%;
font-family: var(--font-roboto);
font-weight: 500;
font-size: 16px;
margin: 4px 0;
padding: 8px 16px;

@kpozdnikin kpozdnikin Jan 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use gap for paddings

@a-mikhailova a-mikhailova Jan 11, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

погодь, я сначала задачки по сути сделаю, потом возьмемся за рефакторинг)

@kpozdnikin kpozdnikin Jan 11, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут не так много, чтобы не порефачить. Весь новый код должен быть в новом стиле.

@a-mikhailova a-mikhailova Jan 12, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Кость, это не новый код - это я просто перенесла кусок, потому что разбросаны были по файлу куски от одного и тоже и дубликат лежал

@SergeyOkishev SergeyOkishev Jan 12, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Завел задачу на рефактор:
https://cryptousetech.atlassian.net/browse/NFTPAR-1085

давайте сразу поправим если видим, а то до полноценного рефактора мы еще не скоро доберемся, а так, пока мимо проходим - поправить бы чтоб в следующий раз глаза не резало

@a-mikhailova a-mikhailova Jan 12, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

поправлю, как закончу задачки. Кость, ты пока не отвлекайся на мои коммиты - это я мелко-задачки пошагово лью (упражняюсь со взаимодействием github с jira:) )
У меня, как готово будет к просмотру, я тебе маякну ;)

color: var(--header-text-color);

&.active {
background-color: var(--link-color);
border-radius: 4px;
color: var(--card-background);
}
}
}

.app-main {
.app-main {
&.menu {
display: none;
}
Expand All @@ -493,6 +512,8 @@

.ui.tabular.header-menu.menu {
display: inline-flex;
align-items: center;
height: 64px;
}

.app-user {
Expand Down Expand Up @@ -523,7 +544,7 @@
padding: 0;
}

&.page-no-found{
&.page-no-found {
background-color: var(--bg-page);
}
}
Expand All @@ -532,7 +553,8 @@
width: 25%;
}

.menu-mobile, .manage-accounts {
.menu-mobile,
.manage-accounts {
margin-top: 84px;
}

Expand All @@ -550,13 +572,26 @@
}
}

.app-logo {
img{
height: 100%;
}
}

.app-user {
display: block !important;

.app-balances {
display: none;
}
}

.app-container {
&--header {
height: 48px;
}
}

.menu-mobile-header {
display: block;
}
Expand Down Expand Up @@ -599,7 +634,6 @@
display: none;
}
}

}

.manage-accounts {
Expand All @@ -618,7 +652,7 @@
background-color: var(--white-color);
z-index: 999;

a{
a {
border-bottom: 1px solid var(--border-color);
display: block;
width: 100%;
Expand Down Expand Up @@ -660,7 +694,7 @@
font-family: var(--font-roboto);
font-weight: 500;

div{
div {
max-width: 300px;
white-space: nowrap;
overflow: hidden;
Expand Down Expand Up @@ -699,11 +733,11 @@
}
}

.ui.popup.attributes{
.ui.popup.attributes {
left: -12px !important;
}

.ui.top.popup.help{
.ui.top.popup.help {
top: 10px !important;
}

Expand All @@ -725,34 +759,3 @@
border: 1px solid var(--input-background-color);
}
}

@media (max-width: 1279px) {
.menu-mobile {
padding: var(--gap);
display: flex;
flex-direction: column;
background-color: var(--card-background);

&--logo {
text-align: center;
margin-bottom: var(--gap);
}

&--link {
display: block;
width: 100%;
font-family: var(--font-roboto);
font-weight: 500;
font-size: 16px;
margin: 4px 0;
padding: 8px 16px;
color: var(--header-text-color);

&.active {
background-color: var(--link-color);
border-radius: 4px;
color: var(--card-background);
}
}
}
}
Loading