Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align luigi header title with fundamental style #200

Merged
merged 5 commits into from
Nov 9, 2018
Merged

Align luigi header title with fundamental style #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f8216c
asdf
parostatkiem-zz Nov 7, 2018
d4d3c14
Merge branch 'master' of https://github.com/kyma-project/luigi into A…
parostatkiem-zz Nov 7, 2018
92fcf31
Make project title displayed with Fundamental style
parostatkiem-zz Nov 7, 2018
62ca859
Format the code in the svelte components
dariadomagala-sap Nov 9, 2018
1cca24f
Merge branch 'master' into Align-luigi-header-title-with-fundamental-…
kwiatekus Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions core/src/navigation/LogoTitle.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@


{#if hasLogo}
<div on:click="goTo('/')" class="fd-global-nav__logo fd-has-margin-left-none" ref:logo></div>
{/if}
<div class="fd-global-nav__product-name">
{#if title}
<a on:click="goTo('/')">{title}</a>
{/if}
{#if title}
<a on:click="goTo('/')">{title}</a>
{/if}
</div>

<script type="text/javascript">
Expand Down Expand Up @@ -37,10 +35,9 @@
margin-left: 0px;
}
.fd-global-nav__product-name {
color: #0a6ed1;
height: 50px;
font-size: 24px;
line-height: 1em;
padding: 13px 0;
padding: 20px 0 0 8px;
font-size: 0.85714rem;
line-height: 1.33333;
font-weight: 400;
}
</style>
63 changes: 33 additions & 30 deletions core/src/navigation/TopNav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="fd-ui__header {hideNavComponent ? 'hideNavComponent' : ''}">
<nav class="fd-global-nav">
<div class="fd-global-nav__group fd-global-nav__group--left">
<LogoTitle />
</div>
<nav class="fd-global-nav">
<div class="fd-global-nav__group fd-global-nav__group--left">
<LogoTitle />
</div>

<div class="fd-global-nav__group fd-global-nav__group--right">
<div class="fd-global-nav__actions">
{#if children && pathData.length > 0}
{#each children as node}
<div class="fd-global-nav__group fd-global-nav__group--right">
<div class="fd-global-nav__actions">
{#if children && pathData.length > 0}
{#each children as node}
{#if !node.hideFromNav}
<button class=" fd-button--secondary fd-button--m fd-global-nav__btn {node === selectedNode ? 'is-selected' : ''} {node.externalLink && node.externalLink.url ? 'fd-global-nav__btn--external' : ''}"
aria-label="{node.label}" on:click=handleClick(node)>
Expand All @@ -16,37 +16,40 @@
<span class="sap-icon--action sap-icon--s"></span>
{/if}
</button>
{/if}
{/each}
{/if}

{/if}
{/each}
{/if}
{#if authorizationEnabled}
<div class="fd-popover user-settings">
<div class="fd-popover__control">
<button class="fd-popover__control fd-button--secondary fd-button--m fd-global-nav__btn sap-icon--customer" aria-expanded="{dropDownStates.PROFILE_POPOVER || false}"
<div class="fd-popover user-settings">
<div class="fd-popover__control">
<button class="fd-popover__control fd-button--secondary fd-button--m fd-global-nav__btn sap-icon--customer" aria-expanded="{dropDownStates.PROFILE_POPOVER || false}"
aria-haspopup="true" on:click="toggleDropdownState('PROFILE_POPOVER')" on:blur="closeDropdown('PROFILE_POPOVER')"></button>
</div>
<div class="fd-popover__body" aria-hidden="{dropDownStatesNegated.PROFILE_POPOVER || true}" id="PROFILE_POPOVER">
<nav class="fd-menu" id="">
<Authorization />
<!-- <ul class="fd-menu__list">
<li><a href="#" class="fd-menu__item">Option 1</a></li>
<li><a href="#" class="fd-menu__item">Option 1</a></li>
</ul> -->
</nav>
</div>
</div>
<div class="fd-popover__body" aria-hidden="{dropDownStatesNegated.PROFILE_POPOVER || true}" id="PROFILE_POPOVER">
<nav class="fd-menu" id="">
<Authorization />
<!-- <ul class="fd-menu__list">
<li><a href="#" class="fd-menu__item">Option 1</a></li>
<li><a href="#" class="fd-menu__item">Option 1</a></li>
</ul> -->
</nav>
</div>
</div>
{/if}
</div>
</div>
</nav>
{/if}
</div>
</div>
</nav>
</div>

<script type="text/javascript">
import LogoTitle from './LogoTitle.html';
import Authorization from '../Authorization.html';
import { handleRouteClick } from '../services/routing.js';
import { getConfigValue, getConfigValueAsync, getConfigBooleanValue } from '../services/config.js';
import {
getConfigValue,
getConfigValueAsync,
getConfigBooleanValue
} from '../services/config.js';

const getNegatedBoolString = str => {
return str === 'true' ? 'false' : 'true';
Expand Down