1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00

larger modals. sm breakpoints on login add/edit

This commit is contained in:
Kyle Spearrin
2017-09-21 23:19:06 -04:00
parent e952073c3c
commit a0e5591f8e
3 changed files with 23 additions and 15 deletions

View File

@@ -11,13 +11,13 @@
</ul> </ul>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="name">Name</label> <span>*</span> <label for="name">Name</label> <span>*</span>
<input type="text" id="name" name="Name" ng-model="login.name" class="form-control" required api-field /> <input type="text" id="name" name="Name" ng-model="login.name" class="form-control" required api-field />
</div> </div>
</div> </div>
<div class="col-md-6" ng-if="!hideFolders"> <div class="col-sm-6" ng-if="!hideFolders">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="folder">Folder</label> <label for="folder">Folder</label>
<select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field> <select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field>
@@ -40,7 +40,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="username">Username</label> <label for="username">Username</label>
<div class="input-group"> <div class="input-group">
@@ -55,7 +55,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors style="margin-bottom: 5px;"> <div class="form-group" show-errors style="margin-bottom: 5px;">
<div class="pull-right password-options"> <div class="pull-right password-options">
<i class="fa fa-lg fa-refresh" uib-tooltip="Generate Password" tooltip-placement="left" ng-click="generatePassword()"></i> <i class="fa fa-lg fa-refresh" uib-tooltip="Generate Password" tooltip-placement="left" ng-click="generatePassword()"></i>
@@ -80,14 +80,14 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="totp">Authenticator Key (TOTP)</label> <label for="totp">Authenticator Key (TOTP)</label>
<input type="text" id="totp" name="Totp" ng-model="login.totp" class="form-control" <input type="text" id="totp" name="Totp" ng-model="login.totp" class="form-control"
ng-readonly="readOnly" api-field /> ng-readonly="readOnly" api-field />
</div> </div>
</div> </div>
<div class="col-md-6 totp-col"> <div class="col-sm-6 totp-col">
<div totp="login.totp" id="verification-code" ng-if="useTotp"></div> <div totp="login.totp" id="verification-code" ng-if="useTotp"></div>
<div ng-if="!useTotp"> <div ng-if="!useTotp">
<a href="#" stop-click ng-click="showUpgrade()"><img src="images/totp-countdown.png" alt="" /></a> <a href="#" stop-click ng-click="showUpgrade()"><img src="images/totp-countdown.png" alt="" /></a>
@@ -143,7 +143,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-1"> <div class="col-sm-1">
<br class="hidden-xs" /> <br class="hidden-xs" />
<a href="#" ng-click="removeField(field)" stop-click> <a href="#" ng-click="removeField(field)" stop-click>
<i class="fa fa-window-close-o fa-lg"></i> <i class="fa fa-window-close-o fa-lg"></i>

View File

@@ -13,14 +13,14 @@
</ul> </ul>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="name">Name</label> <span>*</span> <label for="name">Name</label> <span>*</span>
<input type="text" id="name" name="Name" ng-model="login.name" class="form-control" <input type="text" id="name" name="Name" ng-model="login.name" class="form-control"
ng-readonly="readOnly" required api-field /> ng-readonly="readOnly" required api-field />
</div> </div>
</div> </div>
<div class="col-md-6" ng-if="!hideFolders"> <div class="col-sm-6" ng-if="!hideFolders">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="folder">Folder</label> <label for="folder">Folder</label>
<select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field> <select id="folder" name="FolderId" ng-model="login.folderId" class="form-control" api-field>
@@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="username">Username</label> <label for="username">Username</label>
<div class="input-group"> <div class="input-group">
@@ -66,7 +66,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors style="margin-bottom: 5px;"> <div class="form-group" show-errors style="margin-bottom: 5px;">
<div class="pull-right password-options"> <div class="pull-right password-options">
<i class="fa fa-lg fa-refresh" uib-tooltip="Generate Password" tooltip-placement="left" <i class="fa fa-lg fa-refresh" uib-tooltip="Generate Password" tooltip-placement="left"
@@ -92,14 +92,14 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-sm-6">
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="totp">Authenticator Key (TOTP)</label> <label for="totp">Authenticator Key (TOTP)</label>
<input type="text" id="totp" name="Totp" ng-model="login.totp" class="form-control" <input type="text" id="totp" name="Totp" ng-model="login.totp" class="form-control"
ng-readonly="readOnly" api-field /> ng-readonly="readOnly" api-field />
</div> </div>
</div> </div>
<div class="col-md-6 totp-col"> <div class="col-sm-6 totp-col">
<div totp="login.totp" id="verification-code" ng-if="useTotp"></div> <div totp="login.totp" id="verification-code" ng-if="useTotp"></div>
<div ng-if="!useTotp"> <div ng-if="!useTotp">
<a href="#" stop-click ng-click="showUpgrade()"><img src="images/totp-countdown.png" alt="" /></a> <a href="#" stop-click ng-click="showUpgrade()"><img src="images/totp-countdown.png" alt="" /></a>
@@ -159,7 +159,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-1"> <div class="col-sm-1">
<br class="hidden-xs" /> <br class="hidden-xs" />
<a href="#" ng-click="removeField(field)" stop-click ng-if="!readOnly"> <a href="#" ng-click="removeField(field)" stop-click ng-if="!readOnly">
<i class="fa fa-window-close-o fa-lg"></i> <i class="fa fa-window-close-o fa-lg"></i>

View File

@@ -386,10 +386,18 @@ form .btn .loading-icon {
font-size: @font-size-large; font-size: @font-size-large;
} }
} }
/* Modals */ /* Modals */
.modal-footer { .modal-footer {
text-align: left; text-align: left;
} }
@media (min-width: @screen-sm-min) {
.modal-dialog {
width: 700px;
}
}
/* Tables */ /* Tables */
.table-selectable { .table-selectable {
td:not(.actions) { td:not(.actions) {
@@ -759,7 +767,7 @@ h1, h2, h3, h4, h5, h6 {
margin-bottom: 10px; margin-bottom: 10px;
} }
@media (min-width: @screen-md) { @media (min-width: @screen-sm) {
.progress { .progress {
margin-bottom: 0; margin-bottom: 0;
} }