keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

layout bugfixes

This commit is contained in:
Antelle 2016-02-03 23:31:54 +03:00
parent bb6f4a55c4
commit 2fd6e11b46
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/util/locale.js
View File

@ -168,7 +168,7 @@ var Locale = {
setGenUpdate: 'Update',
setGenNewVersion: 'New app version was released and downloaded',
setGenReleaseNotes: 'View release notes',
setGenReloadTpUpdate: 'Reload to update',
setGenReloadToUpdate: 'Reload to update',
setGenUpdateManual: 'New version has been released. It will check for updates and install them automatically ' +
'but auto-upgrading from your version is impossible.',
setGenDownloadUpdate: 'Download update',

5
app/styles/common/_icon-select.scss
View File

@ -1,10 +1,5 @@
&.icon-select {
@include display(flex);
@include align-items(stretch);
@include flex-direction(column);
@include justify-content(flex-start);
&__items {
@include flex(1 1 auto);
@include display(flex);
@include align-items(flex-start);
@include flex-direction(row);

4
app/templates/icon-select.hbs
View File

@ -1,7 +1,7 @@
<div class="icon-select">
<div class="icon-select__items">
{{#each icons as |icon ix|}}
<i class="fa fa-{{icon}} icon-select__icon {{#ifeq ix sel}}icon-select__icon--active{{/ifeq}}" data-val="{{ix}}"></i>
<i class="fa fa-{{icon}} icon-select__icon {{#ifeq ix ../sel}}icon-select__icon--active{{/ifeq}}" data-val="{{ix}}"></i>
{{/each}}
</div>
<div class="icon-select__items icon-select__items--custom">
@ -17,7 +17,7 @@
<i class="fa fa-ellipsis-h"></i>
</span>
{{#each customIcons as |icon ci|}}
<span class="icon-select__icon icon-select__icon-btn icon-select__icon-custom {{#ifeq ci sel}}icon-select__icon--active{{/ifeq}}"
<span class="icon-select__icon icon-select__icon-btn icon-select__icon-custom {{#ifeq ci ../sel}}icon-select__icon--active{{/ifeq}}"
data-val="{{ci}}">
<img src="{{{icon}}}" />
</span>

2
app/templates/settings/settings-general.hbs
View File

@ -41,7 +41,7 @@
<label for="settings__general-theme">{{res 'setGenTheme'}}:</label>
<select class="settings__general-theme settings__select input-base" id="settings__general-theme">
{{#each themes as |name key|}}
<option value="{{key}}" {{#ifeq key activeTheme}}selected{{/ifeq}}>{{name}}</option>
<option value="{{key}}" {{#ifeq key ../activeTheme}}selected{{/ifeq}}>{{name}}</option>
{{/each}}
</select>
</div>