diff --git a/res/app/components/stf/common-ui/index.js b/res/app/components/stf/common-ui/index.js index 8d4b1cb9..2db96e8f 100644 --- a/res/app/components/stf/common-ui/index.js +++ b/res/app/components/stf/common-ui/index.js @@ -17,5 +17,6 @@ module.exports = angular.module('stf/common-ui', [ require('./enable-autofill').name, require('./icon-inside-input').name, require('./focus-element').name, - require('./blur-element').name + require('./blur-element').name, + require('./stacked-icon').name ]) diff --git a/res/app/components/stf/common-ui/stacked-icon/index.js b/res/app/components/stf/common-ui/stacked-icon/index.js new file mode 100644 index 00000000..9cc70529 --- /dev/null +++ b/res/app/components/stf/common-ui/stacked-icon/index.js @@ -0,0 +1,2 @@ +module.exports = angular.module('stf.stacked-icon', []) + .directive('stackedIcon', require('./stacked-icon-directive')) diff --git a/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js b/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js new file mode 100644 index 00000000..4bd87bae --- /dev/null +++ b/res/app/components/stf/common-ui/stacked-icon/stacked-icon-directive.js @@ -0,0 +1,13 @@ +require('./stacked-icon.css') + +module.exports = function clearButtonDirective() { + return { + restrict: 'EA', + replace: true, + scope: { + icon: '@', + color: '@' + }, + template: require('./stacked-icon.jade') + } +} diff --git a/res/app/components/stf/common-ui/stacked-icon/stacked-icon.css b/res/app/components/stf/common-ui/stacked-icon/stacked-icon.css new file mode 100644 index 00000000..0ad10b22 --- /dev/null +++ b/res/app/components/stf/common-ui/stacked-icon/stacked-icon.css @@ -0,0 +1,12 @@ +.stf-stacked-icon .fa-square { + font-size: 22px !important; +} + +.stf-stacked-icon.fa-stack { + height: 24px !important; + width: 21px !important; +} + +.stf-stacked-icon .fa-stack-1x { + line-height: 24px !important; +} diff --git a/res/app/components/stf/common-ui/stacked-icon/stacked-icon.jade b/res/app/components/stf/common-ui/stacked-icon/stacked-icon.jade new file mode 100644 index 00000000..6d1527e3 --- /dev/null +++ b/res/app/components/stf/common-ui/stacked-icon/stacked-icon.jade @@ -0,0 +1,3 @@ +span.fa-stack.fa-lgX.stf-stacked-icon + i.fa.fa-square.fa-stack-2x(ng-class='color') + i.fa(ng-class='icon').fa-stack-1x.fa-inverse diff --git a/res/app/control-panes/advanced/input/input.jade b/res/app/control-panes/advanced/input/input.jade index 4f08722f..5d987da9 100644 --- a/res/app/control-panes/advanced/input/input.jade +++ b/res/app/control-panes/advanced/input/input.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height(ng-controller='InputAdvancedCtrl') .heading - i.fa.fa-gear.color-pink + stacked-icon(icon='fa-gear', color='color-pink') span(translate) Advanced Input .widget-content.padded div diff --git a/res/app/control-panes/advanced/maintenance/maintenance.jade b/res/app/control-panes/advanced/maintenance/maintenance.jade index 4e89851c..356737a0 100644 --- a/res/app/control-panes/advanced/maintenance/maintenance.jade +++ b/res/app/control-panes/advanced/maintenance/maintenance.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height(ng-controller='MaintenanceCtrl') .heading - i.fa.fa-gears.color-darkgray + stacked-icon(icon='fa-gears', color='color-darkgray') span(translate) Maintenance .pull-right .widget-content.padded diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade index 0135afb4..79369207 100644 --- a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade +++ b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade @@ -1,7 +1,7 @@ .widget-container.fluid-height.stf-port-forwarding(ng-controller='PortForwardingCtrl') .heading span - i.fa.fa-random.color-darkgreen + stacked-icon(icon='fa-random', color='color-darkgreen') span(translate, ng-click='isCollapsed = !isCollapsed').pointer Port Forwarding button.btn.pull-right.btn-sm.btn-primary-outline( diff --git a/res/app/control-panes/automation/device-settings/device-settings.jade b/res/app/control-panes/automation/device-settings/device-settings.jade index 0d436542..375ccfd3 100644 --- a/res/app/control-panes/automation/device-settings/device-settings.jade +++ b/res/app/control-panes/automation/device-settings/device-settings.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-device-settings(ng-controller='DeviceSettingsCtrl') .heading - i.fa.fa-gears.color-darkgray + stacked-icon(icon='fa-gears', color='color-darkgray') span(translate) Device Settings .widget-content.padded diff --git a/res/app/control-panes/automation/store-account/store-account.jade b/res/app/control-panes/automation/store-account/store-account.jade index ef2ddcfe..9ff59791 100644 --- a/res/app/control-panes/automation/store-account/store-account.jade +++ b/res/app/control-panes/automation/store-account/store-account.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-store-account(ng-controller='StoreAccountCtrl') .heading - i.fa.fa-cloud.color-skyblue + stacked-icon(icon='fa-cloud', color='color-skyblue') span(translate) Store Account button.btn.btn-sm.btn-primary-outline.pull-right(ng-click='control.openStore()', diff --git a/res/app/control-panes/dashboard/apps/apps.jade b/res/app/control-panes/dashboard/apps/apps.jade index 5d11da99..f1a11c0f 100644 --- a/res/app/control-panes/dashboard/apps/apps.jade +++ b/res/app/control-panes/dashboard/apps/apps.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-apps(ng-controller='AppsCtrl') .heading - i.fa.fa-th-large.color-lila + stacked-icon(icon='fa-th-large', color='color-lila') span(translate) Apps div.pull-right button.btn.btn-sm.btn-primary-outline(ng-click='control.openStore()', diff --git a/res/app/control-panes/dashboard/clipboard/clipboard.jade b/res/app/control-panes/dashboard/clipboard/clipboard.jade index 392515e8..c977ab00 100644 --- a/res/app/control-panes/dashboard/clipboard/clipboard.jade +++ b/res/app/control-panes/dashboard/clipboard/clipboard.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-clipboard(ng-controller='ClipboardCtrl') .heading - i.fa.fa-copy.color-brown + stacked-icon(icon='fa-copy', color='color-brown') span(translate) Clipboard .widget-content.padded .input-group.form-inline diff --git a/res/app/control-panes/dashboard/install/install.jade b/res/app/control-panes/dashboard/install/install.jade index 4ebb1648..6cb91543 100644 --- a/res/app/control-panes/dashboard/install/install.jade +++ b/res/app/control-panes/dashboard/install/install.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-upload(ng-controller='InstallCtrl') .heading - i.fa.fa-upload.color-red + stacked-icon(icon='fa-upload', color='color-red') span(translate) App Upload clear-button(ng-click='clear()', ng-disabled='!installation').btn-xs diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.jade index bfe8186e..21221411 100644 --- a/res/app/control-panes/dashboard/navigation/navigation.jade +++ b/res/app/control-panes/dashboard/navigation/navigation.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-navigation(ng-controller='NavigationCtrl') .heading - i.fa.fa-globe.color-blue + stacked-icon(icon='fa-globe', color='color-blue') span(translate) Navigation span button.btn.btn-xs.btn-danger-outline.pull-right(ng-click='clearSettings()', diff --git a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade b/res/app/control-panes/dashboard/remote-debug/remote-debug.jade index 5270657e..afb1b203 100644 --- a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade +++ b/res/app/control-panes/dashboard/remote-debug/remote-debug.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-remote-debug(ng-controller='RemoteDebugCtrl') .heading - i.fa.fa-bug.color-darkgreen + stacked-icon(icon='fa-bug', color='color-darkgreen') span(translate) Remote debug a(ng-href='/#!/docs/remote-debug').pull-right i.fa.fa-question-circle(tooltip='{{remoteDebugTooltip | translate}}', tooltip-placement='left') diff --git a/res/app/control-panes/dashboard/shell/shell.jade b/res/app/control-panes/dashboard/shell/shell.jade index 36fc19bd..45db838c 100644 --- a/res/app/control-panes/dashboard/shell/shell.jade +++ b/res/app/control-panes/dashboard/shell/shell.jade @@ -1,6 +1,6 @@ .widget-container.fluid-height.stf-shell(ng-controller='ShellCtrl') .heading - i.fa.fa-terminal + stacked-icon(icon='fa-terminal', color='color-darkgray') span(translate) Shell clear-button(ng-click='clear()', ng-disabled='!command && !data').btn-xs diff --git a/res/app/control-panes/info/info.jade b/res/app/control-panes/info/info.jade index b06775b1..bd369f20 100644 --- a/res/app/control-panes/info/info.jade +++ b/res/app/control-panes/info/info.jade @@ -4,7 +4,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-location-arrow.color-pink + stacked-icon(icon='fa-location-arrow', color='color-pink') span(translate) Physical Device .pull-right button(ng-click='control.identify()').btn.btn-xs.btn-primary-outline @@ -27,7 +27,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-bolt.color-yellow + stacked-icon(icon='fa-bolt', color='color-yellow') span(translate) Battery .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -56,7 +56,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-tablet.color-blue + stacked-icon(icon='fa-tablet', color='color-blue') span(translate) Display .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -95,7 +95,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-signal.color-brown + stacked-icon(icon='fa-signal', color='color-brown') span(translate) Network .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -122,7 +122,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-credit-card.color-lila + stacked-icon(icon='fa-credit-card', color='color-lila') span(translate) SIM .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -148,7 +148,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-phone.color-green + stacked-icon(icon='fa-phone', color='color-green') span(translate) Hardware .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -172,7 +172,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-mobile.color-skyblue + stacked-icon(icon='fa-mobile', color='color-skyblue') span(translate) Platform .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -193,7 +193,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-slack.color-darkgray + stacked-icon(icon='fa-slack', color='color-black') span(translate) CPU .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -211,7 +211,7 @@ .col-md-4-x.packery-item .widget-container.fluid-height .heading - i.fa.fa-database.color-orange + stacked-icon(icon='fa-database', color='color-orange') span(translate) Memory .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard @@ -222,7 +222,6 @@ tr td(translate) ROM td {{device.memory.rom}} MB - tr td(translate) SD Card Mounted td {{ sdCardMounted | humanizedBool }}