diff --git a/app/scripts/const/icon-map.js b/app/scripts/const/icon-map.js index 5d86beb7..6ae02c71 100644 --- a/app/scripts/const/icon-map.js +++ b/app/scripts/const/icon-map.js @@ -4,11 +4,11 @@ const IconMap = [ 'exclamation-triangle', 'server', 'thumbtack', - 'comments-o', + 'comments', 'puzzle-piece', 'edit', 'plug', - 'newspaper-o', + 'newspaper', 'paperclip', 'camera', 'wifi', @@ -18,10 +18,10 @@ const IconMap = [ 'certificate', 'bullseye', 'desktop', - 'envelope-o', + 'envelope', 'cog', 'clipboard', - 'paper-plane-o', + 'paper-plane', 'tv', 'bolt', 'inbox', @@ -43,7 +43,7 @@ const IconMap = [ 'flask', 'gamepad', 'trash', - 'sticky-note-o', + 'sticky-note', 'ban', 'question-circle', 'cube', diff --git a/app/scripts/models/attachment-model.js b/app/scripts/models/attachment-model.js index ea560911..1f0d767a 100644 --- a/app/scripts/models/attachment-model.js +++ b/app/scripts/models/attachment-model.js @@ -48,7 +48,7 @@ function getIcon(ext) { case 'log': case 'rtf': case 'pem': - return 'file-alt-o'; + return 'file-alt'; case 'html': case 'htm': case 'js': @@ -74,9 +74,9 @@ function getIcon(ext) { case 'yml': case 'asm': case 'bat': - return 'file-code-o'; + return 'file-code'; case 'pdf': - return 'file-pdf-o'; + return 'file-pdf'; case 'zip': case 'rar': case 'bz': @@ -89,16 +89,16 @@ function getIcon(ext) { case 'ace': case 'dmg': case 'jar': - return 'file-archive-o'; + return 'file-archive'; case 'doc': case 'docx': - return 'file-word-o'; + return 'file-word'; case 'xls': case 'xlsx': - return 'file-excel-o'; + return 'file-excel'; case 'ppt': case 'pptx': - return 'file-powerpoint-o'; + return 'file-powerpoint'; case 'jpeg': case 'jpg': case 'png': @@ -108,7 +108,7 @@ function getIcon(ext) { case 'svg': case 'ico': case 'psd': - return 'file-image-o'; + return 'file-image'; case 'avi': case 'mp4': case '3gp': @@ -117,13 +117,13 @@ function getIcon(ext) { case 'mpeg': case 'mpg': case 'mpe': - return 'file-video-o'; + return 'file-video'; case 'mp3': case 'wav': case 'flac': - return 'file-audio-o'; + return 'file-audio'; } - return 'file-o'; + return 'file'; } function getMimeType(ext) { diff --git a/app/scripts/models/menu/menu-model.js b/app/scripts/models/menu/menu-model.js index f31115f1..60460e28 100644 --- a/app/scripts/models/menu/menu-model.js +++ b/app/scripts/models/menu/menu-model.js @@ -69,7 +69,7 @@ class MenuModel extends Model { { locTitle: 'menuSetGeneral', icon: 'cog', page: 'general', active: true } ]); this.shortcutsSection = new MenuSectionModel([ - { locTitle: 'shortcuts', icon: 'keyboard-o', page: 'shortcuts' } + { locTitle: 'shortcuts', icon: 'keyboard', page: 'shortcuts' } ]); this.pluginsSection = new MenuSectionModel([ { locTitle: 'plugins', icon: 'puzzle-piece', page: 'plugins' } diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js index 8d813dac..da627b69 100644 --- a/app/scripts/views/details/details-view.js +++ b/app/scripts/views/details/details-view.js @@ -267,7 +267,7 @@ class DetailsView extends View { if (AutoType.enabled) { moreOptions.push({ value: 'auto-type', - icon: 'keyboard-o', + icon: 'keyboard', text: Locale.detAutoTypeSettings }); } @@ -893,7 +893,7 @@ class DetailsView extends View { } } if (AutoType.enabled) { - options.push({ value: 'det-auto-type', icon: 'keyboard-o', text: Locale.detAutoType }); + options.push({ value: 'det-auto-type', icon: 'keyboard', text: Locale.detAutoType }); } Events.emit('show-context-menu', Object.assign(e, { options })); } diff --git a/app/scripts/views/fields/field-view.js b/app/scripts/views/fields/field-view.js index 1b881d36..e0f7e52c 100644 --- a/app/scripts/views/fields/field-view.js +++ b/app/scripts/views/fields/field-view.js @@ -236,7 +236,7 @@ class FieldView extends View { } if (AutoType.enabled && this.model.sequence) { - options.push({ value: 'autotype', icon: 'keyboard-o', text: Locale.detAutoTypeField }); + options.push({ value: 'autotype', icon: 'keyboard', text: Locale.detAutoTypeField }); } const rect = this.$el[0].getBoundingClientRect(); diff --git a/app/scripts/views/icon-select-view.js b/app/scripts/views/icon-select-view.js index 7899d1c2..d106c473 100644 --- a/app/scripts/views/icon-select-view.js +++ b/app/scripts/views/icon-select-view.js @@ -51,9 +51,10 @@ class IconSelectView extends View { return; } this.downloadingFavicon = true; - this.$el.find('.icon-select__icon-download>i').addClass('fa-spinner spin'); + this.$el.find('.icon-select__icon-download>i').addClass('spin'); this.$el .find('.icon-select__icon-download') + .addClass('icon-select__icon--progress') .removeClass('icon-select__icon--download-error'); const url = this.getIconUrl(true); const img = document.createElement('img'); @@ -62,19 +63,20 @@ class IconSelectView extends View { img.onload = () => { this.setSpecialImage(img, 'download'); this.$el.find('.icon-select__icon-download img').remove(); - this.$el.find('.icon-select__icon-download>i').removeClass('fa-spinner spin'); + this.$el.find('.icon-select__icon-download>i').removeClass('spin'); this.$el .find('.icon-select__icon-download') + .removeClass('icon-select__icon--progress') .addClass('icon-select__icon--custom-selected') .append(img); this.downloadingFavicon = false; }; img.onerror = (e) => { logger.error('Favicon download error: ' + url, e); - this.$el.find('.icon-select__icon-download>i').removeClass('fa-spinner spin'); + this.$el.find('.icon-select__icon-download>i').removeClass('spin'); this.$el .find('.icon-select__icon-download') - .removeClass('icon-select__icon--custom-selected') + .removeClass('icon-select__icon--custom-selected icon-select__icon--progress') .addClass('icon-select__icon--download-error'); this.downloadingFavicon = false; }; diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js index 42f6ffac..04e2a1ea 100644 --- a/app/scripts/views/open-view.js +++ b/app/scripts/views/open-view.js @@ -803,7 +803,7 @@ class OpenView extends View { Alerts.alert({ header: Locale.openSelectFile, body: Locale.openSelectFileBody, - icon: storage.icon || 'file-alt-o', + icon: storage.icon || 'file-alt', buttons: [{ result: '', title: Locale.alertCancel }], esc: '', click: '', diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js index 61bc20e1..1a100b7d 100644 --- a/app/scripts/views/settings/settings-file-view.js +++ b/app/scripts/views/settings/settings-file-view.js @@ -336,7 +336,7 @@ class SettingsFileView extends View { Alerts.alert({ header: '', body: '', - icon: storage.icon || 'file-alt-o', + icon: storage.icon || 'file-alt', buttons: [Alerts.buttons.ok, Alerts.buttons.cancel], esc: '', opaque: true, diff --git a/app/styles/areas/_settings.scss b/app/styles/areas/_settings.scss index 3fac120d..aeb0592e 100644 --- a/app/styles/areas/_settings.scss +++ b/app/styles/areas/_settings.scss @@ -58,6 +58,11 @@ &-post { display: none; } + &-post { + margin-left: $tiny-spacing; + margin-right: $small-spacing; + vertical-align: bottom; + } cursor: pointer; @include mobile { line-height: $mobile-back-button-height; diff --git a/app/styles/base/_icon-font.scss b/app/styles/base/_icon-font.scss index 8d48cbde..47c45ddf 100644 --- a/app/styles/base/_icon-font.scss +++ b/app/styles/base/_icon-font.scss @@ -61,15 +61,15 @@ $fa-var-cog: next-fa-glyph(); $fa-var-server: next-fa-glyph(); $fa-var-file-alt: next-fa-glyph(); $fa-var-file-alt-o: next-fa-glyph(); -$fa-var-file-code-o: next-fa-glyph(); -$fa-var-file-pdf-o: next-fa-glyph(); -$fa-var-file-archive-o: next-fa-glyph(); -$fa-var-file-word-o: next-fa-glyph(); -$fa-var-file-excel-o: next-fa-glyph(); -$fa-var-file-powerpoint-o: next-fa-glyph(); -$fa-var-file-image-o: next-fa-glyph(); -$fa-var-file-video-o: next-fa-glyph(); -$fa-var-file-audio-o: next-fa-glyph(); +$fa-var-file-code: next-fa-glyph(); +$fa-var-file-pdf: next-fa-glyph(); +$fa-var-file-archive: next-fa-glyph(); +$fa-var-file-word: next-fa-glyph(); +$fa-var-file-excel: next-fa-glyph(); +$fa-var-file-powerpoint: next-fa-glyph(); +$fa-var-file-image: next-fa-glyph(); +$fa-var-file-video: next-fa-glyph(); +$fa-var-file-audio: next-fa-glyph(); $fa-var-onedrive: next-fa-glyph(); $fa-var-question: next-fa-glyph(); $fa-var-sign-out-alt: next-fa-glyph(); @@ -80,7 +80,7 @@ $fa-var-tags: next-fa-glyph(); $fa-var-th-large: next-fa-glyph(); $fa-var-trash: next-fa-glyph(); $fa-var-trash-alt: next-fa-glyph(); -$fa-var-keyboard-o: next-fa-glyph(); +$fa-var-keyboard: next-fa-glyph(); $fa-var-puzzle-piece: next-fa-glyph(); $fa-var-usb: next-fa-glyph(); $fa-var-info: next-fa-glyph(); @@ -89,10 +89,10 @@ $fa-var-key: next-fa-glyph(); $fa-var-globe: next-fa-glyph(); $fa-var-exclamation-triangle: next-fa-glyph(); $fa-var-thumbtack: next-fa-glyph(); -$fa-var-comments-o: next-fa-glyph(); +$fa-var-comments: next-fa-glyph(); $fa-var-edit: next-fa-glyph(); $fa-var-plug: next-fa-glyph(); -$fa-var-newspaper-o: next-fa-glyph(); +$fa-var-newspaper: next-fa-glyph(); $fa-var-paperclip: next-fa-glyph(); $fa-var-camera: next-fa-glyph(); $fa-var-wifi: next-fa-glyph(); @@ -103,9 +103,9 @@ $fa-var-barcode: next-fa-glyph(); $fa-var-certificate: next-fa-glyph(); $fa-var-bullseye: next-fa-glyph(); $fa-var-desktop: next-fa-glyph(); -$fa-var-envelope-o: next-fa-glyph(); +$fa-var-envelope: next-fa-glyph(); $fa-var-clipboard: next-fa-glyph(); -$fa-var-paper-plane-o: next-fa-glyph(); +$fa-var-paper-plane: next-fa-glyph(); $fa-var-tv: next-fa-glyph(); $fa-var-inbox: next-fa-glyph(); $fa-var-save: next-fa-glyph(); @@ -125,6 +125,7 @@ $fa-var-clock: next-fa-glyph(); $fa-var-search: next-fa-glyph(); $fa-var-flask: next-fa-glyph(); $fa-var-gamepad: next-fa-glyph(); +$fa-var-sticky-note: next-fa-glyph(); $fa-var-sticky-note-o: next-fa-glyph(); $fa-var-question-circle: next-fa-glyph(); $fa-var-cube: next-fa-glyph(); diff --git a/app/styles/base/_variables.scss b/app/styles/base/_variables.scss index fff8ed1b..ed884ce8 100644 --- a/app/styles/base/_variables.scss +++ b/app/styles/base/_variables.scss @@ -17,6 +17,7 @@ $heading-line-height: 1.2; $base-border-radius: 1px; $base-spacing: $base-line-height * 1em; $small-spacing: $base-spacing / 2; +$tiny-spacing: $small-spacing / 2; $base-z-index: 0; $base-padding-v: 0.5em; $base-padding-h: 1em; diff --git a/app/styles/common/_icon-select.scss b/app/styles/common/_icon-select.scss index 6fc1376b..7cdcd904 100644 --- a/app/styles/common/_icon-select.scss +++ b/app/styles/common/_icon-select.scss @@ -33,6 +33,9 @@ display: none; } } + &--progress > i:before { + content: $fa-var-spinner; + } &--download-error > i:before { content: $fa-var-ban; } diff --git a/app/styles/utils/_back-button.scss b/app/styles/utils/_back-button.scss index 4d0a1c36..35030997 100644 --- a/app/styles/utils/_back-button.scss +++ b/app/styles/utils/_back-button.scss @@ -5,4 +5,9 @@ right: $base-padding-h; padding: $base-padding-v * 2 0 1px 0; z-index: 1; + &__post { + vertical-align: bottom; + margin-left: $tiny-spacing; + margin-right: $small-spacing; + } } diff --git a/app/templates/generator-presets.hbs b/app/templates/generator-presets.hbs index 11189d7a..9d803239 100644 --- a/app/templates/generator-presets.hbs +++ b/app/templates/generator-presets.hbs @@ -1,6 +1,6 @@
- {{res 'retToApp'}} + {{res 'retToApp'}}
diff --git a/app/templates/grp.hbs b/app/templates/grp.hbs index 9896e5ec..0582d80b 100644 --- a/app/templates/grp.hbs +++ b/app/templates/grp.hbs @@ -1,6 +1,6 @@
- {{res 'retToApp'}} + {{res 'retToApp'}}
diff --git a/app/templates/import-csv.hbs b/app/templates/import-csv.hbs index 4cd062cb..ee2ceef4 100644 --- a/app/templates/import-csv.hbs +++ b/app/templates/import-csv.hbs @@ -1,7 +1,7 @@
- {{res 'retToApp'}} + {{res 'retToApp'}}

{{res 'importCsvTitle'}}

diff --git a/app/templates/settings/settings-about.hbs b/app/templates/settings/settings-about.hbs index 01fb96c9..05b15ce9 100644 --- a/app/templates/settings/settings-about.hbs +++ b/app/templates/settings/settings-about.hbs @@ -62,7 +62,7 @@

Graphics

{{res 'setAboutLic'}}

diff --git a/app/templates/settings/settings-file.hbs b/app/templates/settings/settings-file.hbs index b6844c0d..044de7a0 100644 --- a/app/templates/settings/settings-file.hbs +++ b/app/templates/settings/settings-file.hbs @@ -26,7 +26,7 @@

{{res 'setFileSaveTo'}}

{{#ifneq storage 'file'}}
- {{Res 'file'}} + {{Res 'file'}}
{{/ifneq}} {{#each storageProviders as |prv|}} diff --git a/app/templates/settings/settings-shortcuts.hbs b/app/templates/settings/settings-shortcuts.hbs index 16f4c8e8..6f12453d 100644 --- a/app/templates/settings/settings-shortcuts.hbs +++ b/app/templates/settings/settings-shortcuts.hbs @@ -1,5 +1,5 @@
-

{{res 'setShTitle'}}

+

{{res 'setShTitle'}}

{{cmd}}A {{res 'or'}} {{alt}}A {{res 'setShShowAll'}}
{{alt}}C {{res 'setShColors'}}
{{alt}}D {{res 'setShTrash'}}
diff --git a/app/templates/storage-file-list.hbs b/app/templates/storage-file-list.hbs index 9780bdd9..cb3c57a6 100644 --- a/app/templates/storage-file-list.hbs +++ b/app/templates/storage-file-list.hbs @@ -15,7 +15,7 @@ {{#each files as |file|}} {{#unless file.dir}}
- + {{file.name}}
{{/unless}} diff --git a/app/templates/tag.hbs b/app/templates/tag.hbs index 11dbd982..ab86d6ba 100644 --- a/app/templates/tag.hbs +++ b/app/templates/tag.hbs @@ -1,6 +1,6 @@
- {{res 'retToApp'}} + {{res 'retToApp'}}

{{res 'tagTitle'}}