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

Style/i18n fixes

This commit is contained in:
Juan Ferrer 2019-09-25 23:09:10 +02:00
parent dba4ae14d5
commit 2a0cc1dc8b
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/salix/styles/variables.scss
View File

@ -62,6 +62,7 @@ $color-notice-medium: lighten($color-notice, 20%);
$color-notice-light: lighten($color-notice, 35%); $color-notice-light: lighten($color-notice, 35%);
$color-alert-medium: lighten($color-alert, 20%); $color-alert-medium: lighten($color-alert, 20%);
$color-alert-light: lighten($color-alert, 35%); $color-alert-light: lighten($color-alert, 35%);
/**/
// Dark theme // Dark theme
/* /*

4
modules/agency/front/delivery-days/index.html
View File

@ -35,10 +35,10 @@
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>
<vn-button-bar> <vn-button-bar>
<vn-submit label="Send"></vn-submit> <vn-submit label="Query"></vn-submit>
</vn-button-bar> </vn-button-bar>
</form> </form>
<vn-card pad-medium margin-medium-top> <vn-card pad-medium margin-medium-top>
<vn-zone-calendar <vn-zone-calendar
events="events.events" events="events.events"
exclusions="events.exclusions"> exclusions="events.exclusions">

2
modules/agency/front/delivery-days/style.scss
View File

@ -6,7 +6,7 @@ vn-zone-delivery-days {
flex-wrap: wrap; flex-wrap: wrap;
& > vn-calendar { & > vn-calendar {
min-width: 15em; min-width: 16.5em;
} }
} }
} }

2
modules/agency/front/events/index.html
View File

@ -20,7 +20,7 @@
{{::row.from | dateTime:'dd/MM/yyyy'}} - {{::row.to | dateTime:'dd/MM/yyyy'}} {{::row.from | dateTime:'dd/MM/yyyy'}} - {{::row.to | dateTime:'dd/MM/yyyy'}}
</span> </span>
<span ng-if="!row.to" translate> <span ng-if="!row.to" translate>
Always Indefinitely
</span> </span>
<span ng-if="row.weekDays"> <span ng-if="row.weekDays">
({{::$ctrl.formatWdays(row.weekDays)}}) ({{::$ctrl.formatWdays(row.weekDays)}})

10
modules/agency/front/events/index.js
View File

@ -43,14 +43,14 @@ class Controller {
this.options = [ this.options = [
{ {
label: 'Specific day', label: 'One day',
value: 'day' value: 'day'
}, { }, {
label: 'Range of dates', label: 'Range of dates',
value: 'range' value: 'range'
}, { }, {
label: 'Always', label: 'Indefinitely',
value: 'always' value: 'indefinitely'
} }
]; ];
@ -86,7 +86,7 @@ class Controller {
if (row.from && !row.to) if (row.from && !row.to)
this.eventType = 'day'; this.eventType = 'day';
else if (!row.from) else if (!row.from)
this.eventType = 'always'; this.eventType = 'indefinitely';
else else
this.eventType = 'range'; this.eventType = 'range';
@ -114,7 +114,7 @@ class Controller {
let selected = this.selected; let selected = this.selected;
if (this.eventType == 'always') { if (this.eventType == 'indefinitely') {
selected.from = null; selected.from = null;
selected.to = null; selected.to = null;
} }

1
modules/agency/front/events/style.scss
View File

@ -17,6 +17,7 @@ vn-zone-events {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
outline: none; outline: none;
background-color: rgba(0, 0, 0, .05);
&.marked { &.marked {
background: $color-main; background: $color-main;

5
modules/agency/front/locale/es.yml
View File

@ -17,11 +17,12 @@ Search zone by id or name: Buscar zonas por identificador o nombre
From: Desde From: Desde
To: Hasta To: Hasta
Closing: Cierre Closing: Cierre
Specific day: Día específico One day: Un día
Range of dates: Rango de fechas Range of dates: Rango de fechas
Always: Siempre Indefinitely: Indefinido
Everyday: Todos los días Everyday: Todos los días
Delivery days: Días de entrega Delivery days: Días de entrega
Province: Provincia Province: Provincia
Postcode: Código postal Postcode: Código postal
Inflation: Inflación Inflation: Inflación
Query: Consultar