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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-11-18 16:10:11 +01:00
parent 2d20fae14a 9c5939b661
commit c101bbb6be
14 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
front/core/components/calendar/style.scss
View File

@ -86,12 +86,12 @@
align-items: center;
&.today {
color: $color-font-bg;
color: $color-font;
& > .day-number {
border: 2px solid $color-font-link;
&:hover {
background-color: lighten($color-font-link, 20%);
background-color: $color-marginal;
opacity: .8
}
}

2
front/core/components/chip/style.scss
View File

@ -50,7 +50,7 @@ vn-chip {
&.alert,
&.alert.clickable:hover,
&.alert.clickable:focus {
background-color: $color-alert-medium;
background-color: lighten($color-alert, 5%);
}
&.message,
&.message.clickable:hover,

4
front/core/components/field/style.scss
View File

@ -226,7 +226,7 @@
& > .container {
& > .infix > .control > * {
color: $color-font;
color: $color-marginal;
&::placeholder {
color: $color-font-bg;
@ -235,7 +235,7 @@
& > .prepend,
& > .append,
& > .icons {
color: $color-font-bg-marginal;
color: $color-marginal;
}
}
}

8
front/core/components/smart-table/table.scss
View File

@ -6,14 +6,14 @@ smart-table table {
border-collapse: collapse;
& > thead {
border-bottom: 2px solid $color-spacer;
border-bottom: $border;
& > * > th {
font-weight: normal;
}
}
& > tfoot {
border-top: 2px solid $color-spacer;
border-top: $border;
}
thead, tbody, tfoot {
& > * {
@ -67,7 +67,7 @@ smart-table table {
}
}
tbody > * {
border-bottom: 1px solid $color-spacer-light;
border-bottom: $border-thin;
&:last-child {
border-bottom: none;
@ -90,7 +90,7 @@ smart-table table {
color: $color-font-bg;
}
&.alert {
background-color: $color-alert-medium;
background-color: lighten($color-alert, 5%);
color: $color-font-bg;
}
&.message {

10
front/core/components/table/style.scss
View File

@ -14,7 +14,7 @@ vn-table {
& > vn-thead,
& > thead {
display: table-header-group;
border-bottom: 2px solid $color-spacer;
border-bottom: $border;
& > * > th {
font-weight: normal;
@ -32,7 +32,7 @@ vn-table {
& > vn-tfoot,
& > .vn-tfoot,
& > tfoot {
border-top: 2px solid $color-spacer;
border-top: $border;
display: table-footer-group
}
& > * > vn-tr,
@ -119,7 +119,7 @@ vn-table {
vn-tbody > *,
.vn-tbody > *,
tbody > * {
border-bottom: 1px solid $color-spacer-light;
border-bottom: $border-thin;
&:last-child {
border-bottom: none;
@ -146,7 +146,7 @@ vn-table {
color: $color-font-bg;
}
&.alert {
background-color: $color-alert-medium;
background-color: lighten($color-alert, 5%);
color: $color-font-bg;
}
&.message {
@ -197,7 +197,7 @@ vn-table.scrollable > .vn-table,
vn-thead vn-th,
thead vn-th,
thead th {
border-bottom: 2px solid $color-spacer;
border-bottom: $border;
background-color: $color-bg-panel;
position: sticky;
z-index: 9;

BIN
front/core/directives/no-image-dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

2
front/core/directives/on-error-src.js
View File

@ -1,5 +1,5 @@
import ngModule from '../module';
import noImage from './no-image.png';
import noImage from './no-image-dark.png';
/**
* Sets a default image when there is an error loading

10
front/core/styles/variables.scss
View File

@ -76,7 +76,7 @@ $color-alert-light: lighten($color-alert, 35%); */
/**/
// Dark theme
$color-primary: #f7931e;
$color-primary: #ec8916;
$color-secondary: $color-primary;
$color-font: #eee;
@ -85,7 +85,7 @@ $color-font-secondary: #777;
$color-font-dark: white;
$color-font-link: #66bfff;
$color-font-bg: rgba(0, 0, 0, .8);
$color-font-bg-marginal: rgba(0, 0, 0, .4);
$color-font-bg-marginal: rgba(255, 255, 255, .4);
$color-font-bg-dark: rgba(255, 255, 255, .7);
$color-font-bg-dark-marginal: rgba(255, 255, 255, .4);
@ -97,7 +97,7 @@ $color-active: #666;
$color-active-font: white;
$color-bg-panel: #3c3b3b;
$color-main: $color-primary;
$color-marginal: #111;
$color-marginal: #222;
$color-success: #a3d131;
$color-notice: #32b1ce;
$color-alert: #fa3939;
@ -108,6 +108,7 @@ $color-spacer-light: rgba(255, 255, 255, .12);
$color-input-underline: rgba(255, 255, 255, .12);
$color-input-underline-hover: rgba(255, 255, 255, .6);
$color-shadow: rgba(0, 0, 0, .2);
$color-border: rgba(0, 0, 0, .3);
$color-hightlight: rgba(255, 255, 255, .15);
$color-hover-cd: rgba(255, 255, 255, .1);
$color-hover-dc: .7;
@ -129,6 +130,7 @@ $color-alert-light: lighten($color-alert, 35%);
// Border
$border-thin: 1px solid $color-spacer;
$border-thin: 1px solid $color-border;
$border-thin-light: 1px solid $color-spacer-light;
$border: 2px solid $color-border;
$shadow: 0 2px 2px 0 rgba(0, 0, 0, .3);

6
front/salix/components/summary/style.scss
View File

@ -65,10 +65,10 @@ ui-view > .vn-summary {
text-transform: uppercase;
font-size: 1.25rem;
line-height: 1;
padding: 7px;
padding-bottom: 4px; /* Bottom line-height fix */
padding: 7px 0;
padding-bottom: 5px; /* Bottom line-height fix */
font-weight: lighter;
border-bottom: 1px solid $color-main;
border-bottom: 2px solid $color-main;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

2
front/salix/styles/misc.scss
View File

@ -60,7 +60,7 @@ vn-bg-title {
font-size: 1.25rem;
}
.totalBox {
border: 1px solid #CCC;
border: $border-thin;
text-align: right;
justify-content: center;
align-items: center;

6
modules/entry/front/summary/style.scss
View File

@ -9,13 +9,13 @@ vn-entry-summary .summary {
}
tbody tr:nth-child(1) {
border-top: 1px solid $color-spacer;
border-top: $border-thin;
}
tbody tr:nth-child(1),
tbody tr:nth-child(2) {
border-left: 1px solid $color-spacer;
border-right: 1px solid $color-spacer
border-left: $border-thin;
border-right: $border-thin
}
tbody tr:nth-child(3) {

2
modules/monitor/front/index/orders/style.scss
View File

@ -11,7 +11,7 @@ vn-monitor-sales-orders {
color: gray;
& > vn-td {
border-bottom: 2px solid $color-spacer;
border-bottom: $border;
font-size: 13px;
}
}

2
modules/monitor/front/index/style.scss
View File

@ -6,7 +6,7 @@ vn-monitor-index {
padding: 12px 0 5px 0;
color: gray;
font-size: 1.2rem;
border-bottom: 2px solid $color-font-secondary;
border-bottom: $border;
margin-bottom: 10px;
& > vn-none > vn-icon {

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

@ -11,7 +11,7 @@ vn-worker-calendar {
padding: $spacing-md;
& > vn-calendar {
border: 1px solid #ddd;
border: $border-thin;
margin: $spacing-md;
padding: $spacing-xs;
max-width: 288px;
@ -38,13 +38,12 @@ vn-worker-calendar {
}
vn-side-menu div > .input {
border-color: rgba(0, 0, 0, 0.3);
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
border-bottom: $border-thin;
}
.festive,
vn-avatar.today {
background-color: $color-font-dark;
color: $color-font;
width: 24px;
min-width: 24px;
height: 24px