Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 157eee8

Browse files
authored
Merge pull request #196 from QwantResearch/fix-share-modal
Fix share favorite modal
2 parents 39d8b94 + 71fdbd5 commit 157eee8

6 files changed

+67
-41
lines changed

package-lock.json

+33-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/scss/includes/modals/index.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
.modal {
1919
position: absolute;
2020
border-radius: 3px;
21+
overflow: auto;
2122
}
2223

23-
.modal__geolocation {
24+
.modal__maps {
2425
width: 320px;
2526
padding: 30px 24px;
2627
background: url('../images/popup_top.svg') white no-repeat;
@@ -50,7 +51,7 @@
5051

5152
.modal__subtitle {
5253
display: block;
53-
font-size: 16px;
54+
font-size: 13px;
5455
color: $secondary_text;
5556
margin-bottom: 16px;
5657
}

src/scss/includes/modals/masq_favorite.scss

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
.modal__masq_favorite__body {
3131
padding: 40px 40px;
3232
color: #5c6f84;
33+
34+
.modal__subtitle {
35+
font-size: 16px;
36+
}
3337
}
3438

3539
.modal__masq_favorite__buttons {

src/views/geolocation_denied_modal.dot

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="modal__geolocation">
1+
<div class="modal__maps">
22
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
33
<h2 class="modal__title">{{= _('Geolocation not available.', 'geolocation') }}</h2>
44
<span class="modal__subtitle">{{= _('You did not allow Qwant Maps to access your position.', 'geolocation') }}</span>

src/views/geolocation_modal.dot

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="modal__geolocation">
1+
<div class="modal__maps">
22
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
33
<h2 class="modal__title">{{= _('Geolocation with privacy!', 'geolocation') }}</h2>
44
<span class="modal__subtitle">{{= _(`You need to know where you are? Please allow your application to access your location so that it can tell you. As stated in our {privacyPolicyLink} privacy policy {closeTag}, Qwant will not store your geolocation information. We don't want to know your whereabouts.`,

src/views/share_modal.dot

+25-23
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
2-
<h2 class="modal__title">{{= _('Share link', 'share') }}</h2>
1+
<div class="modal__maps">
2+
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
3+
<h2 class="modal__title">{{= _('Share link', 'share') }}</h2>
34

4-
<div class="share_copy__input__container" {{= click(this.copy, this) }}>
5-
<input id="share_url_data" value="{{= this.shareUrl }}" type="text"></input>
6-
<div class="share_copy__container" id="share-copy-container">
7-
<button class="share_copy__link">
8-
<i class="icon-copy"></i>
9-
</button>
10-
<span class="share_copy__status">
11-
<i class="icon-check share_copy__status__icon"></i>
12-
{{= _('Copied !', 'share') }}
13-
</span>
5+
<div class="share_copy__input__container" {{= click(this.copy, this) }}>
6+
<input id="share_url_data" value="{{= this.shareUrl }}" type="text"></input>
7+
<div class="share_copy__container" id="share-copy-container">
8+
<button class="share_copy__link">
9+
<i class="icon-copy"></i>
10+
</button>
11+
<span class="share_copy__status">
12+
<i class="icon-check share_copy__status__icon"></i>
13+
{{= _('Copied !', 'share') }}
14+
</span>
15+
</div>
1416
</div>
15-
</div>
1617

17-
<hr class="modal__hr">
18-
<i class="share__icons icon-facebook"></i>
19-
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.facebookTemplate(this.shareUrl) }}" class="share__link">
20-
{{= _('SHARE ON FACEBOOK', 'share') }}
21-
</a>
22-
<hr class="modal__hr">
23-
<i class="share__icons icon-twitter"></i>
24-
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.twitterTemplate(this.shareUrl) }}" class="share__link">
25-
{{= _('SHARE ON TWITTER', 'share') }}
26-
</a>
18+
<hr class="modal__hr">
19+
<i class="share__icons icon-facebook"></i>
20+
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.facebookTemplate(this.shareUrl) }}" class="share__link">
21+
{{= _('SHARE ON FACEBOOK', 'share') }}
22+
</a>
23+
<hr class="modal__hr">
24+
<i class="share__icons icon-twitter"></i>
25+
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.twitterTemplate(this.shareUrl) }}" class="share__link">
26+
{{= _('SHARE ON TWITTER', 'share') }}
27+
</a>
28+
</div>

0 commit comments

Comments
 (0)