swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp-v8-UI' into temp-v8-UI-infinite-editing

Browse Source
This commit is contained in:
Mads Rasmussen
2018-02-08 13:44:46 +01:00
parent c9986a9aeb 2d337923a3
commit 3fa59a6ac1
6 changed files with 89 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/less/components/editor.less
+1 -1
View File
@@ -71,7 +71,7 @@
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.16);
width: 100%;
box-sizing: border-box;
height: 60px;
height: @editorHeaderHeight;
}
.umb-editor-header__back {
src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less
+6
View File
@@ -13,6 +13,11 @@
min-width: 70px;
border-right: 1px solid @gray-9;
box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100%;
}
.umb-sub-views-nav-item:focus {
@@ -36,6 +41,7 @@
font-size: 24px;
display: block;
text-align: center;
margin-bottom: 5px;
}
.umb-sub-views-nav-item-text {
src/Umbraco.Web.UI.Client/src/less/panel.less
+8 -9
View File
@@ -373,7 +373,7 @@
.umb-panel-header-icon {
cursor: pointer;
margin-right: 5px;
height: 55px;
height: 50px;
display: flex;
justify-content: center;
align-items: center;
@@ -381,7 +381,7 @@
border: 1px solid @gray-8;
animation: fadeIn 0.5s;
border-radius: 3px;
width: 55px;
width: 50px;
}
.umb-panel-header-title-wrapper {
@@ -418,7 +418,7 @@
}
.umb-panel-header-icon .icon {
font-size: 35px;
font-size: 30px;
color: @gray-7;
}
@@ -449,8 +449,8 @@ input.umb-panel-header-description {
margin-bottom: 0;
font-size: 13px;
box-sizing: border-box;
height: 25px;
line-height: 25px;
height: 22px;
line-height: 22px;
width: 100%;
&:hover {
background: @white;
@@ -460,8 +460,7 @@ input.umb-panel-header-description {
.umb-panel-header-locked-description {
font-size: 12px;
margin-left: 2px;
margin-top: 3px;
height: 25px;
line-height: 25px;
margin-top: 2px;
height: 22px;
line-height: 22px;
}
src/Umbraco.Web.UI.Client/src/less/variables.less
+1 -1
View File
@@ -107,7 +107,7 @@
@bodyBackground: @gray-10;
@textColor: @gray-2;
@editorHeaderHeight: 60px;
@editorHeaderHeight: 70px;
@editorFooterHeight: 50px;
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+59 -73
View File
@@ -8,7 +8,7 @@
</a>
</div>
<div style="flex: 1;">
<div class="flex items-center" style="flex: 1;">
<ng-form data-element="editor-icon" name="iconForm">
<div class="umb-panel-header-icon" ng-if="!hideIcon" ng-click="openIconPicker()" ng-class="{'-placeholder': $parent.icon==='' || $parent.icon===null}"
@@ -20,43 +20,68 @@
</div>
</ng-form>
<div class="umb-editor-header__name-wrapper">
<ng-form name="headerNameForm">
<input
data-element="editor-name-field"
title="{{key}}"
type="text"
class="umb-editor-header__name-input"
localize="placeholder"
placeholder="@placeholders_entername"
name="headerName"
ng-show="!nameLocked"
ng-model="name"
ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
umb-auto-focus
val-server-field="Name"
required />
</ng-form>
<a ng-if="variants.length > 0" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
<span>{{vm.currentVariant.cultureDisplayName}}</span>
<ins class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
</a>
<div style="flex: 1 1 auto;">
<umb-dropdown ng-if="vm.dropdownOpen" style="width: 100%; max-height: 250px; overflow: scroll; margin-top: 5px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
<umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.current}" ng-repeat="variant in variants">
<a href="" class="umb-variant-switcher__name-wrapper" ng-click="selectVariant($event, variant)" prevent-default>
<span class="umb-variant-switcher__name">{{variant.cultureDisplayName}}</span>
<span class="umb-variant-switcher__state">{{variant.state}}</span>
</a>
<div ng-if="splitViewOpen !== true" class="umb-variant-switcher__split-view" ng-click="openInSplitView($event, variant)">Open in split view</div>
</umb-dropdown-item>
</umb-dropdown>
<div class="umb-editor-header__name-wrapper">
<ng-form name="headerNameForm">
<input
data-element="editor-name-field"
title="{{key}}"
type="text"
class="umb-editor-header__name-input"
localize="placeholder"
placeholder="@placeholders_entername"
name="headerName"
ng-show="!nameLocked"
ng-model="name"
ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
umb-auto-focus
val-server-field="Name"
required />
</ng-form>
<umb-generate-alias
data-element="editor-alias"
class="umb-panel-header-alias"
ng-if="!hideAlias"
alias="$parent.alias"
alias-from="$parent.name"
enable-lock="true"
server-validation-field="Alias">
</umb-generate-alias>
<a ng-if="variants.length > 0" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
<span>{{vm.currentVariant.cultureDisplayName}}</span>
<ins class="umb-variant-switcher__expand" ng-class="{'icon-navigation-down': !vm.dropdownOpen, 'icon-navigation-up': vm.dropdownOpen}">&nbsp;</ins>
</a>
<umb-dropdown ng-if="vm.dropdownOpen" style="width: 100%; max-height: 250px; overflow: scroll; margin-top: 5px;" on-close="vm.dropdownOpen = false" umb-keyboard-list>
<umb-dropdown-item class="umb-variant-switcher__item" ng-class="{'umb-variant-switcher_item--current': variant.current}" ng-repeat="variant in variants">
<a href="" class="umb-variant-switcher__name-wrapper" ng-click="selectVariant($event, variant)" prevent-default>
<span class="umb-variant-switcher__name">{{variant.cultureDisplayName}}</span>
<span class="umb-variant-switcher__state">{{variant.state}}</span>
</a>
<div ng-if="splitViewOpen !== true" class="umb-variant-switcher__split-view" ng-click="openInSplitView($event, variant)">Open in split view</div>
</umb-dropdown-item>
</umb-dropdown>
</div>
<div class="umb-panel-header-name" ng-if="nameLocked" title="{{key}}">{{ name }}</div>
<input
data-element="editor-description"
type="text"
class="umb-panel-header-description"
localize="placeholder"
placeholder="@placeholders_enterDescription"
ng-if="!hideDescription && !descriptionLocked"
ng-model="$parent.description" />
<div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
</div>
<div class="umb-panel-header-name" ng-if="nameLocked" title="{{key}}">{{ name }}</div>
</div>
<div ng-if="splitViewOpen" style="margin-left: 20px;">
@@ -82,44 +107,6 @@
</div>
<!--
<umb-generate-alias
data-element="editor-alias"
class="umb-panel-header-alias"
ng-if="!hideAlias"
alias="$parent.alias"
alias-from="$parent.name"
enable-lock="true"
server-validation-field="Alias">
</umb-generate-alias>
<input
data-element="editor-description"
type="text"
class="umb-panel-header-description"
localize="placeholder"
placeholder="@placeholders_enterDescription"
ng-if="!hideDescription && !descriptionLocked"
ng-model="$parent.description" />
<div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
<div class="umb-editor-header__actions-menu">
<umb-editor-menu
data-element="editor-actions"
ng-if="menu.currentNode"
current-node="menu.currentNode"
current-section="{{menu.currentSection}}">
</umb-editor-menu>
</div>
<umb-tabs-nav
data-element="editor-tabs"
ng-if="tabs"
model="tabs">
</umb-tabs-nav>
<umb-overlay
data-element="editor-overlay-icon-picker"
ng-if="dialogModel.show"
@@ -127,6 +114,5 @@
position="right"
view="dialogModel.view">
</umb-overlay>
-->
</div>
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html
+14 -16
View File
@@ -1,16 +1,14 @@
<div>
<ul class="umb-sub-views-nav" ng-if="showNavigation">
<li ng-repeat="item in navigation">
<a data-element="sub-view-{{item.alias}}"
tabindex="-1"
class="umb-sub-views-nav-item"
href=""
ng-click="clickNavigationItem(item)"
hotkey="{{$index+1}}"
ng-class="{'is-active': item.active, '-has-error': item.hasError}">
<i class="icon {{ item.icon }}"></i>
<span class="umb-sub-views-nav-item-text">{{ item.name }}</span>
</a>
</li>
</ul>
</div>
<ul class="umb-sub-views-nav" ng-if="showNavigation">
<li ng-repeat="item in navigation">
<a data-element="sub-view-{{item.alias}}"
tabindex="-1"
class="umb-sub-views-nav-item"
href=""
ng-click="clickNavigationItem(item)"
hotkey="{{$index+1}}"
ng-class="{'is-active': item.active, '-has-error': item.hasError}">
<i class="icon {{ item.icon }}"></i>
<span class="umb-sub-views-nav-item-text">{{ item.name }}</span>
</a>
</li>
</ul>