diff options
| author | fnuesse <felix.nuesse@t-online.de> | 2018-09-30 22:17:53 +0300 |
|---|---|---|
| committer | fnuesse <felix.nuesse@t-online.de> | 2018-11-21 19:33:51 +0300 |
| commit | 3306fce7bf8edef1e6978a31cb3263d80a4b9240 (patch) | |
| tree | 34d16d746060ac4f9123dac18da0b01ea1aa8417 | |
| parent | 0f634ef8204508c44d089afde7d5179490ede266 (diff) | |
Fix credential-editing layout
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
| -rw-r--r-- | css/app.css | 4 | ||||
| -rw-r--r-- | sass/credentials.scss | 16 | ||||
| -rw-r--r-- | sass/partials/pwgen.scss | 1 | ||||
| -rw-r--r-- | templates/views/partials/icon-picker.html | 10 |
4 files changed, 16 insertions, 15 deletions
diff --git a/css/app.css b/css/app.css index 97271afd..cd574b01 100644 --- a/css/app.css +++ b/css/app.css @@ -470,8 +470,8 @@ border-bottom-left-radius: 3px; background-clip: padding-box; } #app-content #app-content-wrapper .credential-table { - width: 100%; - margin-top: 44px; } + width: 100vh; + } #app-content #app-content-wrapper .credential-table tr:hover { background-color: whitesmoke; } #app-content #app-content-wrapper .credential-table tr.selected { diff --git a/sass/credentials.scss b/sass/credentials.scss index b5c3892e..51b20aeb 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -573,19 +573,24 @@ @include border-left-radius(0) } .icon-picker { - //float: left; - margin-top: 3px; - margin-left: -3px; + //position: relative; //@include border-left-radius(3px); + float: left; + margin-top: 3px; + padding-top: 7px; .cell { //min-height: 44px; + margin-top: 0px; + margin-left: -0px; + padding: 7px 12px 2px 12px; - display: inline-block; + display: inline; + font-size: 14px; border: 1px solid #ddd; background-color: lighten(#ddd, 5%); cursor: pointer; - //@include border-left-radius(6px); + @include border-left-radius(6px); //img { // height: 16px; //} @@ -596,6 +601,7 @@ } } + #iconPicker { .iconList { float: left; diff --git a/sass/partials/pwgen.scss b/sass/partials/pwgen.scss index 5e8d0173..a94a1a92 100644 --- a/sass/partials/pwgen.scss +++ b/sass/partials/pwgen.scss @@ -41,6 +41,7 @@ float: left; margin-top: 3px; margin-left: -3px; + padding-bottom:1px; .cell{ padding: 5px; display: inline-block; diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html index 7de7b864..22e511f6 100644 --- a/templates/views/partials/icon-picker.html +++ b/templates/views/partials/icon-picker.html @@ -1,10 +1,5 @@ -<div> - <div class="cell"> - <span > - <span class="icon icon-category-auth"></span> - </span> - </div> - <div style="display: none" id="iconPicker" title="{{ 'pick.icon' | translate }}"> +<div class="cell icon-category-auth"></div> +<div style="display: none" id="iconPicker" title="{{ 'pick.icon' | translate }}"> <div class="iconList"> <div ng-repeat="(groupName, icons) in iconGroups"> <h2 style="clear: both" id="{{groupName}}">{{groupName}}</h2> @@ -27,4 +22,3 @@ </div> </div> </div> -</div>
\ No newline at end of file |