Skip to content

Commit

Permalink
[Chrome] Made the kibana logo the fallback if there is no logo, hide …
Browse files Browse the repository at this point in the history
…the user and settings icons.
  • Loading branch information
panda01 committed Feb 8, 2016
1 parent 9abdc62 commit 74d5f24
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
9 changes: 7 additions & 2 deletions src/ui/public/chrome/chrome.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
<div class="content" chrome-context >
<!-- TODO: These config dropdowns shouldn't be hard coded -->
<nav class="app-links-wrapper">
<li
ng-if="!chrome.getBrand('logo') && !chrome.getBrand('smallLogo')"
aria-label="{{ chrome.getAppTitle() }} Logo"
class="logo kibana hidden-sm"
></li>
<li
ng-if="chrome.getBrand('logo')"
ng-style="{ 'background': chrome.getBrand('logo') }"
aria-label="{{ chrome.getAppTitle() }} Logo"
class="logo hidden-sm"
></li>

<li
ng-if="chrome.getBrand('smallLogo')"
ng-style="{ 'background': chrome.getBrand('smallLogo') }"
aria-label="{{ chrome.getAppTitle() }} Logo"
class="logo-small visible-sm hidden-xs"
></li>

<app-switcher>
</app-switcher>
<div class="bottom-apps app-links">
<div class="bottom-apps hide app-links">
<div class="app-link">
<a href="http://elastic.co">
<div class="app-icon">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
@transition-time: .65s;
@transition-delay: .2s;

body { overflow-x: hidden; }

.app-links-wrapper {
width: @as-open-width;
position: fixed;
Expand All @@ -33,6 +35,9 @@
height: 70px;
width: @as-open-width;
list-style-type: none;
&.kibana {
background: url("~ui/images/kibana.svg") center / 160px 70px no-repeat #e8488b;
}
}
.bottom-apps {
position: absolute;
Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/styles/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
flex-shrink: 0;
}
}
.real-flex-parent(@display: flex, @flow: column nowrap) {
display: @display;
.real-flex-parent(@flow: column nowrap) {
display: flex;
flex-flow: @flow;
}

Expand Down

0 comments on commit 74d5f24

Please sign in to comment.