diff options
| author | Michael Davis <michael.s.davis@ibm.com> | 2017-06-27 09:56:00 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-09-20 13:14:23 -0500 |
| commit | 2c16effe0a15a45be531d229343ff913627110db (patch) | |
| tree | bb8936563daa637627dda7c37f1b88b24947ff6e /app/common | |
| parent | d19b718ea3b9248d8f071a8e080206266d604979 (diff) | |
| download | phosphor-webui-2c16effe0a15a45be531d229343ff913627110db.tar.gz phosphor-webui-2c16effe0a15a45be531d229343ff913627110db.zip | |
start on sensors redesign.
Change-Id: Iab823cc3f4643a567b85a036c9dd4d78db02ad05
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
Diffstat (limited to 'app/common')
| -rw-r--r-- | app/common/directives/app-navigation.html | 4 | ||||
| -rw-r--r-- | app/common/styles/elements/toggle-filter.scss | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html index 661b4a5..4891c61 100644 --- a/app/common/directives/app-navigation.html +++ b/app/common/directives/app-navigation.html @@ -74,9 +74,9 @@ <li ng-class="{'active': (path == '/server-health/event-log')}"> <a href="#/server-health/event-log" tabindex="3" ng-click="closeSubnav()">Event log</a></li> <li ng-class="{'active': (path == '/server-health/inventory-overview' || path == '/server-health/inventory')}" ng-click="closeSubnav()"> - <a href="#/server-health/inventory-overview" tabindex="4">Hardware inventory</a></li> + <a href="#/server-health/inventory-overview" tabindex="4">Hardware status</a></li> <li ng-class="{'active': (path == '/server-health/sensors-overview' || path == '/server-health/sensors')}"> - <a href="#/server-health/sensors-overview" ng-click="closeSubnav()" tabindex="5">Sensor data</a></li> + <a href="#/server-health/sensors-overview" ng-click="closeSubnav()" tabindex="5">Sensors</a></li> <!--<li ng-class="{'active': (path == '/server-health/power-consumption')}"><a href="#/server-health/power-consumption" tabindex="4" ng-click="closeSubnav()">Power consumption</a></li>--> <li ng-class="{'active': (path == '/server-health/unit-id')}"> <a href="#/server-health/unit-id" tabindex="6" ng-click="closeSubnav()">Server indicator</a></li> diff --git a/app/common/styles/elements/toggle-filter.scss b/app/common/styles/elements/toggle-filter.scss index 6e061a4..1a7d602 100644 --- a/app/common/styles/elements/toggle-filter.scss +++ b/app/common/styles/elements/toggle-filter.scss @@ -11,12 +11,13 @@ margin-right: 2em; margin-bottom: 1em; button { - margin: 3px -4px; + margin: 3px -3px; padding: .6em 2em; min-height: 2.1em; font-size: .9em; font-weight: 700; border-radius: 0; + display: inline-block; &.first, &.last { border-radius: 3px; |
