diff --git a/CHANGELOG.md b/CHANGELOG.md index f19ebd2c1c..bbd1f62f99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ 1. [#1524](https://github.com/influxdata/chronograf/pull/1524): Rewrite UI copy in Kapacitor Node configuration to be more clear 1. [#1549](https://github.com/influxdata/chronograf/pull/1549): Reset graph zoom when a new time range is selected 1. [#1544](https://github.com/influxdata/chronograf/pull/1544): Upgrade to new version of Influx Theme, remove excess stylesheets + 1. [#1567](https://github.com/influxdata/chronograf/pull/1567): Replace outline style User icon with solid style 1. [#1560](https://github.com/influxdata/chronograf/pull/1560): Apply mean to fields by default 1. [#1561](https://github.com/influxdata/chronograf/pull/1561): Disable query save in dashboard editing if the query does not have a database, measurement, and field diff --git a/ui/src/side_nav/containers/SideNav.js b/ui/src/side_nav/containers/SideNav.js index 0c74850460..c9144baf65 100644 --- a/ui/src/side_nav/containers/SideNav.js +++ b/ui/src/side_nav/containers/SideNav.js @@ -76,7 +76,7 @@ const SideNav = React.createClass({ /> {showLogout - ? + ? : null} diff --git a/ui/src/style/fonts/icomoon.eot b/ui/src/style/fonts/icomoon.eot index 2814393d69..769f6b7b69 100755 Binary files a/ui/src/style/fonts/icomoon.eot and b/ui/src/style/fonts/icomoon.eot differ diff --git a/ui/src/style/fonts/icomoon.svg b/ui/src/style/fonts/icomoon.svg index c941603a4a..da0f6daa4b 100755 --- a/ui/src/style/fonts/icomoon.svg +++ b/ui/src/style/fonts/icomoon.svg @@ -86,6 +86,7 @@ + @@ -97,6 +98,7 @@ + diff --git a/ui/src/style/fonts/icomoon.ttf b/ui/src/style/fonts/icomoon.ttf index 25dfd5b1ef..7644afca40 100755 Binary files a/ui/src/style/fonts/icomoon.ttf and b/ui/src/style/fonts/icomoon.ttf differ diff --git a/ui/src/style/fonts/icomoon.woff b/ui/src/style/fonts/icomoon.woff index 38b1b5e8c7..f54e1f8777 100755 Binary files a/ui/src/style/fonts/icomoon.woff and b/ui/src/style/fonts/icomoon.woff differ diff --git a/ui/src/style/fonts/icomoon.woff2 b/ui/src/style/fonts/icomoon.woff2 index 22e7a79907..f55349920a 100755 Binary files a/ui/src/style/fonts/icomoon.woff2 and b/ui/src/style/fonts/icomoon.woff2 differ diff --git a/ui/src/style/layout/sidebar.scss b/ui/src/style/layout/sidebar.scss index 6d3f2d5025..12f86f45c5 100644 --- a/ui/src/style/layout/sidebar.scss +++ b/ui/src/style/layout/sidebar.scss @@ -179,6 +179,9 @@ $sidebar-logo-color: $g8-storm; margin: 0; display: block; @include no-user-select(); + &:hover { + cursor: pointer; + } } &__menu-item { @@ -234,7 +237,6 @@ $sidebar-logo-color: $g8-storm; transform: translate(-50%,-50%); } &:hover { - cursor: pointer; background-color: $sidebar-item-hover; color: $sidebar-icon-hover; diff --git a/ui/src/style/theme/bootstrap-theme.scss b/ui/src/style/theme/bootstrap-theme.scss index ce1187b91c..014ccf9dca 100755 --- a/ui/src/style/theme/bootstrap-theme.scss +++ b/ui/src/style/theme/bootstrap-theme.scss @@ -243,6 +243,9 @@ span.text-color-danger { .icon.wrenches:before { content: "\e913"; } +.icon.user:before { + content: "\e94d"; +} .icon.cog-thick:before { content: "\e906"; } @@ -429,6 +432,9 @@ span.text-color-danger { .icon.location:before { content: "\f060"; } +.icon.octoface:before { + content: "\f008"; +} .icon.pencil:before { content: "\f058"; }