Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-02 08:30:14 +01:00
Code Issues Projects Releases Wiki Activity

xtra small body height

Browse Source
This commit is contained in:
Kyle Spearrin 2017-09-11 21:23:22 -04:00
parent bbe4bdc865
commit 2e20f051c0
5 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/popup/app/accounts/views/accountsTwoFactorMethods.html
View File

@ -4,7 +4,7 @@
</div> </div>
<div class="title">{{i18n.twoStepOptions}}</div> <div class="title">{{i18n.twoStepOptions}}</div>
</div> </div>
<div class="content content-tabs"> <div class="content">
<div class="list"> <div class="list">
<div class="list-section"> <div class="list-section">
<div class="list-section-items"> <div class="list-section-items">

5
src/popup/app/global/mainController.js
View File

@ -6,8 +6,9 @@ angular
var self = this; var self = this;
self.currentYear = new Date().getFullYear(); self.currentYear = new Date().getFullYear();
self.animation = ''; self.animation = '';
self.shBody = $window.screen.availHeight <= 800; self.xsBody = $window.screen.availHeight < 600;
self.lgBody = utilsService && !utilsService.isFirefox() && !utilsService.isEdge() && !self.shBody; 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) { $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
if (toParams.animation) { if (toParams.animation) {

2
src/popup/index.html
View File

@ -96,7 +96,7 @@
<script src="app/lock/lockController.js"></script> <script src="app/lock/lockController.js"></script>
</head> </head>
<body ng-controller="mainController as main" class="{{main.animation}}" <body ng-controller="mainController as main" class="{{main.animation}}"
ng-class="{lg: main.lgBody, sh: main.shBody }"> ng-class="{lg: main.lgBody, sm: main.smBody, xs: main.xsBody }">
<div ui-view class="main-view"></div> <div ui-view class="main-view"></div>
</body> </body>
</html> </html>

40
src/popup/less/pages.less
View File

@ -111,3 +111,43 @@
margin-bottom: 30px; 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;
}
}
}

7
src/popup/less/popup.less
View File

@ -23,11 +23,16 @@ body.lg {
height: 667px !important; height: 667px !important;
} }
body.sh { body.sm {
width: 375px !important; width: 375px !important;
height: 500px !important; height: 500px !important;
} }
body.xs {
width: 375px !important;
height: 300px !important;
}
.main-view { .main-view {
position: absolute; position: absolute;
width: 100%; width: 100%;