rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #308 from bryvin/theme-toggle-titles

Browse Source 
Dock Icon Titles/Names
This commit is contained in:
Mo Bitar
2019-09-16 10:32:49 -05:00
committed by GitHub
parent 22b241055b 332e588081
commit 9be8d11fea
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/footer.js
View File

@@ -213,11 +213,13 @@ angular.module('app')
this.reloadDockShortcuts = function() { this.reloadDockShortcuts = function() {
let shortcuts = []; let shortcuts = [];
for(var theme of this.themesWithIcons) { for(var theme of this.themesWithIcons) {
var name = theme.content.package_info.name;
var icon = theme.content.package_info.dock_icon; var icon = theme.content.package_info.dock_icon;
if(!icon) { if(!icon) {
continue; continue;
} }
shortcuts.push({ shortcuts.push({
name: name,
component: theme, component: theme,
icon: icon icon: icon
}) })

4
app/assets/templates/footer.html.haml
View File

@@ -53,9 +53,9 @@
.sk-app-bar-item.dock-shortcut{"ng-repeat" => "shortcut in ctrl.dockShortcuts"} .sk-app-bar-item.dock-shortcut{"ng-repeat" => "shortcut in ctrl.dockShortcuts"}
.sk-app-bar-item-column{"ng-click" => "ctrl.selectShortcut(shortcut)", "ng-class" => "{'underline': shortcut.component.active}"} .sk-app-bar-item-column{"ng-click" => "ctrl.selectShortcut(shortcut)", "ng-class" => "{'underline': shortcut.component.active}"}
.div{"ng-if" => "shortcut.icon.type == 'circle'"} .div{"ng-if" => "shortcut.icon.type == 'circle'", "title" => "{{shortcut.name}}"}
.sk-circle.small{"ng-style" => "{'background-color': shortcut.icon.background_color, 'border-color': shortcut.icon.border_color}"} .sk-circle.small{"ng-style" => "{'background-color': shortcut.icon.background_color, 'border-color': shortcut.icon.border_color}"}
.div{"ng-if" => "shortcut.icon.type == 'svg'"} .div{"ng-if" => "shortcut.icon.type == 'svg'", "title" => "{{shortcut.name}}"}
.svg-item{"ng-attr-id" => "dock-svg-{{shortcut.component.uuid}}", "elem-ready" => "ctrl.initSvgForShortcut(shortcut)"} .svg-item{"ng-attr-id" => "dock-svg-{{shortcut.component.uuid}}", "elem-ready" => "ctrl.initSvgForShortcut(shortcut)"}
.sk-app-bar-item.border{"ng-if" => "ctrl.hasPasscode()"} .sk-app-bar-item.border{"ng-if" => "ctrl.hasPasscode()"}