diff --git a/front/salix/components/app/style.scss b/front/salix/components/app/style.scss index 0ae9895bf..e66b46634 100644 --- a/front/salix/components/app/style.scss +++ b/front/salix/components/app/style.scss @@ -12,7 +12,7 @@ vn-app { top: 0; left: 0; width: 100%; - z-index: 1; + z-index: 5; box-shadow: 0 .1em .2em rgba(1, 1, 1, .2); .logo { @@ -27,5 +27,29 @@ vn-app { } .main-view { 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; + } + } } } diff --git a/front/salix/styles/descriptor.scss b/front/salix/styles/descriptor.scss new file mode 100644 index 000000000..18f08adf6 --- /dev/null +++ b/front/salix/styles/descriptor.scss @@ -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 + } + } + } + } + } +} \ No newline at end of file diff --git a/front/salix/styles/index.js b/front/salix/styles/index.js index d80763912..9e0d1ee49 100644 --- a/front/salix/styles/index.js +++ b/front/salix/styles/index.js @@ -7,7 +7,8 @@ import './background.scss'; import './border.scss'; import './font-style.scss'; import './misc.scss'; -import './summary.scss'; import './colors.scss'; import './effects.scss'; import './order-product.scss'; +import './summary.scss'; +import './descriptor.scss'; diff --git a/front/salix/styles/misc.scss b/front/salix/styles/misc.scss index 6ea9f7ae0..851936e6e 100644 --- a/front/salix/styles/misc.scss +++ b/front/salix/styles/misc.scss @@ -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 { max-width: 36em; margin: 0 auto; diff --git a/front/salix/styles/summary.scss b/front/salix/styles/summary.scss index efd683994..70fda5461 100644 --- a/front/salix/styles/summary.scss +++ b/front/salix/styles/summary.scss @@ -48,10 +48,6 @@ } vn-label-value > section { margin-bottom: .3em; - - & > vn-label::after { - content: initial; - } } } } diff --git a/modules/item/front/ticket-descriptor/addStowaway.js b/modules/item/front/ticket-descriptor/addStowaway.js index 4c05bb65c..259d93050 100644 --- a/modules/item/front/ticket-descriptor/addStowaway.js +++ b/modules/item/front/ticket-descriptor/addStowaway.js @@ -10,7 +10,6 @@ class Controller { getPossibleStowaways() { this.$http.get(`/api/Tickets/${this.ticket.id}/getPossibleStowaways`) .then(res => { - console.log(res); this.possibleStowaways = res.data; }); } diff --git a/modules/item/front/ticket-descriptor/index.js b/modules/item/front/ticket-descriptor/index.js index bada14293..a98e3b934 100644 --- a/modules/item/front/ticket-descriptor/index.js +++ b/modules/item/front/ticket-descriptor/index.js @@ -28,7 +28,6 @@ class Controller { } changeShipped(response) { - console.log(response); if (response === 'ACCEPT') { let params = {shipped: this.newShipped}; this.$http.patch(`/ticket/api/Tickets/${this.ticket.id}/`, params).then(() => { diff --git a/modules/item/front/ticket-descriptor/removeStowaway.js b/modules/item/front/ticket-descriptor/removeStowaway.js index 0ab62b69e..f152d3bdf 100644 --- a/modules/item/front/ticket-descriptor/removeStowaway.js +++ b/modules/item/front/ticket-descriptor/removeStowaway.js @@ -35,7 +35,6 @@ class Controller { let json = encodeURIComponent(JSON.stringify(filter)); this.$http.get(`/api/Stowaways?filter=${json}`).then(res => { - console.log(res.data); this.ticketStowaways = res.data; this.$scope.dialog.show(); });