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

Design & color changes for 2019 brand colors

Browse Source
This commit is contained in:
Niels Lyngsø
2019-01-29 09:30:42 +01:00
parent 052cee31b3
commit 08a8e0793e
23 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
View File

@@ -137,7 +137,7 @@ In the following example you see how to run some custom logic before a step goes
<div>
<umb-button
size="xs"
button-style="success"
button-style="action"
type="button"
action="vm.initNextStep()"
label="Next">

2
src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
View File

@@ -14,7 +14,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
<umb-button
action="vm.clickButton()"
type="button"
button-style="success"
button-style="action"
state="vm.buttonState"
shortcut="ctrl+c"
label="My button"

10
src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
View File

@@ -304,16 +304,6 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
// it would be better if we could cache the processing. The problem is that some of these things are dynamic.
var css = [];
if (node == $scope.currentNode) {
css.push("current");
}
if (node.hasChildren) {
css.push("has-children");
}
if (node.deleteAnimations) {
css.push("umb-tree-item--deleted");
}
if (node.cssClasses) {
_.each(node.cssClasses, function (c) {
css.push(c);

2
src/Umbraco.Web.UI.Client/src/common/services/editor.service.js
View File

@@ -116,7 +116,7 @@ When building a custom infinite editor view you can use the same components as a
</umb-button>
<umb-button
type="button"
button-style="success"
button-style="action"
label-key="general_submit"
action="vm.submit(model)">
</umb-button>

4
src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less
View File

@@ -51,9 +51,9 @@
.umb-language-picker__dropdown a:hover,
.umb-language-picker__dropdown a:focus {
background: @gray-10;
background: @ui-option-hover;
text-decoration: none;
color:@ui-light-active-type-hover;
color:@ui-option-type-hover;
}
.umb-language-picker__dropdown a.umb-language-picker__dropdown-item--current {

4
src/Umbraco.Web.UI.Client/src/less/components/overlays.less
View File

@@ -15,8 +15,10 @@
}
.umb-overlay .umb-overlay-header {
background: @gray-10;
//background: @gray-10;
border-bottom: 1px solid @purple-l3;
//background: @blueExtraDark;
//color:@u-white;
padding: 10px;
margin-top: 0;
flex-grow: 0;

6
src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree-item.less
View File

@@ -58,7 +58,7 @@
i {
background: @ui-active-type;
border-color: @ui-active;
//border-color: @ui-active;
transition: opacity 120ms ease;
}
}
@@ -67,7 +67,7 @@
.umb-tree-icon,
ins {
color: @ui-active-type !important;
background-color: @ui-active;
border-color: @ui-active;
//background-color: @ui-active;
//border-color: @ui-active;
}
}

24
src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
View File

@@ -87,6 +87,21 @@ body.touch .umb-tree {
}
}
// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
.umb-tree-item > .umb-tree-item__inner.active {
background: @ui-selected;
color: @ui-selected-type;
a {
color: @ui-selected-type;
}
&:hover {
background: @ui-selected-hover;
color: @ui-selected-type-hover;
a {
color: @ui-selected-type-hover;
}
}
}
.umb-tree-root, .umb-tree-item__inner {
padding: 0;
position: relative;
@@ -100,15 +115,6 @@ body.touch .umb-tree {
color: @ui-option-type;
}
// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
&.active {
background: @ui-selected;
color: @ui-selected-type;
a {
color: @ui-selected-type;
}
}
&:hover {
background: @ui-option-hover;

8
src/Umbraco.Web.UI.Client/src/less/variables.less
View File

@@ -140,10 +140,10 @@
@ui-active-type: @blueExtraDark;
@ui-active-type-hover: @blueMid;
@ui-selected: @blue;
@ui-selected-hover: @blueMid;
@ui-selected-type: @u-white;
@ui-selected-type-hover: @u-white;
@ui-selected: @brownLight;
@ui-selected-hover: ligthen(@brownLight, 10);
@ui-selected-type: @blueMid;
@ui-selected-type-hover: @blueMid;
@ui-light-border: @pinkLight;
@ui-light-type: @gray-4;

15
src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
View File

@@ -2,17 +2,18 @@ angular.module("umbraco")
.controller("Umbraco.Overlays.UserController", function ($scope, $location, $timeout, dashboardResource, userService, historyService, eventsService, externalLoginInfo, authResource, currentUserResource, formHelper, localizationService) {
$scope.history = historyService.getCurrent();
$scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
//$scope.version = Umbraco.Sys.ServerVariables.application.version + " assembly: " + Umbraco.Sys.ServerVariables.application.assemblyVersion;
$scope.showPasswordFields = false;
$scope.changePasswordButtonState = "init";
$scope.model.subtitle = "Umbraco version" + " " + $scope.version;
$scope.model.title = "user.name";
//$scope.model.subtitle = "Umbraco version" + " " + $scope.version;
/*
if(!$scope.model.title) {
localizationService.localize("general_user").then(function(value){
$scope.model.title = value;
});
}
*/
$scope.externalLoginProviders = externalLoginInfo.providers;
$scope.externalLinkLoginFormAction = Umbraco.Sys.ServerVariables.umbracoUrls.externalLinkLoginsUrl;
var evts = [];
@@ -45,7 +46,7 @@ angular.module("umbraco")
$location.path(link);
$scope.model.close();
};
/*
//Manually update the remaining timeout seconds
function updateTimeout() {
$timeout(function () {
@@ -58,7 +59,7 @@ angular.module("umbraco")
}, 1000, false); // 1 second, do NOT execute a global digest
}
*/
function updateUserInfo() {
//get the user
userService.getCurrentUser().then(function (user) {
@@ -68,7 +69,7 @@ angular.module("umbraco")
$scope.remainingAuthSeconds = $scope.user.remainingAuthSeconds;
$scope.canEditProfile = _.indexOf($scope.user.allowedSections, "users") > -1;
//set the timer
updateTimeout();
//updateTimeout();
authResource.getCurrentUserLinkedLogins().then(function(logins) {
//reset all to be un-linked

4
src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
View File

@@ -4,11 +4,11 @@
<h5><localize key="user_yourProfile" /></h5>
<p class="muted">
<!--<p class="muted">
<small>
<localize key="user_sessionExpires" />: {{remainingAuthSeconds | timespan}}
</small>
</p>
</p>-->
<umb-button
alias="editUser"

2
src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatecontent/nodename/nodename.html
View File

@@ -19,7 +19,7 @@
</umb-tour-step-counter>
<div>
<umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
<umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
</div>
</umb-tour-step-footer>

2
src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.html
View File

@@ -19,7 +19,7 @@
</umb-tour-step-counter>
<div>
<umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
<umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
</div>
</umb-tour-step-footer>

2
src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/propertyname/propertyname.html
View File

@@ -19,7 +19,7 @@
</umb-tour-step-counter>
<div>
<umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
<umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
</div>
</umb-tour-step-footer>

2
src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/tabname/tabname.html
View File

@@ -19,7 +19,7 @@
</umb-tour-step-counter>
<div>
<umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next"></umb-button>
<umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next"></umb-button>
</div>
</umb-tour-step-footer>

2
src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/foldername/foldername.html
View File

@@ -19,7 +19,7 @@
</umb-tour-step-counter>
<div>
<umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
<umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
</div>
</umb-tour-step-footer>

2
src/Umbraco.Web.UI.Client/src/views/common/tours/umbintromediasection/uploadimages/uploadimages.html
View File

@@ -19,7 +19,7 @@
</umb-tour-step-counter>
<div>
<umb-button size="xs" button-style="success" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
<umb-button size="xs" button-style="action" type="button" action="vm.initNextStep()" label="Next" state="vm.buttonState"></umb-button>
</div>
</umb-tour-step-footer>

8
src/Umbraco.Web.UI.Client/src/views/components/application/umb-tour.html
View File

@@ -31,11 +31,11 @@
</div>
<div ng-if="model.currentStep.type !== 'intro'">
<umb-button size="xs" ng-if="!model.currentStep.event" button-style="success" type="button" action="model.nextStep()" label="Next"></umb-button>
<umb-button size="xs" ng-if="!model.currentStep.event" button-style="action" type="button" action="model.nextStep()" label="Next"></umb-button>
</div>
<div ng-if="model.currentStep.type === 'intro'">
<umb-button size="m" button-style="success" type="button" action="model.nextStep()" label="Start tour"></umb-button>
<umb-button size="m" button-style="action" type="button" action="model.nextStep()" label="Start tour"></umb-button>
</div>
</div>
@@ -55,7 +55,7 @@
</umb-tour-step-content>
<umb-tour-step-footer>
<umb-button type="button" button-style="success" size="m" action="model.completeTour()" label="Complete"></umb-button>
<umb-button type="button" button-style="action" size="m" action="model.completeTour()" label="Complete"></umb-button>
</umb-tour-step-footer>
</umb-tour-step>
@@ -76,7 +76,7 @@
<p>Please go back and start the tour again.</p>
</umb-tour-step-content>
<umb-tour-step-footer>
<umb-button size="s" button-style="success" type="button" action="model.endTour()" label="End tour"></umb-button>
<umb-button size="s" button-style="action" type="button" action="model.endTour()" label="End tour"></umb-button>
</umb-tour-step-footer>
</umb-tour-step>
</div>

2
src/Umbraco.Web.UI.Client/src/views/content/notify.html
View File

@@ -42,7 +42,7 @@
type="button"
action="vm.save(vm.notifyOptions)"
state="vm.saveState"
button-style="success">
button-style="action">
</umb-button>
</div>
</div>

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

@@ -127,7 +127,7 @@
<div class="alert alert-success" ng-bind-html="vm.success.message"></div>
<umb-button type="button"
action="vm.close()"
button-style="success"
button-style="action"
label-key="general_ok">
</umb-button>
</umb-pane>
@@ -144,7 +144,7 @@
<umb-button ng-hide="vm.step || vm.removing"
type="button"
action="vm.next()"
button-style="success"
button-style="action"
label-key="general_next"
disabled="vm.loading || !vm.type">
</umb-button>

2
src/Umbraco.Web.UI.Client/src/views/content/rights.html
View File

@@ -75,7 +75,7 @@
label-key="prompt_stay"
action="vm.stay()"
type="button"
button-style="success">
button-style="action">
</umb-button>
</div>
</div>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
View File

@@ -5,7 +5,7 @@
</div>
<div class="row-fluid" ng-switch-when="false">
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
@@ -37,7 +37,7 @@
</div>
<div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints">
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
<a class="btn btn-action dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
<localize key="actions_create">Create</localize>
<span class="caret"></span>
</a>

10
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
View File

@@ -11,7 +11,7 @@
<umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
<umb-button-group
ng-if="vm.defaultButton"
button-style="success"
button-style="action"
default-button="vm.defaultButton"
sub-buttons="vm.subButtons">
</umb-button-group>
@@ -392,7 +392,7 @@
<umb-button
ng-if="vm.usersViewState === 'inviteUser'"
button-style="success"
button-style="action"
state="vm.page.createButtonState"
type="button"
action="vm.inviteUser(addUserForm)"
@@ -402,7 +402,7 @@
<umb-button
ng-if="vm.usersViewState === 'createUser'"
button-style="success"
button-style="action"
state="vm.page.createButtonState"
type="button"
action="vm.createUser(addUserForm)"
@@ -486,7 +486,7 @@
</umb-button>
<umb-button
type="button"
button-style="success"
button-style="action"
label-key="user_goToProfile"
action="vm.goToUser(vm.newUser.id);"
size="m">
@@ -536,7 +536,7 @@
</umb-button>
<umb-button
type="button"
button-style="success"
button-style="action"
label-key="user_goToProfile"
action="vm.goToUser(vm.newUser.id);"
size="m">