Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 1721-implement-cypress-code-coverage-and-generate-a-report-of-current-e2e-coverage-and-areas-that
  • 1991-enable-pro-to-general-public-with-feature-flag
  • 2676-get-required-checkmark-on-e2e
  • 3272-i-should-not-be-suggested-thai-groups-or-channels
  • 3869-mobile-web-keyboard-issue
  • 3988-user-auto-suggest-list-is-appearing-behind-other-stuff
  • 3991-add-24-hour-text-to-label-top-scheduler
  • 4030-m-topbarwrapper-is-behind-other-elements
  • 4157-invalid-email-error-from-minds-spanish
  • 6073-replace-title-line-editor-in-the-composer-on-ios-mobile-with-the-same-editor-as-the-description
  • add-nvmrc
  • analytics-service-1932
  • animationTweak
  • btc-settings-2346
  • bug-darkmode-color
  • chart-refactor-2170
  • chore/1351-skip-captcha-e2e
  • chore/ChannelButtonAdjust
  • chore/RobotoFallback
  • chore/add-missing-i18n-major-components
  • chore/add-scroll-to-settings
  • chore/api-serv-generics
  • chore/better-lint-command
  • chore/better-mr-template
  • chore/block-nsfw-boosts-4487
  • chore/cypress-6-upgrde
  • chore/cypress-test-jul-2021
  • chore/env-settings
  • chore/ethers-implementation-3548
  • chore/ethers-implementation-3548-3
  • chore/feature-cleanup-m4779
  • chore/feature-template
  • chore/fix-shared-key-cypress
  • chore/handle-mobile-page-as-case-insentitive
  • chore/helm-master
  • chore/hindi-merge
  • chore/husky-migrate-4949
  • chore/isolate-broken-e2e-tests
  • chore/l10n-sync
  • chore/language-service
  • chore/layout-chores
  • chore/nav-fixes
  • chore/ng9-bump
  • chore/no-nsfw-onboarding
  • chore/parallel-cypress-runners
  • chore/parallel-karma
  • chore/plyr-upgrade-2572
  • chore/porting-confirmation-dialog
  • chore/reduce-build-time
  • chore/register-modal-improvements-2965
  • chore/remove-legacy-code
  • chore/remove-rotator-styles-f6169
  • chore/revert-admin-confirm-4819
  • chore/sentry-source-maps
  • chore/settings-tests
  • chore/sourcemap-root-sentry-1782
  • chore/split-cypress-repo-test
  • chore/ssr-envs
  • chore/ssr-local-serve
  • chore/test-branch-delete
  • chore/test-pipeline-btns
  • chore/update-chat-1-4-19
  • chore/update-earnings-ux
  • chore/wire-support-tiers-2
  • chore/wire-to-pay-3151
  • chore/z-index-3790
  • confirm-leave-dialog-blogs
  • design-system-v2.0.0
  • design-system-v2.0.1
  • design-system-v2.0.2
  • design-system-v2.0.3
  • design-system-v2.1.2
  • design-system-v2.2.3
  • e2e-maintainence-2-2676
  • e2e-maintainence-3-2676
  • emoji-picker-e8ccf1
  • emoji-picker-e8ccf1-healthy
  • entity-centric-metrics
  • epic/SSR
  • epic/angular-9
  • epic/boost-campaign
  • epic/ckeditor5-blogs
  • epic/composer
  • epic/minds-redesign-110
  • epic/onboarding-v3
  • epic/permissions-28
  • epic/skale-integration
  • epic/totp-auth-modal
  • epic/totp-support-2021
  • epic/transcoder-improvements
  • epic/upgrades-page
  • epic/upgrades-page-updates
  • experiment-material-fonts
  • feat-campaign-cap-1169
  • feat-embeddable-video-player
  • feat/1170-admin-approve-campaign
  • feat/1732-block-refactor
  • feat/2511-activity-v2
  • feat/3996-plus-7-day-trial
  • feat/588-state-on-user
  • dev-0.1c
101 results

Target

Select target project
  • omadrid/front
  • minds/front
  • joe59/front
  • markharding/front
  • eiennohi/front
  • edgebal/front
  • msantang78/front
  • bhayward93/front
  • xorgy/front
  • duyquoc/front
  • benhayward.ben/front
  • mnurzia/front
  • priestd09/front
  • dknunn/front
  • Yersinia/front
  • literalpie/front
  • maruthi-adithya/front
  • javanick/front
  • juanmsolaro/front
  • ascenderking/front
  • fabiolalombardim/front
  • jim-toth/front
  • Shivathanu/front
  • pestixaba/front
  • project_connection/front
  • mul53/front
  • iamonuwa/front
  • manishoo/front
  • namesty/front
  • AaronTheBruce/front
  • bedriguler/front
  • th2tran/front
  • jun784/front
  • mdstevens044/front
  • CodingNagger/front
  • heenachauhan201/front
  • diazairic/front
  • m994/front
  • webprodev/minds_front
  • chaoukiammar/front
  • benn7/front
  • ung1807/front
  • vinliao/front-patch-1
  • suhailkakar/front
  • theokeist/minds-blog
45 results
Select Git revision
  • 1721-implement-cypress-code-coverage-and-generate-a-report-of-current-e2e-coverage-and-areas-that
  • 1991-enable-pro-to-general-public-with-feature-flag
  • 2676-get-required-checkmark-on-e2e
  • 3272-i-should-not-be-suggested-thai-groups-or-channels
  • 3869-mobile-web-keyboard-issue
  • 3988-user-auto-suggest-list-is-appearing-behind-other-stuff
  • 3991-add-24-hour-text-to-label-top-scheduler
  • 4030-m-topbarwrapper-is-behind-other-elements
  • 4157-invalid-email-error-from-minds-spanish
  • 6073-replace-title-line-editor-in-the-composer-on-ios-mobile-with-the-same-editor-as-the-description
  • add-nvmrc
  • analytics-service-1932
  • animationTweak
  • btc-settings-2346
  • bug-darkmode-color
  • chart-refactor-2170
  • chore/1351-skip-captcha-e2e
  • chore/ChannelButtonAdjust
  • chore/RobotoFallback
  • chore/add-missing-i18n-major-components
  • chore/add-scroll-to-settings
  • chore/api-serv-generics
  • chore/better-lint-command
  • chore/better-mr-template
  • chore/block-nsfw-boosts-4487
  • chore/cypress-6-upgrde
  • chore/cypress-test-jul-2021
  • chore/env-settings
  • chore/ethers-implementation-3548
  • chore/ethers-implementation-3548-3
  • chore/feature-cleanup-m4779
  • chore/feature-template
  • chore/fix-shared-key-cypress
  • chore/handle-mobile-page-as-case-insentitive
  • chore/helm-master
  • chore/hindi-merge
  • chore/husky-migrate-4949
  • chore/isolate-broken-e2e-tests
  • chore/l10n-sync
  • chore/language-service
  • chore/layout-chores
  • chore/nav-fixes
  • chore/ng9-bump
  • chore/no-nsfw-onboarding
  • chore/parallel-cypress-runners
  • chore/parallel-karma
  • chore/plyr-upgrade-2572
  • chore/porting-confirmation-dialog
  • chore/reduce-build-time
  • chore/register-modal-improvements-2965
  • chore/remove-legacy-code
  • chore/remove-rotator-styles-f6169
  • chore/revert-admin-confirm-4819
  • chore/sentry-source-maps
  • chore/settings-tests
  • chore/sourcemap-root-sentry-1782
  • chore/split-cypress-repo-test
  • chore/ssr-envs
  • chore/ssr-local-serve
  • chore/test-branch-delete
  • chore/test-pipeline-btns
  • chore/update-chat-1-4-19
  • chore/update-earnings-ux
  • chore/wire-support-tiers-2
  • chore/wire-to-pay-3151
  • chore/z-index-3790
  • confirm-leave-dialog-blogs
  • design-system-v2.0.0
  • design-system-v2.0.1
  • design-system-v2.0.2
  • design-system-v2.0.3
  • design-system-v2.1.2
  • design-system-v2.2.3
  • e2e-maintainence-2-2676
  • e2e-maintainence-3-2676
  • emoji-picker-e8ccf1
  • emoji-picker-e8ccf1-healthy
  • entity-centric-metrics
  • epic/SSR
  • epic/angular-9
  • epic/boost-campaign
  • epic/ckeditor5-blogs
  • epic/composer
  • epic/minds-redesign-110
  • epic/onboarding-v3
  • epic/permissions-28
  • epic/skale-integration
  • epic/totp-auth-modal
  • epic/totp-support-2021
  • epic/transcoder-improvements
  • epic/upgrades-page
  • epic/upgrades-page-updates
  • experiment-material-fonts
  • feat-campaign-cap-1169
  • feat-embeddable-video-player
  • feat/1170-admin-approve-campaign
  • feat/1732-block-refactor
  • feat/2511-activity-v2
  • feat/3996-plus-7-day-trial
  • feat/588-state-on-user
  • dev-0.1c
101 results
Show changes
Commits on Source (2)
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
(closed)="close.next(true)" (closed)="close.next(true)"
> >
<div class="m-blockchain--marketing--modal"> <div class="m-blockchain--marketing--modal m-blockchain__ethModal">
<h2>Buy ETH</h2> <h2>Buy ETH</h2>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<input type="number" <input type="number"
class="m-input" class="m-input"
[(ngModel)]="usd" [(ngModel)]="usd"
max="50" max="40"
/> />
<label>USD</label> <label>USD</label>
</div> </div>
...@@ -29,20 +29,26 @@ ...@@ -29,20 +29,26 @@
</div> </div>
</div> </div>
<p>ETH is estimated at 1 ETH = <b>$</b>{{ ethRate }}. The checkout process will produce a more accurate ETH value.</p> <p class="m-blockchainEthModal__ethPrice">
ETH is estimated at 1 ETH = <b>$</b>{{ ethRate }}. The checkout process will produce a more accurate ETH value.
</p>
<p class="m-error mdl-color-text--red" *ngIf="usd > 50"> <p class="m-error mdl-color-text--red" *ngIf="usd > 40">
You can not purchase more than $50 worth of ETH You can not purchase more than $40 worth of ETH
</p> </p>
<button class="m-btn m-btn--slim m-btn--action" (click)="buy()" *ngIf="hasMetamask"> <button class="m-btn m-btn--slim m-btn--action" (click)="buy()" *ngIf="hasMetamask">
Buy with SendWyre Buy with SendWyre
</button> </button>
<a href="https://metamask.io/" target="_blank" *ngIf="!hasMetamask"> <a href="https://metamask.io/" target="_blank" *ngIf="!hasMetamask && !isMobile()">
<button class="m-btn m-btn--slim m-btn--action">Download Metamask</button> <button class="m-btn m-btn--slim m-btn--action">Download Metamask</button>
</a> </a>
<a *ngIf="!hasMetamask && isMobile()">
<button class="m-btn m-btn--slim">Sorry, this feature is only available on desktop</button>
</a>
</div> </div>
</m-modal> </m-modal>
.m-blockchainEthModal__form { .m-blockchainEthModal__form {
margin: 36px 0; margin: 36px 0;
&.m-layout__row {
@media screen and (max-width: 900px) {
flex-wrap: wrap;
align-items: center;
flex-direction: column;
}
}
.m-input { .m-input {
padding: 16px; padding: 16px;
font-size: 24px; font-size: 24px;
...@@ -25,3 +33,14 @@ ...@@ -25,3 +33,14 @@
padding: 0 16px; padding: 0 16px;
} }
} }
.m-blockchain__ethModal {
.m-btn.m-btn--slim {
height: auto;
}
.m-blockchainEthModal__ethPrice {
@media screen and (max-width: 500px) {
display: none;
}
}
}
...@@ -17,6 +17,7 @@ import { BlockchainTdeBuyComponent } from '../tde-buy/tde-buy.component'; ...@@ -17,6 +17,7 @@ import { BlockchainTdeBuyComponent } from '../tde-buy/tde-buy.component';
import { Session } from '../../../services/session'; import { Session } from '../../../services/session';
import { Web3WalletService } from '../web3-wallet.service'; import { Web3WalletService } from '../web3-wallet.service';
import { TokenDistributionEventService } from '../contracts/token-distribution-event.service'; import { TokenDistributionEventService } from '../contracts/token-distribution-event.service';
import isMobile from '../../../helpers/is-mobile';
import * as BN from 'bn.js'; import * as BN from 'bn.js';
@Component({ @Component({
...@@ -89,4 +90,8 @@ export class BlockchainEthModalComponent implements OnInit { ...@@ -89,4 +90,8 @@ export class BlockchainEthModalComponent implements OnInit {
this.cd.detectChanges(); this.cd.detectChanges();
} }
isMobile() {
return isMobile();
}
} }
@import "defaults";
.m-group__grid { .m-group__grid {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -23,15 +25,25 @@ ...@@ -23,15 +25,25 @@
} }
.m-groupGrid__toggleBtn { .m-groupGrid__toggleBtn {
display: block;
z-index: 99;
cursor: pointer;
position: fixed;
right: 65px;
top: 55px;
@media screen and (max-width: $min-desktop) {
right: 8px;
top: 106px;
}
i {
font-size: 32px;
}
.material-icons { .material-icons {
@include m-theme(){ @include m-theme(){
text-shadow: 0px 0px 1px themed($m-white), 0px 0px 1px themed($m-white); text-shadow: 0px 0px 1px themed($m-white), 0px 0px 1px themed($m-white);
color: themed($m-grey-400); color: themed($m-grey-400);
} }
} }
@media screen and (max-width: 900px) {
right: 8px !important;
}
} }
} }
......
...@@ -253,22 +253,9 @@ ...@@ -253,22 +253,9 @@
</div> <!-- End Feeds --> </div> <!-- End Feeds -->
</div> <!-- END LEFT BLOCK --> </div> <!-- END LEFT BLOCK -->
<div class="m-groupGrid__toggleBtn" style=" <div class="m-groupGrid__toggleBtn" (click)="toggleConversations()">
/* left: 0; */ <i class="material-icons" *ngIf="showRight">keyboard_arrow_right</i>
position: fixed; <i class="material-icons" *ngIf="!showRight">keyboard_arrow_left</i>
top: 55px;
right: 65px;
display: block;
z-index: 99;
cursor: pointer;
"
(click)="toggleConversations()">
<i class="material-icons" style="
font-size: 32px;
" *ngIf="showRight">keyboard_arrow_right</i>
<i class="material-icons" style="
font-size: 32px;
" *ngIf="!showRight">keyboard_arrow_left</i>
</div> </div>
<div class="m-groupGrid__right" [hidden]="!showRight"> <div class="m-groupGrid__right" [hidden]="!showRight">
......
...@@ -129,6 +129,10 @@ m-wallet--balance-money, m-wallet--balance-reward, m-wallet--balance-tokens { ...@@ -129,6 +129,10 @@ m-wallet--balance-money, m-wallet--balance-reward, m-wallet--balance-tokens {
.m-wallet--balance--metamask { .m-wallet--balance--metamask {
margin-top: 16px; margin-top: 16px;
@media screen and (max-width: $max-mobile) {
display: none;
}
.m-wallet--balance--metamask-logo { .m-wallet--balance--metamask-logo {
width: 50px; width: 50px;
} }
......