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

Fix share favorite modal #196

Merged
merged 2 commits into from
May 2, 2019
Merged

Fix share favorite modal #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1f2209
fix share modal
sujeebant May 2, 2019
71fdbd5
minor css changes after review
amatissart May 2, 2019
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
47 changes: 33 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src/scss/includes/modals/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
.modal {
position: absolute;
border-radius: 3px;
overflow: auto;
}

.modal__geolocation {
.modal__maps {
width: 320px;
padding: 30px 24px;
background: url('../images/popup_top.svg') white no-repeat;
Expand Down Expand Up @@ -50,7 +51,7 @@

.modal__subtitle {
display: block;
font-size: 16px;
font-size: 13px;
color: $secondary_text;
margin-bottom: 16px;
}
Expand Down
4 changes: 4 additions & 0 deletions src/scss/includes/modals/masq_favorite.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
.modal__masq_favorite__body {
padding: 40px 40px;
color: #5c6f84;

.modal__subtitle {
font-size: 16px;
}
}

.modal__masq_favorite__buttons {
Expand Down
2 changes: 1 addition & 1 deletion src/views/geolocation_denied_modal.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="modal__geolocation">
<div class="modal__maps">
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
<h2 class="modal__title">{{= _('Geolocation not available.', 'geolocation') }}</h2>
<span class="modal__subtitle">{{= _('You did not allow Qwant Maps to access your position.', 'geolocation') }}</span>
Expand Down
2 changes: 1 addition & 1 deletion src/views/geolocation_modal.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="modal__geolocation">
<div class="modal__maps">
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
<h2 class="modal__title">{{= _('Geolocation with privacy!', 'geolocation') }}</h2>
<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.`,
Expand Down
48 changes: 25 additions & 23 deletions src/views/share_modal.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
<h2 class="modal__title">{{= _('Share link', 'share') }}</h2>
<div class="modal__maps">
<i class="icon-x modal__close" {{= click(this.close, this) }}></i>
<h2 class="modal__title">{{= _('Share link', 'share') }}</h2>

<div class="share_copy__input__container" {{= click(this.copy, this) }}>
<input id="share_url_data" value="{{= this.shareUrl }}" type="text"></input>
<div class="share_copy__container" id="share-copy-container">
<button class="share_copy__link">
<i class="icon-copy"></i>
</button>
<span class="share_copy__status">
<i class="icon-check share_copy__status__icon"></i>
{{= _('Copied !', 'share') }}
</span>
<div class="share_copy__input__container" {{= click(this.copy, this) }}>
<input id="share_url_data" value="{{= this.shareUrl }}" type="text"></input>
<div class="share_copy__container" id="share-copy-container">
<button class="share_copy__link">
<i class="icon-copy"></i>
</button>
<span class="share_copy__status">
<i class="icon-check share_copy__status__icon"></i>
{{= _('Copied !', 'share') }}
</span>
</div>
</div>
</div>

<hr class="modal__hr">
<i class="share__icons icon-facebook"></i>
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.facebookTemplate(this.shareUrl) }}" class="share__link">
{{= _('SHARE ON FACEBOOK', 'share') }}
</a>
<hr class="modal__hr">
<i class="share__icons icon-twitter"></i>
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.twitterTemplate(this.shareUrl) }}" class="share__link">
{{= _('SHARE ON TWITTER', 'share') }}
</a>
<hr class="modal__hr">
<i class="share__icons icon-facebook"></i>
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.facebookTemplate(this.shareUrl) }}" class="share__link">
{{= _('SHARE ON FACEBOOK', 'share') }}
</a>
<hr class="modal__hr">
<i class="share__icons icon-twitter"></i>
<a rel="noopener noreferrer" target="_blank" {{= this.openPopup() }} href="{{= this.twitterTemplate(this.shareUrl) }}" class="share__link">
{{= _('SHARE ON TWITTER', 'share') }}
</a>
</div>