Skip to content

Hide colors from icon picker #13079

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

Merged
mikecp merged 5 commits into from
Jan 7, 2023
Merged

Hide colors from icon picker #13079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c6b9b4
Ensure border is set so it doesn't jump on selection
bjarnef Sep 29, 2022
99e3c4c
Allow to hide color from icon picker
bjarnef Sep 29, 2022
5870cdb
Use CSS grid instead to fill icons and with minimum width
bjarnef Sep 29, 2022
2779307
Remove odd flex size
bjarnef Sep 29, 2022
54e5894
Set minimum to 60px instead
bjarnef Sep 29, 2022
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
10 changes: 5 additions & 5 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-iconpicker.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
.umb-iconpicker {
display: flex;
flex-direction: row;
flex-wrap: wrap;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));
gap: 0.25rem;
margin: 0;
}

.umb-iconpicker-item {
display: flex;
flex-direction: row;
flex: 0 0 14.28%;
justify-content: center;
align-items: center;
margin-bottom: 0;
overflow: hidden;
border: 1px solid transparent;
}

.umb-iconpicker-item button {
Expand Down Expand Up @@ -41,7 +41,7 @@

.umb-iconpicker-item.-selected {
background: @gray-10;
border: solid 1px @ui-active;
border-color: @ui-active;
border-radius: @baseBorderRadius;
box-sizing: border-box;
}
Expand Down
10 changes: 4 additions & 6 deletions ...mbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,19 @@ function IconPickerController($scope, localizationService, iconHelper) {
vm.loading = false;
});
});

// set a default color if nothing is passed in
vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors.find(x => x.default);


// if an icon is passed in - preselect it
vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
}

function setTitle() {
if (!$scope.model.title) {
localizationService.localize("defaultdialogs_selectIcon")
.then(function(data){
$scope.model.title = data;
});
localizationService.localize("defaultdialogs_selectIcon").then(data => {
$scope.model.title = data;
});
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</umb-search-filter>
</div>

<div class="umb-control-group mt3">
<div class="umb-control-group mt3" ng-if="model.hideColors !== true">
<umb-color-swatches
use-color-class="true"
colors="vm.colors"
Expand Down