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

new localization key + umb-property__stickers

Browse Source
This commit is contained in:
Niels Lyngsø
2019-05-10 14:26:36 +02:00
parent a32398ccde
commit a45ed3559b
16 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/less/forms.less
+13
View File
@@ -744,6 +744,10 @@ legend + .control-group {
-webkit-margin-top-collapse: separate;
}
.umb-property__stickers {
margin-bottom:10px;
}
// Horizontal-specific styles
// --------------------------
@@ -767,6 +771,11 @@ legend + .control-group {
*padding-left: @horizontalComponentOffset;
}
}
.umb-property__stickers {
margin-left: @horizontalComponentOffset;
margin-bottom:2px;
}
// Remove bottom margin on block level help text since that's accounted for on .control-group
@@ -814,6 +823,10 @@ legend + .control-group {
.form-horizontal .controls {
margin-left: 0;
}
.form-horizontal .umb-property__stickers {
margin-left: 0;
margin-bottom:10px;
}
}
src/Umbraco.Web.UI.Client/src/less/main.less
+1 -1
View File
@@ -222,7 +222,7 @@ label:not([for]) {
padding-top: 0;
}
.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls {
.hidelabel > div > .controls-row, .hidelabel > .controls-row, .hidelabel > div > .controls, .hidelabel > div > .umb-property__stickers {
padding: 0;
border: none;
margin: 0 !important;
src/Umbraco.Web.UI.Client/src/less/property-editors.less
+12 -15
View File
@@ -60,18 +60,15 @@
}
.umb-property__inheriting-from-default {
display: none;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-color: @gray;
color: white;
padding: 10px 20px;
background-color: @inputBorder;
padding: 4px 8px;
border-radius: 3px;
z-index: 10;
margin-left: 85px;
margin-bottom: 20px;
transition: background-color 120ms;
@media (min-width: 768px) {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
}
&.--disabled {
@@ -89,11 +86,11 @@
}
&:hover {
.controls {
opacity: 0.1;
}
/*.controls {
opacity: 0.3;
}*/
.umb-property__inheriting-from-default {
display: block;
background-color: @inputBorderFocus;
}
}
}
src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
+6 -3
View File
@@ -17,12 +17,15 @@
</label>
<div class="umb-property__stickers">
<small ng-if="showInherit" class="umb-property__inheriting-from-default" on-click="openDefaultVariant();">
<localize key="contentTypeEditor_inheritedFrom" tokens="[inheritsFrom.language.name]" watchTokens="true"></localize>
</small>
</div>
<div class="controls" ng-transclude>
</div>
<small ng-if="showInherit" class="umb-property__inheriting-from-default" on-click="openDefaultVariant(inheritsFrom);">
<localize key="contentTypeEditor_inheritedFrom" tokens="[inheritsFrom.language.name]" watchTokens="true"></localize>
</small>
</div>
</div>
</ng-form>
src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+1 -2
View File
@@ -223,8 +223,7 @@
<div class="umb-group-builder__property-tag" ng-if="property.inherited">
<i class="icon icon-merge"></i>
<span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom"></localize></span>
{{property.contentTypeName}}
<span style="margin-right: 3px"><localize key="contentTypeEditor_inheritedFrom" tokens="[property.contentTypeName]"></localize></span>
</div>
<div class="umb-group-builder__property-tag" ng-if="property.locked">
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
+1
View File
@@ -1281,6 +1281,7 @@ Mange hilsner fra Umbraco robotten
<key alias="noGroups">Du har ikke tilføjet nogle grupper</key>
<key alias="addGroup">Tilføj gruppe</key>
<key alias="inheritedFrom">Nedarvet fra %0%</key>
<key alias="invariantValueInheritedFrom">Arver indholdet fra %0%</key>
<key alias="addProperty">Tilføj egenskab</key>
<key alias="requiredLabel">Påkrævet label</key>
<key alias="enableListViewHeading">Aktiver listevisning</key>
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
+2 -1
View File
@@ -1545,7 +1545,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="group">Group</key>
<key alias="noGroups">You have not added any groups</key>
<key alias="addGroup">Add group</key>
<key alias="inheritedFrom">Inherited from %0%</key>
<key alias="inheritedFrom">Inherited from %0%</key>
<key alias="invariantValueInheritedFrom">Invariant value is obtained from %0%</key>
<key alias="addProperty">Add property</key>
<key alias="requiredLabel">Required label</key>
<key alias="enableListViewHeading">Enable list view</key>
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+1
View File
@@ -1559,6 +1559,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="noGroups">You have not added any groups</key>
<key alias="addGroup">Add group</key>
<key alias="inheritedFrom">Inherited from %0%</key>
<key alias="invariantValueInheritedFrom">Invariant value is obtained from %0%</key>
<key alias="addProperty">Add property</key>
<key alias="requiredLabel">Required label</key>
<key alias="enableListViewHeading">Enable list view</key>
src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
+1
View File
@@ -1193,6 +1193,7 @@
<key alias="compositions">Composiciones</key>
<key alias="noGroups">No has añadido ninguna pestaña</key>
<key alias="inheritedFrom">Heredado de %0%</key>
<key alias="invariantValueInheritedFrom">Heredado de %0%</key>
<key alias="addProperty">Añadir propiedad</key>
<key alias="requiredLabel">Etiqueta requerida</key>
<key alias="enableListViewHeading">Activar vista de lista</key>
src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml
+1
View File
@@ -1366,6 +1366,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
<key alias="compositions">Compositions</key>
<key alias="noGroups">Vous n'avez pas ajouté d'onglet</key>
<key alias="inheritedFrom">Hérité de %0%</key>
<key alias="invariantValueInheritedFrom">Hérité de %0%</key>
<key alias="addProperty">Ajouter une propriété</key>
<key alias="requiredLabel">Label requis</key>
<key alias="enableListViewHeading">Activer la vue en liste</key>
src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml
+1
View File
@@ -926,6 +926,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="compositions">構成</key>
<key alias="noGroups">タブが追加されていません</key>
<key alias="inheritedFrom">次から継承: %0%</key>
<key alias="invariantValueInheritedFrom">次から継承: %0%</key>
<key alias="addProperty">プロパティの追加</key>
<key alias="requiredLabel">必要なラベル</key>
<key alias="enableListViewHeading">リスト ビューの有効化</key>
src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
+1
View File
@@ -961,6 +961,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
<key alias="noGroups">Er zijn nog geen groepen toegevoegd</key>
<key alias="addGroup">Voeg groep toe</key>
<key alias="inheritedFrom">Inherited van %0%</key>
<key alias="invariantValueInheritedFrom">Inherited van %0%</key>
<key alias="addProperty">Voeg property toe</key>
<key alias="requiredLabel">Verplicht label</key>
<key alias="enableListViewHeading">Zet list view aan</key>
src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml
+1
View File
@@ -1172,6 +1172,7 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
<key alias="compositions">Kompozycje</key>
<key alias="noGroups">Nie dodałeś żadnych zakładek</key>
<key alias="inheritedFrom">Odziedziczone z %0%</key>
<key alias="invariantValueInheritedFrom">Odziedziczone z %0%</key>
<key alias="addProperty">Dodaj właściwość</key>
<key alias="requiredLabel">Wymagana etykieta</key>
<key alias="enableListViewHeading">Włącz widok listy</key>
src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml
+1
View File
@@ -268,6 +268,7 @@
<key alias="compositions">Композиции</key>
<key alias="noGroups">Вы не добавили ни одной вкладки</key>
<key alias="inheritedFrom">Унаследовано от %0%</key>
<key alias="invariantValueInheritedFrom">Унаследовано от %0%</key>
<key alias="addProperty">Добавить свойство</key>
<key alias="requiredLabel">Обязательная метка</key>
<key alias="enableListViewHeading">Представление в формате списка</key>
src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml
+1
View File
@@ -972,6 +972,7 @@
<key alias="compositions">组合</key>
<key alias="noGroups">您没有添加任何选项卡</key>
<key alias="inheritedFrom">继承自 %0%</key>
<key alias="invariantValueInheritedFrom">继承自 %0%</key>
<key alias="addProperty">添加属性</key>
<key alias="requiredLabel">必需的标签</key>
<key alias="enableListViewHeading">启用列表视图</key>
src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
+1
View File
@@ -959,6 +959,7 @@
<key alias="compositions">組合</key>
<key alias="noGroups">您沒有增加任何選項卡</key>
<key alias="inheritedFrom">繼承的表格 %0%</key>
<key alias="invariantValueInheritedFrom">繼承的表格 %0%</key>
<key alias="addProperty">增加屬性</key>
<key alias="requiredLabel">必要標籤</key>
<key alias="enableListViewHeading">允許清單檢視</key>