diff --git a/bower.json b/bower.json index ea027b8d..dd59297c 100644 --- a/bower.json +++ b/bower.json @@ -8,7 +8,7 @@ "angular-sanitize": "1.4.1-build.4058", "angular-animate": "1.4.1-build.4058", "angular-touch": "1.4.1-build.4058", - "nine-bootstrap": "https://ghe.ca-tools.org/stf/nine-bootstrap.git#de76f51c3db0da30b2f170d3435380307026875f", + "nine-bootstrap": "https://ghe.ca-tools.org/stf/nine-bootstrap.git#fd4ec94babf7f4c447153b6fab4430b8e16f5194", "lodash": "~3.9.3", "oboe": "~2.1.2", "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a", diff --git a/res/app/control-panes/advanced/input/input.jade b/res/app/control-panes/advanced/input/input.jade index 108266b7..4f08722f 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 + i.fa.fa-gear.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 33e96f3a..4e89851c 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 + i.fa.fa-gears.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 4759aa11..0135afb4 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 + i.fa.fa-random.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 0cd709b2..0d436542 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 + i.fa.fa-gears.color-darkgray span(translate) Device Settings .widget-content.padded @@ -9,14 +9,6 @@ i.fa.fa-signal.fa-fw(ng-show='wifiEnabled', tooltip='{{"Disable WiFi" | translate}}') i.fa.fa-signal.fa-fw(ng-hide='wifiEnabled', tooltip='{{"Enable WiFi" | translate}}') - //.btn-group - label.btn.btn-sm.btn-primary-outline(ng-model='wifiEnabled', btn-radio='false') - span.fa-stack.fa-lgx - i.fa.fa-signal.fa-stack-1x - i.fa.fa-ban.fa-stack-2x - label.btn.btn-sm.btn-primary-outline(ng-model='wifiEnabled', btn-radio='true') - i.fa.fa-signal.fa-fw(tooltip='{{"WiFi Enabled" | translate}}') - .btn-group label.btn.btn-sm.btn-primary-outline(ng-model='ringerMode', btn-radio='"SILENT"') i.fa.fa-volume-off.fa-fw(tooltip='{{"Silent Mode" | translate}}') 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 165815fc..ef2ddcfe 100644 --- a/res/app/control-panes/automation/store-account/store-account.jade +++ b/res/app/control-panes/automation/store-account/store-account.jade @@ -1,10 +1,8 @@ .widget-container.fluid-height.stf-store-account(ng-controller='StoreAccountCtrl') .heading - i.fa.fa-cloud + i.fa.fa-cloud.color-skyblue span(translate) Store Account - - button.btn.btn-sm.btn-primary-outline.pull-right(ng-click='control.openStore()', tooltip='{{"App Store" | translate}}', tooltip-placement="bottom") i.fa.fa-shopping-cart @@ -12,8 +10,6 @@ div - - form(name='storeLogin', novalidate, enable-autofill) .form-group .input-group diff --git a/res/app/control-panes/dashboard/apps/apps.jade b/res/app/control-panes/dashboard/apps/apps.jade index 55c0074a..5d11da99 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 + i.fa.fa-th-large.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 f46d46fb..392515e8 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 + i.fa.fa-copy.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 e443cb01..4ebb1648 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 + i.fa.fa-upload.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 7baa52e3..bfe8186e 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 + i.fa.fa-globe.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 a99e7b1e..5270657e 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 + i.fa.fa-bug.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/info/info.jade b/res/app/control-panes/info/info.jade index 60b98c9c..b06775b1 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 + i.fa.fa-location-arrow.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 + i.fa.fa-bolt.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 + i.fa.fa-tablet.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 + i.fa.fa-signal.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 + i.fa.fa-credit-card.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 + i.fa.fa-phone.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 + i.fa.fa-mobile.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 + i.fa.fa-slack.color-darkgray 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 + i.fa.fa-database.color-orange span(translate) Memory .widget-content.padded-small table.table.table-condensed.table-hover.table-infocard