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

Bugfix/fix title scroll #269

Open
wants to merge 3 commits into
base: dreamlab
Choose a base branch
from
Open

Bugfix/fix title scroll #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b98a66
fix title scroll behavior
Nov 25, 2021
53eeae1
title class renamed
Nov 25, 2021
001db46
title add margin
Nov 25, 2021
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
9 changes: 4 additions & 5 deletions src/components/popup/intro/intro.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@ export default class Intro extends Component {
prefix={LocalLabel.defaultProps.prefix}
/>
</div>
<div class={style.portalLogo}></div>
<div class={style.portalLogo}/>
<div class={style.owner}>
<LocalLabel localizeKey='ownerLabel' collapseEmpty={true}></LocalLabel>
</div>
<div class={style.title}>
<LocalLabel localizeKey='title'>Thanks for visiting</LocalLabel>
<LocalLabel localizeKey='ownerLabel' collapseEmpty={true}/>
</div>
<div class={style.title} />
<div class={style.description}>
<LocalLabel className={style.descriptionTitle} localizeKey='title'>Thanks for visiting</LocalLabel>
<LocalLabel localizeKey='description'>In order to run a successful website, we and certain third parties are setting cookies and accessing and storing information on your device for various purposes. Various third parties are also collecting data to show you personalized content and ads. Some third parties require your consent to collect data to serve you personalized content and ads.</LocalLabel>
</div>
<div class={style.options}>
Expand Down
218 changes: 116 additions & 102 deletions src/components/popup/intro/intro.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,134 +1,148 @@
@import '../../../style/variables.less';

div.intro {
display: block;
padding: 0 6%;
max-height: 100%;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-moz-font-smoothing: grayscale;

@media @mobile {
display: block;
padding: 0 6%;
max-height: 100%;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-moz-font-smoothing: grayscale;
padding: 0;
}

@media @mobile {
display: block;
padding: 0;
}
.portalLogo {
display: block;
}

.portalLogo {
display: block;
}
.owner {
font-size: 1.1em;
background-repeat: no-repeat;
background-position-y: center;
align-items: center;
display: none;
}

.owner {
font-size: 1.1em;
background-repeat: no-repeat;
background-position-y: center;
align-items: center;
display: none;
.title {
font-weight: bold;
font-size: 30px;
text-align: left;

@media @mobile {
font-size: 18px;
line-height: 26px;
padding: 20px 4% 0
}
}

.title {
font-weight: bold;
font-size: 30px;
text-align: left;
.descriptionTitle {
Copy link
Author

Choose a reason for hiding this comment

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

this class was added. Rest changes eslint formatting

font-weight: bold;
font-size: 30px;
text-align: left;
line-height: 33px;
display: block;
margin: 0 0 10px;

@media @mobile {
font-size: 18px;
line-height: 26px;
padding: 20px 4% 0
}
@media @mobile {
font-size: 18px;
line-height: 26px;
}
}

.description {
margin: 4% 0;
font-family: Helvetica Neue, Arial, sans-serif;
height: 320px;
overflow: auto;
font-size: 12px;
line-height: 1;
text-align: left;
-webkit-overflow-scrolling: touch;

.description {
margin: 4% 0;
font-family: Helvetica Neue, Arial, sans-serif;
height: 320px;
overflow: auto;
font-size: 12px;
line-height: 1;
text-align: left;
-webkit-overflow-scrolling: touch;

@media @tablet {
margin: 2% 0;
}
@media @tablet {
margin: 2% 0;
}
}

.options {
display: flex;
flex-shrink: 0;
width: 100%;
padding-bottom: 10px;

@media @mobile {
display: block;
padding: 0 10px;
background: #fff;

.options {
display: flex;
flex-shrink: 0;
button {
width: 100%;
padding-bottom: 10px;

@media @mobile {
display: block;
padding: 0 10px;
background: #fff;

button {
width: 100%;
display: block;
margin: 15px 0;
}
}
@media @tablet {
display: flex;

button {
margin: 5px;
}
}
display: block;
margin: 15px 0;
}
}
@media @tablet {
display: flex;

.rejectAll {
flex: 1;
margin-right: 10px;
button {
margin: 5px;
}
}
}

.acceptAll {
flex: 1;
}
.rejectAll {
flex: 1;
margin-right: 10px;
}

.acceptAll {
flex: 1;
}
}

.intro {
.title {
text-align: left;
}
.title {
text-align: left;
}

.title::before {
content: "";
display: block;
margin-bottom: 20px;
background-repeat: no-repeat;
}
.title::before {
content: "";
display: block;
margin-bottom: 20px;
background-repeat: no-repeat;
}

@media @mobile {
padding: 0;
font-size: 13px;
padding-bottom: 50px;

.description {
height: 40vh;
padding: 0 4%;
text-align: left;
}

.portalLogo, .owner {
margin: 0 4%;
}
@media @mobile {
padding: 0;
font-size: 13px;
padding-bottom: 50px;

.description {
height: 40vh;
padding: 0 4%;
text-align: left;
}

@media @tablet {
.description {
height: 17vh;
}
.portalLogo, .owner {
margin: 0 4%;
}
}

@media @tablet {
.description {
-webkit-overflow-scrolling: touch;
height: 17vh;
}
}

.closeSection {
width: 100%;
display: flex;
justify-content: flex-end;
}
.description {
-webkit-overflow-scrolling: touch;
}

.closeSection {
width: 100%;
display: flex;
justify-content: flex-end;
}
}