Skip to content

Update styles on editor-header icon picker #10822

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

Closed
nathanwoulfe wants to merge 1 commit into from
Closed

Update styles on editor-header icon picker #10822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/Umbraco.Web.UI.Client/src/less/components/editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,16 @@
}

.umb-editor-header__back {
background: transparent;
border: 0;
font-size:20px;
display:flex;
color: @gray-6;
margin: 0 0 1px 0;
margin-right: 15px;
padding: 0;
transition: color 0.1s ease-in-out;

&:hover {
color:@gray-7;
}
}

.umb-editor-header__name-wrapper {
Expand All @@ -97,6 +101,7 @@
}

.umb-editor-header__name-and-description {
flex:1 1 auto;
margin-right: 20px;
.umb-panel-header-description {
padding: 0 10px;
Expand Down
6 changes: 2 additions & 4 deletions src/Umbraco.Web.UI.Client/src/less/panel.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,13 @@
cursor: pointer;
font-size: 2rem;
margin-right: 5px;
margin-top: -6px;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
background: @white;
border: 1px solid @ui-action-discreet-border;
border: 1px solid @gray-8;
animation: fadeIn 0.5s;
border-radius: 3px;
width: 50px;
&:hover {
.icon {
Expand Down Expand Up @@ -427,7 +425,7 @@ input.umb-panel-header-name-input.name-is-empty {
input.umb-panel-header-description {
background: transparent;
border-color: transparent;
margin-bottom: 0;
margin:-1px 0 0;
font-size: 13px;
box-sizing: border-box;
height: 22px;
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
.content-around { align-content: space-around; }
.content-stretch { align-content: stretch; }

.flex-1,
.flx-i {
flex: 1;
}


.flx-g0 {
flex-grow: 0;
}
Expand Down
5 changes: 5 additions & 0 deletions src/Umbraco.Web.UI.Client/src/less/utilities/_width.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@
.w-100 { width: 100%; }

.w-auto { width: auto; }

/* adding related height utilities */

.h-100 { height: 100%; }
.h-auto { height: auto;}
20 changes: 10 additions & 10 deletions src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div data-element="editor-header" class="umb-editor-header" ng-class="{'-split-view-active': splitViewOpen === true}">

<div class="flex items-center" style="height: 100%;">
<div class="flex items-center h-100">

<div ng-if="showBackButton === true && splitViewOpen !== true" style="margin-right: 15px;">
<button type="button" class="umb-editor-header__back" ng-click="goBack()" prevent-default>
<i class="fa fa-arrow-left" aria-hidden="true"></i>
<span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
</button>
</div>

<div class="flex items-center" style="flex: 1;">
<button type="button"
ng-if="showBackButton === true && splitViewOpen !== true"
class="btn-reset umb-editor-header__back"
ng-click="goBack()">
<umb-icon icon="icon-arrow-left"></umb-icon>
<span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
</button>

<div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
<div class="flex flex-1">
<div id="nameField" class="umb-editor-header__name-and-description">
<div>
<p tabindex="0" class="sr-only">
{{a11yMessage}}
Expand Down
19 changes: 10 additions & 9 deletions src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<div data-element="editor-header" class="umb-editor-header" ng-class="{'-split-view-active': splitViewOpen === true}">
<umb-loader ng-show="loading"></umb-loader>
<div class="flex items-center" style="height: 100%;" ng-hide="loading">
<div class="flex items-center h-100" ng-hide="loading">

<div ng-if="showBackButton === true && splitViewOpen !== true" style="margin-right: 15px;">
<button type="button" class="umb-editor-header__back" ng-click="goBack()" prevent-default>
<i class="fa fa-arrow-left" aria-hidden="true"></i>
<span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
</button>
</div>
<button type="button"
class="btn-reset umb-editor-header__back"
ng-if="showBackButton === true && splitViewOpen !== true"
ng-click="goBack()">
<umb-icon icon="icon-arrow-left"></umb-icon>
<span class="sr-only"><localize key="visuallyHiddenTexts_goBack">Go back</localize></span>
</button>

<div class="flex items-center" style="flex: 1;">
<div class="flex flex-1">

<ng-form data-element="editor-icon" name="iconForm">
<button
Expand All @@ -25,7 +26,7 @@
</button>
</ng-form>

<div id="nameField" class="umb-editor-header__name-and-description" style="flex: 1 1 auto;">
<div id="nameField" class="umb-editor-header__name-and-description">
<div>
<p tabindex="0" class="sr-only" ng-show="accessibility.a11yMessageVisible">
{{accessibility.a11yMessage}}
Expand Down