verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 54 Releases Wiki Activity

Merge pull request '6044-fixTickCalendar' (!1733) from 6044-fixTickCalendar into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1733
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Carlos Satorres 2023-09-04 10:46:21 +00:00
parent 27a9881a6a 7025326e06
commit 4f7ac4c05d
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
### Changed ### Changed
- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
### Fixed ### Fixed

3
modules/worker/front/calendar/index.html
View File

@ -84,7 +84,8 @@
<div name="absenceTypes" class="input vn-py-md" style="overflow: hidden;"> <div name="absenceTypes" class="input vn-py-md" style="overflow: hidden;">
<vn-chip ng-repeat="absenceType in absenceTypes" ng-class="::{'selectable': $ctrl.isSubordinate}" ng-click="$ctrl.pick(absenceType)"> <vn-chip ng-repeat="absenceType in absenceTypes" ng-class="::{'selectable': $ctrl.isSubordinate}" ng-click="$ctrl.pick(absenceType)">
<vn-avatar ng-style="{backgroundColor: absenceType.rgb}"> <vn-avatar ng-style="{backgroundColor: absenceType.rgb}">
<vn-icon icon="check" ng-if="absenceType.id == $ctrl.absenceType.id"></vn-icon> <vn-icon class="check" icon="check" ng-if="absenceType.id == $ctrl.absenceType.id"></vn-icon>
</vn-avatar> </vn-avatar>
{{absenceType.name}} {{absenceType.name}}
</vn-chip> </vn-chip>

12
modules/worker/front/calendar/style.scss
View File

@ -9,7 +9,7 @@ vn-worker-calendar {
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
padding: $spacing-md; padding: $spacing-md;
& > vn-calendar { & > vn-calendar {
border: $border-thin; border: $border-thin;
margin: $spacing-md; margin: $spacing-md;
@ -32,7 +32,7 @@ vn-worker-calendar {
} }
vn-icon[icon="info"] { vn-icon[icon="info"] {
position: absolute; position: absolute;
top: 16px; top: 16px;
right: 16px right: 16px
} }
@ -40,7 +40,7 @@ vn-worker-calendar {
vn-side-menu div > .input { vn-side-menu div > .input {
border-bottom: $border-thin; border-bottom: $border-thin;
} }
.festive, .festive,
vn-avatar.today { vn-avatar.today {
color: $color-font; color: $color-font;
@ -56,4 +56,10 @@ vn-worker-calendar {
vn-avatar.today { vn-avatar.today {
border: 2px solid $color-font-link border: 2px solid $color-font-link
} }
.check {
margin-top: 0.5px;
margin-left: -3px;
font-size: 125%;
}
} }