diff --git a/app/assets/stylesheets/app/_ionicons.scss b/app/assets/stylesheets/app/_ionicons.scss index 6390e6f48..48b99d156 100644 --- a/app/assets/stylesheets/app/_ionicons.scss +++ b/app/assets/stylesheets/app/_ionicons.scss @@ -13,32 +13,20 @@ @font-face { font-family: "Ionicons"; src: url("../assets/ionicons.eot?v=2.0.0"); src: url("../assets/ionicons.eot?v=2.0.1#iefix") format("embedded-opentype"), url("../assets/ionicons.ttf?v=2.0.1") format("truetype"), url("../assets/ionicons.woff?v=2.0.1") format("woff"), url("../assets/ionicons.svg?v=2.0.1#Ionicons") format("svg"); font-weight: normal; font-style: normal; } .ion, .ionicons, -.ion-ios-box:before, -.ion-bookmark:before, .ion-locked:before, +.ion-plus:before, .ion-arrow-return-left:before, .ion-arrow-return-right:before, -.ion-key:before, -.ion-lock-combination:before, -.ion-eye-disabled:before { display: inline-block; font-family: "Ionicons"; speak: none; font-style: normal; font-weight: normal; font-variant: normal; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.ion-ios-box:before { content: "\f3ec"; } - .ion-locked:before { content: "\f200"; } -.ion-bookmark:before { content: "\f26b"; } +.ion-plus:before { content: "\f218"; } .ion-arrow-return-left:before { content: "\f265"; } .ion-arrow-return-right:before { content: "\f266"; } -.ion-key:before { content: "\f296"; } - -.ion-lock-combination:before { content: "\f4d4"; } - -.ion-eye-disabled:before { content: "\f306"; } - /*# sourceMappingURL=ionicons.css.map */ diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index a63f25de2..7dc1a4a0f 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -194,6 +194,10 @@ $footer-height: 32px; padding: 0 14px; } + .add-button { + font-size: 12px; + } + .section-title-bar-header { display: flex; justify-content: space-between; diff --git a/app/assets/templates/notes.html.haml b/app/assets/templates/notes.html.haml index f5f6e2e0f..4575da770 100644 --- a/app/assets/templates/notes.html.haml +++ b/app/assets/templates/notes.html.haml @@ -5,7 +5,8 @@ .section-title-bar-header .title {{ctrl.panelTitle}} .sk-button.contrast.wide{"ng-click" => "ctrl.createNewNote()", "title" => "Create a new note in the selected tag"} - .sk-label + + .sk-label + %i.icon.ion-plus.add-button .filter-section{"role" => "search"} %input.filter-bar#search-bar.mousetrap{"select-on-click" => "true", "ng-model" => "ctrl.noteFilter.text", "placeholder" => "Search", "ng-change" => "ctrl.filterTextChanged()", "lowercase" => "true", "ng-blur" => "ctrl.onFilterEnter()", "ng-keyup" => "$event.keyCode == 13 && ctrl.onFilterEnter();", diff --git a/app/assets/templates/tags.html.haml b/app/assets/templates/tags.html.haml index 7c0a15ff4..d8b6eafde 100644 --- a/app/assets/templates/tags.html.haml +++ b/app/assets/templates/tags.html.haml @@ -9,7 +9,8 @@ .sk-h3.title %span.sk-bold Views .sk-button.sk-secondary-contrast.wide{"ng-click" => "ctrl.clickedAddNewTag()", "title" => "Create a new tag"} - .sk-label + + .sk-label + %i.icon.ion-plus.add-button .scrollable .infinite-scroll diff --git a/dist/assets/ionicons.eot b/dist/assets/ionicons.eot index b2e176a7b..db772e5aa 100644 Binary files a/dist/assets/ionicons.eot and b/dist/assets/ionicons.eot differ diff --git a/dist/assets/ionicons.svg b/dist/assets/ionicons.svg index 41ab5a832..67f37aadf 100755 --- a/dist/assets/ionicons.svg +++ b/dist/assets/ionicons.svg @@ -1,13 +1,13 @@ -Created by FontForge 20170925 at Thu Dec 13 12:46:07 2018 - By mo -Copyright (c) 2018, mo +Created by FontForge 20190318 at Thu Apr 11 10:47:26 2019 + By Mo Bitar +Copyright (c) 2019, Mo Bitar @@ -16,35 +16,21 @@ Copyright (c) 2018, mo font-weight="400" font-stretch="normal" units-per-em="512" - panose-1="2 0 5 3 0 0 0 0 0 0" + panose-1="2 0 5 9 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="0 -64 448 448" + bbox="0 -32 384 416" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F200-F4D4" + unicode-range="U+F200-F266" /> - - - - - + diff --git a/dist/assets/ionicons.ttf b/dist/assets/ionicons.ttf index 8f31abd2f..d0ebfd4f6 100755 Binary files a/dist/assets/ionicons.ttf and b/dist/assets/ionicons.ttf differ diff --git a/dist/assets/ionicons.woff b/dist/assets/ionicons.woff index 86767230e..af5fd5d97 100755 Binary files a/dist/assets/ionicons.woff and b/dist/assets/ionicons.woff differ diff --git a/package-lock.json b/package-lock.json index 1b57ffcad..61a7ba860 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.0.7", + "version": "3.0.7-beta1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b5f221adf..bcda05090 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "standard-notes-web", - "version": "3.0.7", + "version": "3.0.7-beta1", "license": "AGPL-3.0-or-later", "repository": { "type": "git",