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

refactor(ui5-shellbar): cleanup styles #686

Merged
merged 3 commits into from
Jul 26, 2019
Merged

refactor(ui5-shellbar): cleanup styles #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54c7dcc
refactor(ui5-shellbar): cleanup styles
MapTo0 Jul 25, 2019
e4ee603
Merge remote-tracking branch 'origin/master' into shellbar-styles-cle…
MapTo0 Jul 25, 2019
18d4ca7
remove noAttribute for breakpoint state
MapTo0 Jul 26, 2019
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
28 changes: 14 additions & 14 deletions packages/main/src/ShellBar.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
class="{{classes.wrapper}}"
dir="{{rtl}}"
>
<div class="{{classes.leftContainer}}">
<div class="ui5-shellbar-overflow-container ui5-shellbar-overflow-container-left">

{{#if icon.length}}
<slot name="icon"></slot>
{{/if}}

{{#unless interactiveLogo}}
<img class="{{classes.logo}}" src="{{logo}}" @click="{{_logoPress}}" />
<img class="ui5-shellbar-logo" src="{{logo}}" @click="{{_logoPress}}" />
{{/unless}}

{{#if showArrowDown}}
Expand All @@ -19,35 +19,35 @@
{{/if}}

{{#if primaryTitle}}
<h1 class="{{classes.buttonTitle}}">
<h1 class="ui5-shellbar-menu-button-title">
<bdi class="{{classes.title}}">{{primaryTitle}}</bdi>
</h1>
{{/if}}

<span class="{{classes.arrow}}"></span>
<span class="ui5-shellbar-menu-button-arrow"></span>
</button>
{{/if}}

<ui5-popover class="sapWCShellBarMenuPopover" placement-type="Bottom">
<ui5-popover class="ui5-shellbar-menu-popover" placement-type="Bottom">
<ui5-list separators="None" mode="SingleSelect" @ui5-itemPress={{_menuItemPress}}>
<slot name="menuItems"></slot>
</ui5-list>
</ui5-popover>

<h2 class="{{classes.secondaryTitle}}">{{secondaryTitle}}</h2>
<h2 class="ui5-shellbar-secondary-title">{{secondaryTitle}}</h2>
</div>

<div class="sapWCShellBarOverflowContainer sapWCShellBarOverflowContainerMiddle">
<div class="ui5-shellbar-overflow-container ui5-shellbar-overflow-container-middle">
{{#if showCoPilot}}
{{> coPilot}}
{{else}}
<span class="sapWCShellBarCoPilotPlaceholder"></span>
<span class="ui5-shellbar-co-pilot-placeholder"></span>
{{/if}}
</div>

<div class="sapWCShellBarOverflowContainer sapWCShellBarOverflowContainerRight">
<div class="ui5-shellbar-overflow-container ui5-shellbar-overflow-container-right">

<div class="sapWCShellBarOverflowContainerRightChild">
<div class="ui5-shellbar-overflow-container-right-child">
{{#each _itemsInfo}}
{{#if this.src}}
<ui5-icon
Expand Down Expand Up @@ -75,7 +75,7 @@
</div>
</div>

<ui5-popover class="sapWCShellBarOverflowPopover" placement-type="Bottom" horizontal-align="{{popoverHorizontalAlign}}" no-arrow>
<ui5-popover class="ui5-shellbar-overflow-popover" placement-type="Bottom" horizontal-align="{{popoverHorizontalAlign}}" no-arrow>
<ui5-list separators="None" @ui5-itemPress="{{_actionList.itemPress}}">
{{#each _hiddenIcons}}
<ui5-li
Expand All @@ -89,11 +89,11 @@
</ui5-list>
</ui5-popover>

<div class="{{classes.blockLayer}}">
<div class="ui5-shellbar-block-layer">
</div>

<div id="{{_id}}-searchfield-wrapper"
class="{{classes.searchField}}"
class="ui5-shellbar-search-field"
style="{{styles.searchField}}"
@focusout={{_searchField.focusout}}
>
Expand Down Expand Up @@ -150,6 +150,6 @@
begin="shell_avatar.mousedown" repeatCount="1" additive="sum"></animateTransform>
</path>
</g>
<circle cx="0" cy="0" r="76" class="sapWCShellBarCoPilotMiddle" id="shell_avatar"></circle>
<circle cx="0" cy="0" r="76" class="ui5-shellbar-co-pilot-circle" id="shell_avatar"></circle>
</svg>
{{/inline}}
Loading