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

Store: Update header area to remove duplicate site info #23705

Merged
merged 4 commits into from
Apr 20, 2018
Merged

Store: Update header area to remove duplicate site info #23705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a3ad27
Redesign the header/site information area to remove duplicate info
justinshreve Mar 27, 2018
c7bbaad
Link the site icon and title back to the main site
justinshreve Mar 28, 2018
726c20a
Fix margins on the action buttons
justinshreve Mar 28, 2018
ffe13e3
Address site link feedback
justinshreve Mar 28, 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
4 changes: 3 additions & 1 deletion client/extensions/woocommerce/components/action-header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ class ActionHeader extends React.Component {
<Gridicon icon="chevron-left" />
</Button>
<div className="action-header__content">
<SiteIcon site={ site } />
<a href={ site.URL } aria-label={ site.title }>
<SiteIcon site={ site } />
</a>
<div className="action-header__details">
{ site && <p className="action-header__site-title">{ site.title }</p> }
{ this.renderBreadcrumbs() }
Expand Down
46 changes: 21 additions & 25 deletions client/extensions/woocommerce/components/action-header/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,31 @@
color: $gray-dark;
background: $white;
border-bottom: 1px solid $gray-lighten-20;
position: fixed;
z-index: z-index( 'root', '.sticky-panel.is-sticky .sticky-panel__content' );
top: 47px;
left: 0px;

@include breakpoint( ">480px" ) {
padding: 8px 24px 8px 0;
}

@include breakpoint( ">660px" ) {
padding: 5px 16px;
padding-left: 0;
margin: 0;
}
margin-left: 40px;

@include breakpoint( ">960px" ) {
position: fixed;
z-index: z-index( 'root', '.sticky-panel.is-sticky .sticky-panel__content' );
width: calc(100% - 273px);
top: 47px;
left: 273px;
}
@include breakpoint( "660px-960px" ) {
position: fixed;
z-index: z-index( 'root', '.sticky-panel.is-sticky .sticky-panel__content' );
width: calc(100% - 229px);
top: 47px;
left: 229px;
}

@include breakpoint( "<660px" ) {
position: fixed;
z-index: z-index( 'root', '.sticky-panel.is-sticky .sticky-panel__content' );
width: 100%;
top: 47px;
.gridicons-chevron-left {
display: none;
}
}
}

.action-header__back-to-sidebar {
flex-grow: 0;
flex-shrink: 0;
min-width: 40px;

@include breakpoint( ">660px" ) {
display: none;
}
}

.action-header__content {
Expand All @@ -60,6 +44,10 @@
display: flex;
justify-content: flex-start;

@include breakpoint( ">660px" ) {
margin-left: -32px;
}

.site-icon {
margin-right: 8px;
}
Expand All @@ -68,6 +56,10 @@
font-size: 10px;
color: $gray-darken-10;
margin: 2px 0 -3px;

a, a:hover {
color: $gray-darken-10;
}
}

.action-header__breadcrumbs {
Expand All @@ -92,6 +84,10 @@
overflow: hidden;
text-align: right;

@include breakpoint( ">660px" ) {
margin-right: 40px;
}

.action-header__actions-list {
display: flex;
justify-content: flex-end;
Expand Down
4 changes: 2 additions & 2 deletions client/extensions/woocommerce/store-sidebar/store-ground-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const StoreGroundControl = ( { site, translate } ) => {
href={ backLink }
aria-label={ translate( 'Go back' ) }
>
<Gridicon icon="arrow-left" />
<Gridicon icon="chevron-left" />
</Button>
<div className="store-sidebar__ground-control-site">
<Site compact site={ site } indicator={ false } homeLink externalLink />
<Site site={ site } indicator={ false } homeLink externalLink />
</div>
</div>
);
Expand Down
48 changes: 44 additions & 4 deletions client/extensions/woocommerce/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@

.store-sidebar__ground-control {
align-items: center;
border-bottom: 1px solid darken( $sidebar-bg-color, 10% );
background-color: $white;
display: flex;
width: 100%;
Expand All @@ -126,19 +125,60 @@
.store-sidebar__ground-control-back {
flex: 0 0 auto;
margin-left: 7px;
margin-right: 7px;
}

.store-sidebar__ground-control-site {
border-left: 1px solid darken( $sidebar-bg-color, 10% );
display: inline-block;
flex-grow: 1;
min-height: 46px;
max-height: 60px;

.site__content {
padding: 12px;
padding-left: 8px;
}
}

@include breakpoint( ">660px" ) {
margin-top: 47px;
padding-top: 4px;

.store-sidebar__ground-control-site {
display: none;
}

.store-sidebar__ground-control {
padding-left: 7px;
position: fixed;
width: 100%;
top: 47px;
left: 0px;
min-height: 46px;
z-index: z-index( 'root', '.sticky-panel.is-sticky .sticky-panel__content' );
background: $white;
border-bottom: 1px solid $gray-lighten-20;
}
}

@include breakpoint( "<660px" ) {
.site__title {
margin-top: 8px;
}
.site__domain {
display: none;
}
}

.sidebar__menu {
margin-top: 0;

@include breakpoint( "<660px" ) {
border-top: 1px solid darken( $sidebar-bg-color, 10% );
}

@include breakpoint( ">660px" ) {
margin-top: -4px;
}

ul {
li:first-child {
border-top-width: 0;
Expand Down