Merge branch 'dev' into 6172-errorMsg
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
175f53c0c5
|
@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
### Added
|
||||
|
||||
### Changed
|
||||
- (Trabajadores -> Calendario) Icono de check arreglado cuando pulsas un tipo de dia
|
||||
|
||||
### Fixed
|
||||
|
||||
|
|
|
@ -84,7 +84,8 @@
|
|||
<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-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>
|
||||
{{absenceType.name}}
|
||||
</vn-chip>
|
||||
|
|
|
@ -9,7 +9,7 @@ vn-worker-calendar {
|
|||
align-items: center;
|
||||
box-sizing: border-box;
|
||||
padding: $spacing-md;
|
||||
|
||||
|
||||
& > vn-calendar {
|
||||
border: $border-thin;
|
||||
margin: $spacing-md;
|
||||
|
@ -32,7 +32,7 @@ vn-worker-calendar {
|
|||
}
|
||||
|
||||
vn-icon[icon="info"] {
|
||||
position: absolute;
|
||||
position: absolute;
|
||||
top: 16px;
|
||||
right: 16px
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ vn-worker-calendar {
|
|||
vn-side-menu div > .input {
|
||||
border-bottom: $border-thin;
|
||||
}
|
||||
|
||||
|
||||
.festive,
|
||||
vn-avatar.today {
|
||||
color: $color-font;
|
||||
|
@ -56,4 +56,10 @@ vn-worker-calendar {
|
|||
vn-avatar.today {
|
||||
border: 2px solid $color-font-link
|
||||
}
|
||||
|
||||
.check {
|
||||
margin-top: 0.5px;
|
||||
margin-left: -3px;
|
||||
font-size: 125%;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue