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

Style fixes

This commit is contained in:
Juan Ferrer 2019-01-21 16:08:25 +01:00
parent d856a3ae97
commit 0f55512918
8 changed files with 101 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
front/salix/components/app/style.scss
View File

@ -12,7 +12,7 @@ vn-app {
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
z-index: 1; z-index: 5;
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2); box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
.logo { .logo {
@ -27,5 +27,29 @@ vn-app {
} }
.main-view { .main-view {
padding-top: 4em; padding-top: 4em;
vn-main-block {
display: block;
margin: 0 auto;
padding-left: 16em;
.left-block {
position: fixed;
z-index: 5;
top: 4em;
left: 0;
bottom: 0;
width: 16em;
min-width: 16em;
background-color: white;
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
overflow: auto;
}
.right-block {
width: 16em;
min-width: 16em;
padding-left: 1em;
}
}
} }
} }

74
front/salix/styles/descriptor.scss Normal file
View File

@ -0,0 +1,74 @@
@import "./effects";
@import "./colors";
@import "./padding";
.vn-descriptor {
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
& > .header {
display: flex;
background: $main-01;
color: white;
justify-content: space-between;
align-items: stretch;
color: white;
& > * {
min-width: 1.8em;
@extend %clickable;
display: flex;
align-items: center;
justify-content: center;
padding: .5em;
& > vn-icon {
font-size: 1.8em;
}
}
}
& > .body {
@extend .pad-small;
& > * {
@extend .pad-small;
}
& > .icons {
display: flex;
align-items: center;
justify-content: center;
padding: 0;
& > vn-icon {
@extend .pad-small;
color: #666;
opacity: .4;
font-size: 1.5em;
&.bright {
color: $main-01;
opacity: 1;
}
}
}
& > .quicklinks {
display: flex;
align-items: center;
justify-content: center;
padding: 0;
& > a {
@extend .pad-small;
& > vn-icon {
font-size: 1.8em;
padding: 0;
& > i {
line-height: 36px
}
}
}
}
}
}

3
front/salix/styles/index.js
View File

@ -7,7 +7,8 @@ import './background.scss';
import './border.scss'; import './border.scss';
import './font-style.scss'; import './font-style.scss';
import './misc.scss'; import './misc.scss';
import './summary.scss';
import './colors.scss'; import './colors.scss';
import './effects.scss'; import './effects.scss';
import './order-product.scss'; import './order-product.scss';
import './summary.scss';
import './descriptor.scss';

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

@ -161,102 +161,6 @@ vn-tool-bar {
} }
} }
vn-main-block {
display: block;
margin: 0 auto;
.left-block {
position: fixed;
z-index: 1;
top: 4em;
left: 0;
bottom: 0;
width: 16em;
min-width: 16em;
background-color: white;
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
overflow: auto;
}
& > vn-horizontal > vn-one > [ui-view] {
padding-left: 16em;
}
.right-block {
width: 16em;
min-width: 16em;
padding-left: 1em;
}
}
.vn-descriptor {
box-shadow: 0 .1em .2em rgba(1, 1, 1, .2);
& > .header {
display: flex;
background: $main-01;
color: white;
justify-content: space-between;
align-items: stretch;
color: white;
& > * {
min-width: 1.8em;
@extend %clickable;
display: flex;
align-items: center;
justify-content: center;
padding: .5em;
& > vn-icon {
font-size: 1.8em;
}
}
}
& > .body {
@extend .pad-small;
& > * {
@extend .pad-small;
}
& > .icons {
display: flex;
align-items: center;
justify-content: center;
padding: 0;
& > vn-icon {
@extend .pad-small;
color: #666;
opacity: .4;
font-size: 1.5em;
&.bright {
color: $main-01;
opacity: 1;
}
}
}
& > .quicklinks {
display: flex;
align-items: center;
justify-content: center;
padding: 0;
& > a {
@extend .pad-small;
& > vn-icon {
font-size: 1.8em;
padding: 0;
& > i {
line-height: 36px
}
}
}
}
}
}
.vn-list { .vn-list {
max-width: 36em; max-width: 36em;
margin: 0 auto; margin: 0 auto;

4
front/salix/styles/summary.scss
View File

@ -48,10 +48,6 @@
} }
vn-label-value > section { vn-label-value > section {
margin-bottom: .3em; margin-bottom: .3em;
& > vn-label::after {
content: initial;
}
} }
} }
} }

1
modules/item/front/ticket-descriptor/addStowaway.js
View File

@ -10,7 +10,6 @@ class Controller {
getPossibleStowaways() { getPossibleStowaways() {
this.$http.get(`/api/Tickets/${this.ticket.id}/getPossibleStowaways`) this.$http.get(`/api/Tickets/${this.ticket.id}/getPossibleStowaways`)
.then(res => { .then(res => {
console.log(res);
this.possibleStowaways = res.data; this.possibleStowaways = res.data;
}); });
} }

1
modules/item/front/ticket-descriptor/index.js
View File

@ -28,7 +28,6 @@ class Controller {
} }
changeShipped(response) { changeShipped(response) {
console.log(response);
if (response === 'ACCEPT') { if (response === 'ACCEPT') {
let params = {shipped: this.newShipped}; let params = {shipped: this.newShipped};
this.$http.patch(`/ticket/api/Tickets/${this.ticket.id}/`, params).then(() => { this.$http.patch(`/ticket/api/Tickets/${this.ticket.id}/`, params).then(() => {

1
modules/item/front/ticket-descriptor/removeStowaway.js
View File

@ -35,7 +35,6 @@ class Controller {
let json = encodeURIComponent(JSON.stringify(filter)); let json = encodeURIComponent(JSON.stringify(filter));
this.$http.get(`/api/Stowaways?filter=${json}`).then(res => { this.$http.get(`/api/Stowaways?filter=${json}`).then(res => {
console.log(res.data);
this.ticketStowaways = res.data; this.ticketStowaways = res.data;
this.$scope.dialog.show(); this.$scope.dialog.show();
}); });