Gitlab CSE Unil

Skip to content

GitLab

Commit 5b1a198c authored by Julien Furrer's avatar Julien Furrer
Browse files

Small visual fix in AnObjMgr

parent d7e3e326
Hide whitespace changes
Inline Side-by-side
adim_app/static/_src/less/adim.css
View file @ 5b1a198c
......@@ -1454,47 +1454,35 @@ canvas.cursor-tool-arrow2 {
}
#aom-modal .modal-body .tab-content {
min-height: 200px;
border-right: solid 1px #e0e0e0;
}
@media (min-height: 370px) {
#aom-modal .aom-list-container {
max-height: 220px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 590px) {
#aom-modal .aom-list-container {
max-height: 440px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 810px) {
#aom-modal .aom-list-container {
max-height: 660px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 1030px) {
#aom-modal .aom-list-container {
max-height: 880px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-width: 500px) {
#aom-modal .modal-dialog {
width: 420px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 218px;
......@@ -1506,7 +1494,6 @@ canvas.cursor-tool-arrow2 {
@media (min-width: 700px) {
#aom-modal .modal-dialog {
width: 620px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 418px;
......@@ -1518,7 +1505,6 @@ canvas.cursor-tool-arrow2 {
@media (min-width: 900px) {
#aom-modal .modal-dialog {
width: 820px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 618px;
......@@ -1530,7 +1516,6 @@ canvas.cursor-tool-arrow2 {
@media (min-width: 1100px) {
#aom-modal .modal-dialog {
width: 1020px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 818px;
......@@ -1542,7 +1527,6 @@ canvas.cursor-tool-arrow2 {
@media (min-width: 1300px) {
#aom-modal .modal-dialog {
width: 1220px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 1018px;
......@@ -1553,11 +1537,12 @@ canvas.cursor-tool-arrow2 {
}
.aom-info-panel {
float: right;
width: 400px;
width: 401px;
border: 0;
box-shadow: none;
border-radius: 0;
margin-bottom: 0;
border-left: solid 1px #e0e0e0;
}
.aom-info-panel .panel-heading {
border: 0;
......@@ -1583,36 +1568,24 @@ canvas.cursor-tool-arrow2 {
.aom-info-panel .panel-body {
max-height: 196px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 590px) {
.aom-info-panel .panel-body {
max-height: 416px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 810px) {
.aom-info-panel .panel-body {
max-height: 636px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 1030px) {
.aom-info-panel .panel-body {
max-height: 856px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
.aom-info-panel .panel-body .aom-image-thumb {
......@@ -1741,7 +1714,7 @@ canvas.cursor-tool-arrow2 {
display: none;
}
.aom-list-container {
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
}
.aom-list-container .popover .popover-title {
......
adim_app/static/_src/less/anobj-mgr.css
View file @ 5b1a198c
......@@ -6,47 +6,35 @@
}
#aom-modal .modal-body .tab-content {
min-height: 200px;
border-right: solid 1px #e0e0e0;
}
@media (min-height: 370px) {
#aom-modal .aom-list-container {
max-height: 220px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 590px) {
#aom-modal .aom-list-container {
max-height: 440px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 810px) {
#aom-modal .aom-list-container {
max-height: 660px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 1030px) {
#aom-modal .aom-list-container {
max-height: 880px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-width: 500px) {
#aom-modal .modal-dialog {
width: 420px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 218px;
......@@ -58,7 +46,6 @@
@media (min-width: 700px) {
#aom-modal .modal-dialog {
width: 620px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 418px;
......@@ -70,7 +57,6 @@
@media (min-width: 900px) {
#aom-modal .modal-dialog {
width: 820px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 618px;
......@@ -82,7 +68,6 @@
@media (min-width: 1100px) {
#aom-modal .modal-dialog {
width: 1020px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 818px;
......@@ -94,7 +79,6 @@
@media (min-width: 1300px) {
#aom-modal .modal-dialog {
width: 1220px;
transition: width 0.3s ease 0s;
}
#aom-modal .modal-dialog .narrow-1 {
width: 1018px;
......@@ -105,11 +89,12 @@
}
.aom-info-panel {
float: right;
width: 400px;
width: 401px;
border: 0;
box-shadow: none;
border-radius: 0;
margin-bottom: 0;
border-left: solid 1px #e0e0e0;
}
.aom-info-panel .panel-heading {
border: 0;
......@@ -135,36 +120,24 @@
.aom-info-panel .panel-body {
max-height: 196px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 590px) {
.aom-info-panel .panel-body {
max-height: 416px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 810px) {
.aom-info-panel .panel-body {
max-height: 636px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
@media (min-height: 1030px) {
.aom-info-panel .panel-body {
max-height: 856px;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
}
}
.aom-info-panel .panel-body .aom-image-thumb {
......@@ -293,7 +266,7 @@
display: none;
}
.aom-list-container {
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
}
.aom-list-container .popover .popover-title {
......
adim_app/static/_src/less/anobj-mgr.less
View file @ 5b1a198c
......@@ -23,7 +23,7 @@
@dlg-w: (@aom-list-item-col-width * @i) + 20;
@media (min-width: (@dlg-w + 80)) {
width: @dlg-w;
transition: width 0.3s ease 0s;
// transition: width 0.3s ease 0s;
.narrow-col(1, @w:@aom-list-item-col-width, @i: @i);
.narrow-col(2, @w:@aom-list-item-col-width, @i: @i);
}
......@@ -48,9 +48,9 @@
@media (min-height: (@lst-h + 150)) {
max-height: @lst-h - @dH;
height: auto;
transition-property: max-height, min-height;
transition-duration: 0.4s;
transition-timing-function: linear;
// transition-property: max-height, min-height;
// transition-duration: 0.4s;
// transition-timing-function: linear;
}
.gen-lst-height(@n, (@i + 1), @dH);
}
......@@ -62,8 +62,8 @@
.nav-tabs { margin-left: 10px; }
.tab-content {
min-height: @aom-list-item-height;
border-right: solid 1px #e0e0e0;
}
}
.aom-list-container {
.gen-lst-height(4, 1);
......@@ -76,11 +76,13 @@
.aom-info-panel {
float: right;
width: @aom-list-item-col-width * 2;
width: (@aom-list-item-col-width * 2) + 1;
border: 0;
box-shadow: none;
border-radius: 0;
margin-bottom: 0;
border-left: solid 1px #e0e0e0;
.panel-heading {
border: 0;
border-bottom: solid 1px @modal-header;
......@@ -235,7 +237,7 @@
.aom-list-container {
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
.popover {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment