diff --git a/src/popup/app/accounts/views/accountsTwoFactorMethods.html b/src/popup/app/accounts/views/accountsTwoFactorMethods.html index 2698acd171..da9499d080 100644 --- a/src/popup/app/accounts/views/accountsTwoFactorMethods.html +++ b/src/popup/app/accounts/views/accountsTwoFactorMethods.html @@ -4,7 +4,7 @@
{{i18n.twoStepOptions}}
-
+
diff --git a/src/popup/app/global/mainController.js b/src/popup/app/global/mainController.js index 315534b784..15f76efe74 100644 --- a/src/popup/app/global/mainController.js +++ b/src/popup/app/global/mainController.js @@ -6,8 +6,9 @@ angular var self = this; self.currentYear = new Date().getFullYear(); self.animation = ''; - self.shBody = $window.screen.availHeight <= 800; - self.lgBody = utilsService && !utilsService.isFirefox() && !utilsService.isEdge() && !self.shBody; + self.xsBody = $window.screen.availHeight < 600; + self.smBody = !self.xsBody && $window.screen.availHeight <= 800; + self.lgBody = !self.xsBody && !self.smBody && utilsService && !utilsService.isFirefox() && !utilsService.isEdge(); $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) { if (toParams.animation) { diff --git a/src/popup/index.html b/src/popup/index.html index 2a29776605..aa1d627101 100644 --- a/src/popup/index.html +++ b/src/popup/index.html @@ -96,7 +96,7 @@ + ng-class="{lg: main.lgBody, sm: main.smBody, xs: main.xsBody }">
diff --git a/src/popup/less/pages.less b/src/popup/less/pages.less index a72936d010..fefe434571 100644 --- a/src/popup/less/pages.less +++ b/src/popup/less/pages.less @@ -111,3 +111,43 @@ margin-bottom: 30px; } } + +body.xs { + .premium-page, .home-page, .splash-page { + height: auto; + } + + .home-page { + padding-top: 50px; + } + + .splash-page { + padding-top: 60px; + } + + .premium-page { + padding-top: 20px; + } + + .bottom-buttons { + position: relative; + } +} + +body.sm { + .premium-page { + padding-top: 20px; + + .bottom-buttons { + position: relative; + } + + p.lead { + margin-bottom: 10px; + } + + ul { + margin-bottom: 20px; + } + } +} diff --git a/src/popup/less/popup.less b/src/popup/less/popup.less index 370a20e0ec..be73ff3754 100644 --- a/src/popup/less/popup.less +++ b/src/popup/less/popup.less @@ -23,11 +23,16 @@ body.lg { height: 667px !important; } -body.sh { +body.sm { width: 375px !important; height: 500px !important; } +body.xs { + width: 375px !important; + height: 300px !important; +} + .main-view { position: absolute; width: 100%;