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

V8: Remove obsolete umb-permission styling (#5308)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-04-23 21:50:28 +02:00
committed by Sebastiaan Janssen
parent 7cc9747b2f
commit a6d8b48ab4
13 changed files with 34 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/less/belle.less
View File

@@ -179,7 +179,6 @@
@import "components/users/umb-user-group-preview.less";
@import "components/users/umb-user-preview.less";
@import "components/users/umb-user-picker-list.less";
@import "components/users/umb-permission.less";
// Utilities

5
src/Umbraco.Web.UI.Client/src/less/components/umb-list.less
View File

@@ -31,6 +31,11 @@ a.umb-list-item:focus {
opacity: 1;
}
.umb-list-item__description {
font-size: 13px;
color: @gray-4;
}
.umb-list-checkbox {
position: absolute;
opacity: 0;

33
src/Umbraco.Web.UI.Client/src/less/components/users/umb-permission.less
View File

@@ -1,33 +0,0 @@
.umb-permission {
display: flex;
border-bottom: 1px solid @gray-9;
padding: 7px 0;
}
.umb-permission:last-of-type {
border-bottom: none;
}
.umb-permission__toggle {
padding-right: 20px;
cursor: pointer;
}
.umb-permission__content {
display: flex;
flex-direction: column;
justify-content: center;
flex: 1 1 auto;
cursor: pointer;
}
.umb-permission--disabled .umb-permission__toggle,
.umb-permission--disabled .umb-permission__content {
cursor: not-allowed;
opacity: 0.8;
}
.umb-permission__description {
font-size: 13px;
color: @gray-4;
}

2
src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-notification-list.html
View File

@@ -1,7 +1,7 @@
<span class="db" ng-repeat="notification in vm.notifications">
<!-- These are server side notifications for messages, generally success/warning, validation messages handled separately -->
<!-- Success = 3, Error = 2, Warning = 4 -->
<span class="db umb-permission__description"
<span class="db umb-list-item__description"
ng-class="{'text-success': notification.type === 3, 'text-error': notification.type === 2 || notification.type === 4}">
{{notification.message}}
</span>

8
src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
View File

@@ -26,14 +26,14 @@
<span>{{ variant.language.name }}</span>
<strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
<span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<span class="db umb-list-item__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state variant="variant"></umb-variant-state>
<span ng-if="variant.language.isMandatory"> - </span>
<span ng-if="variant.language.isMandatory" ng-class="{'text-error': (variant.language.isMandatory && variant.willPublish === false) }"><localize key="languages_mandatoryLanguage"></localize></span>
</span>
<span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
<span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
<span class="db umb-list-item__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
</span>
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
@@ -60,11 +60,11 @@
</div>
<div ng-if="!(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
<umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
</div>
<div ng-repeat="notification in variant.notifications">
<div class="umb-permission__description text-success">{{notification.message}}</div>
<div class="umb-list-item__description text-success">{{notification.message}}</div>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
View File

@@ -55,13 +55,13 @@
<label for="{{variant.htmlId}}" style="margin-bottom: 0;">
<span>{{ variant.language.name }}</span>
<span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<span class="db umb-list-item__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state variant="variant"></umb-variant-state>
<span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
</span>
<span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
<span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
<span class="db umb-list-item__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
</span>
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>

8
src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html
View File

@@ -34,11 +34,11 @@
<strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
<span class="db" ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
<umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
</span>
<span class="db" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
<span class="db umb-permission__description text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
<span class="db umb-list-item__description text-error" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
</span>
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
@@ -68,11 +68,11 @@
</div>
<div ng-if="!(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
<umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
</div>
<div ng-repeat="notification in variant.notifications">
<div class="umb-permission__description text-success">{{notification.message}}</div>
<div class="umb-list-item__description text-success">{{notification.message}}</div>
</div>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
View File

@@ -99,7 +99,7 @@
<label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px;">
<span>{{ variant.language.name }}</span>
<span class="db umb-permission__description"
<span class="db umb-list-item__description"
ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state variant="variant"></umb-variant-state>
<span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
@@ -167,7 +167,7 @@
val-server-field="{{variant.htmlId}}" />
<div ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
<div class="umb-permission__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
<div class="umb-list-item__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
</div>
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>

6
src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html
View File

@@ -27,11 +27,11 @@
<strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
<span class="db" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
<umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
</span>
<span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
<span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
<span class="db umb-list-item__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
</span>
<umb-variant-notification-list notifications="variant.notifications"></umb-variant-notification-list>
@@ -56,7 +56,7 @@
<span>{{ variant.language.name }}</span>
<strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
</div>
<umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
<umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
</div>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html
View File

@@ -29,7 +29,7 @@
<label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
<span>{{ variant.language.name }}</span>
<span class="db umb-permission__description">
<span class="db umb-list-item__description">
<umb-variant-state variant="variant"></umb-variant-state>
<span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
</span>
@@ -55,7 +55,7 @@
</div>
<div>
<umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
<umb-variant-state class="umb-list-item__description" variant="variant"></umb-variant-state>
</div>
</div>
</div>

18
src/Umbraco.Web.UI.Client/src/views/languages/edit.html
View File

@@ -34,28 +34,28 @@
</span>
</umb-control-group>
<umb-control-group label="@general_settings">
<umb-control-group label="@general_settings" class="umb-toggle-group">
<div class="umb-permission" ng-click="vm.toggleDefault()" ng-class="{'umb-permission--disabled': vm.initIsDefault}">
<div class="umb-toggle-group-item" ng-click="vm.toggleDefault()" ng-class="{'umb-toggle-group-item--disabled': vm.initIsDefault}">
<umb-toggle
class="umb-permission__toggle"
class="umb-toggle-group-item__toggle"
checked="vm.language.isDefault"
disabled="vm.initIsDefault">
</umb-toggle>
<div class="umb-permission__content" >
<div class="umb-toggle-group-item__content" >
<div>{{vm.labels.defaultLanguage}}</div>
<div class="umb-permission__description">{{vm.labels.defaultLanguageHelp}}</div>
<div class="umb-toggle-group-item__description">{{vm.labels.defaultLanguageHelp}}</div>
</div>
</div>
<div class="umb-permission" ng-click="vm.toggleMandatory()">
<div class="umb-toggle-group-item" ng-click="vm.toggleMandatory()">
<umb-toggle
class="umb-permission__toggle"
class="umb-toggle-group-item__toggle"
checked="vm.language.isMandatory">
</umb-toggle>
<div class="umb-permission__content">
<div class="umb-toggle-group-item__content">
<div>{{vm.labels.mandatoryLanguage}}</div>
<div class="umb-permission__description">{{vm.labels.mandatoryLanguageHelp}}</div>
<div class="umb-toggle-group-item__description">{{vm.labels.mandatoryLanguageHelp}}</div>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewpublish.html
View File

@@ -31,7 +31,7 @@
<span ng-class="{'bold': language.isDefault}">{{ language.name }}</span>
</label>
<div class="umb-permission__description">
<div class="umb-list-item__description">
<span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
</div>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/listviewunpublish.html
View File

@@ -29,7 +29,7 @@
<span ng-class="{'bold': language.isDefault}">{{ language.name }}</span>
</label>
<div class="umb-permission__description">
<div class="umb-list-item__description">
<span ng-if="language.isMandatory"><localize key="languages_mandatoryLanguage"></localize></span>
</div>