Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit eb900787 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'feature-c/4627-display-notification-in-custom-console' into 'dev'

Console and notifications

See merge request !883
parents 35891b94 5d183c4f
Pipeline #227627 failed with stages
in 39 minutes and 25 seconds
......@@ -804,16 +804,19 @@ span .end-codon {
#axis_choice,
#add_clone_menu {
z-index: 2;
border: solid;
position: fixed;
top: 200px;
min-width: 400px;
margin-left: -250px;
left: 50%;
font-size: 13px;
padding: 10px;
padding: 20px;
background: #000000;
display: none;
border: solid;
border-width: 1px;
border-color: #839496;
box-shadow: 2px 2px 5px #839496;
}
#add_clone_menu {
margin-left: -325px;
......@@ -863,11 +866,10 @@ span .end-codon {
/* ////////////////////////////////////////////////////////////// */
.popup_container {
z-index: 20;
border: solid;
min-width: 500px;
max-width: 80%;
font-size: 13px;
padding: 10px;
padding: 20px;
background: #000000;
display: none;
position: fixed;
......@@ -877,6 +879,10 @@ span .end-codon {
-moz-transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
border: solid;
border-width: 1px;
border-color: #839496;
box-shadow: 2px 2px 5px #839496;
}
/* Main style for <a> Used in particular in .popup_container, on login screen, in news, in links to results (for patient list and patient info) */
a {
......@@ -938,17 +944,11 @@ a.tag-link {
position: absolute;
top: 0px;
right: 0px;
border: solid;
background: inherit;
border-radius: 20px;
width: 15px;
height: 15px;
text-align: center;
font-weight: bolder;
cursor: pointer;
padding: 1px;
font-size: 90%;
color: #333333;
margin: 1px;
font-size: large;
}
.closeButton:hover {
color: #fdf6e3;
......@@ -1156,11 +1156,7 @@ span.logo {
.list_clones,
.bot-bar,
#bot-container,
.popup_container,
#file_menu,
.tagSelector,
.closeButton,
#axis_choice {
.tagSelector {
border-color: #333333;
}
#info_window td {
......@@ -1624,7 +1620,7 @@ h3 .uid {
z-index: 100;
}
.log_container {
height: 500px;
height: 75%;
width: 400px;
position: absolute;
display: block;
......@@ -1632,11 +1628,12 @@ h3 .uid {
right: 0px;
padding: 5px;
margin: 5px;
background: #073642;
background: #333333;
border-color: #333333;
z-index: 15;
border: solid;
border-width: 1px;
box-shadow: 2px 2px 5px #839496;
opacity: 0.85;
overflow-y: scroll;
display: none;
......@@ -1648,14 +1645,14 @@ h3 .uid {
width: 350px;
min-height: 20px;
border: solid;
border-width: 2px;
border-width: 1px;
display: block;
border-radius: 5px;
padding: 5px;
margin: 5px;
background: #000000;
border-color: #333333;
transition: background 1s linear;
box-shadow: 1px 1px 2px;
}
.log_0,
.log_1,
......@@ -1667,9 +1664,8 @@ h3 .uid {
margin: 5px;
background: #000000;
border: solid;
border-width: 2px;
border-radius: 2px;
border-color: #000000;
border-width: 1px;
padding: 5px;
}
.flash_1,
.log_1 {
......
......@@ -804,16 +804,19 @@ span .end-codon {
#axis_choice,
#add_clone_menu {
z-index: 2;
border: solid;
position: fixed;
top: 200px;
min-width: 400px;
margin-left: -250px;
left: 50%;
font-size: 13px;
padding: 10px;
padding: 20px;
background: #ffffff;
display: none;
border: solid;
border-width: 1px;
border-color: #657b83;
box-shadow: 2px 2px 5px #657b83;
}
#add_clone_menu {
margin-left: -325px;
......@@ -863,11 +866,10 @@ span .end-codon {
/* ////////////////////////////////////////////////////////////// */
.popup_container {
z-index: 20;
border: solid;
min-width: 500px;
max-width: 80%;
font-size: 13px;
padding: 10px;
padding: 20px;
background: #ffffff;
display: none;
position: fixed;
......@@ -877,6 +879,10 @@ span .end-codon {
-moz-transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
border: solid;
border-width: 1px;
border-color: #657b83;
box-shadow: 2px 2px 5px #657b83;
}
/* Main style for <a> Used in particular in .popup_container, on login screen, in news, in links to results (for patient list and patient info) */
a {
......@@ -938,17 +944,11 @@ a.tag-link {
position: absolute;
top: 0px;
right: 0px;
border: solid;
background: inherit;
border-radius: 20px;
width: 15px;
height: 15px;
text-align: center;
font-weight: bolder;
cursor: pointer;
padding: 1px;
font-size: 90%;
color: #cccccc;
margin: 1px;
font-size: large;
}
.closeButton:hover {
color: #002b36;
......@@ -1156,11 +1156,7 @@ span.logo {
.list_clones,
.bot-bar,
#bot-container,
.popup_container,
#file_menu,
.tagSelector,
.closeButton,
#axis_choice {
.tagSelector {
border-color: #cccccc;
}
#info_window td {
......@@ -1624,7 +1620,7 @@ h3 .uid {
z-index: 100;
}
.log_container {
height: 500px;
height: 75%;
width: 400px;
position: absolute;
display: block;
......@@ -1632,11 +1628,12 @@ h3 .uid {
right: 0px;
padding: 5px;
margin: 5px;
background: #fdf6e3;
background: #cccccc;
border-color: #cccccc;
z-index: 15;
border: solid;
border-width: 1px;
box-shadow: 2px 2px 5px #657b83;
opacity: 0.85;
overflow-y: scroll;
display: none;
......@@ -1648,14 +1645,14 @@ h3 .uid {
width: 350px;
min-height: 20px;
border: solid;
border-width: 2px;
border-width: 1px;
display: block;
border-radius: 5px;
padding: 5px;
margin: 5px;
background: #ffffff;
border-color: #cccccc;
transition: background 1s linear;
box-shadow: 1px 1px 2px;
}
.log_0,
.log_1,
......@@ -1667,9 +1664,8 @@ h3 .uid {
margin: 5px;
background: #ffffff;
border: solid;
border-width: 2px;
border-radius: 2px;
border-color: #ffffff;
border-width: 1px;
padding: 5px;
}
.flash_1,
.log_1 {
......
......@@ -126,7 +126,7 @@ ul {
overflow: hidden;
}
.vidjil-panels-left {
width: calc(100% - -64px);
width: calc(100% - 6px - 70px);
}
.vidjil-panels-full {
width: calc(100% - 6px);
......@@ -243,12 +243,12 @@ line {
}
.axis_m {
stroke: #657b83;
opacity: 0.5 ;
opacity: 0.5;
stroke-width: 20px;
}
.axis_m_other {
stroke: #657b83;
opacity: 0.25 ;
opacity: 0.25;
stroke-width: 10px;
display: none;
}
......@@ -336,7 +336,7 @@ line {
.circle {
cursor: pointer;
-webkit-transition: fill 0.2s;
-o-transition: fill 0.2s;
-o-transition: fill 0.2s;
-ms-transition: fill 0.2s;
transition: fill 0.2s;
fill: #657b83;
......@@ -474,7 +474,7 @@ line {
font-size: 13px;
cursor: pointer;
-webkit-transition: color 0.2s;
-o-transition: color 0.2s;
-o-transition: color 0.2s;
-ms-transition: color 0.2s;
transition: color 0.2s;
padding: 1px 4px 4px 1px;
......@@ -679,13 +679,13 @@ line {
bottom: 1px;
}
.highlight_seq {
top: .9em;
top: 0.9em;
padding-bottom: 1px;
opacity: 0.6;
font-size: 70%;
letter-spacing: .428em;
letter-spacing: 0.428em;
/* (1-.7) / .7 */
left: .214em;
left: 0.214em;
}
.highlight {
display: inline-block;
......@@ -804,16 +804,19 @@ span .end-codon {
#axis_choice,
#add_clone_menu {
z-index: 2;
border: solid;
position: fixed;
top: 200px;
min-width: 400px;
margin-left: -250px;
left: 50%;
font-size: 13px;
padding: 10px;
padding: 20px;
background: #ffffff;
display: none;
border: solid;
border-width: 1px;
border-color: #657b83;
box-shadow: 2px 2px 5px #657b83;
}
#add_clone_menu {
margin-left: -325px;
......@@ -835,7 +838,7 @@ span .end-codon {
transition-delay: 0s, 0s;
}
#add_clone_menu > #addclone_input.error {
border: 1px solid #8b0000;
border: 1px solid darkred;
}
#menu_right_part {
float: right;
......@@ -863,11 +866,10 @@ span .end-codon {
/* ////////////////////////////////////////////////////////////// */
.popup_container {
z-index: 20;
border: solid;
min-width: 500px;
max-width: 80%;
font-size: 13px;
padding: 10px;
padding: 20px;
background: #ffffff;
display: none;
position: fixed;
......@@ -877,6 +879,10 @@ span .end-codon {
-moz-transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
border: solid;
border-width: 1px;
border-color: #657b83;
box-shadow: 2px 2px 5px #657b83;
}
/* Main style for <a> Used in particular in .popup_container, on login screen, in news, in links to results (for patient list and patient info) */
a {
......@@ -908,7 +914,7 @@ a.tag-link {
.modal.info-container {
top: 50px;
left: 495px;
max-width: calc(100% - 535px);
max-width: calc(100% - (475px + 60px));
height: calc(100% - 215px);
}
.modal.jstree-container {
......@@ -938,17 +944,11 @@ a.tag-link {
position: absolute;
top: 0px;
right: 0px;
border: solid;
background: inherit;
border-radius: 20px;
width: 15px;
height: 15px;
text-align: center;
font-weight: bolder;
cursor: pointer;
padding: 1px;
font-size: 90%;
color: #cccccc;
margin: 1px;
font-size: large;
}
.closeButton:hover {
color: #002b36;
......@@ -1010,7 +1010,7 @@ span.logo {
font-size: 60% ;
font-weight: bold;
vertical-align: super;
opacity: .8;
opacity: 0.8;
color: #f88;
}
.bot-bar {
......@@ -1047,7 +1047,7 @@ span.logo {
position: relative;
text-align: center;
float: left;
width: calc(100% - 1175px);
width: calc(100% - (475px + 350px + 300px + 50));
overflow: hidden;
height: 1.1em;
}
......@@ -1074,7 +1074,7 @@ span.logo {
min-width: 150px;
margin-left: -6px;
border-top: none;
margin-top: calc(8px);
margin-top: calc(32px - 24px);
z-index: 5;
overflow: hidden;
}
......@@ -1156,11 +1156,7 @@ span.logo {
.list_clones,
.bot-bar,
#bot-container,
.popup_container,
#file_menu,
.tagSelector,
.closeButton,
#axis_choice {
.tagSelector {
border-color: #cccccc;
}
#info_window td {
......@@ -1234,7 +1230,7 @@ text.alert {
fill: red;
}
span.warningReads {
margin-left: .5em;
margin-left: 0.5em;
display: inline-block;
width: 1em;
text-align: center;
......@@ -1535,7 +1531,7 @@ h3 .uid {
#db_table_container {
overflow-y: scroll;
overflow-x: hidden;
height: calc(70%);
height: calc(100% - 30px);
position: relative;
}
#db_fixed_header {
......@@ -1624,7 +1620,7 @@ h3 .uid {
z-index: 100;
}
.log_container {
height: 500px;
height: 75%;
width: 400px;
position: absolute;
display: block;
......@@ -1632,11 +1628,12 @@ h3 .uid {
right: 0px;
padding: 5px;
margin: 5px;
background: #fdf6e3;
background: #cccccc;
border-color: #cccccc;
z-index: 15;
border: solid;
border-width: 1px;
box-shadow: 2px 2px 5px #657b83;
opacity: 0.85;
overflow-y: scroll;
display: none;
......@@ -1648,14 +1645,14 @@ h3 .uid {
width: 350px;
min-height: 20px;
border: solid;
border-width: 2px;
border-width: 1px;
display: block;
border-radius: 5px;
padding: 5px;
margin: 5px;
background: #ffffff;
border-color: #cccccc;
transition: background 1s linear;
box-shadow: 1px 1px 2px;
}
.log_0,
.log_1,
......@@ -1667,25 +1664,24 @@ h3 .uid {
margin: 5px;
background: #ffffff;
border: solid;
border-width: 2px;
border-radius: 2px;
border-color: #ffffff;
border-width: 1px;
padding: 5px;
}
.flash_1,
.log_1 {
font-weight: bold;
background-color: #dff0d8;
background-color: #DFF0D8;
}
.flash_2,
.log_2 {
font-weight: bold;
background-color: #f2deae;
background-color: #F2DEAE;
}
.flash_3,
.log_3 {
font-weight: bold;
border-color: darkred;
background-color: #f2dede;
background-color: #F2DEDE;
}
.tip_1 {
width: 400px;
......@@ -1695,7 +1691,7 @@ h3 .uid {
border-radius: 5px;
padding: 5px;
margin: 5px;
background: #dff0d8;
background: #DFF0D8;
border-color: #cccccc;
}
#tip_img {
......@@ -1821,7 +1817,7 @@ table.log textarea {
flex-grow: 1;
}
.tagColor0 {
background: #dc322f;
background: #DC322F;
}
.tagColor1 {
background: #cb4b16;
......@@ -1862,15 +1858,15 @@ table.log textarea {
text-align: center;
}
.urgent_message {
border: 2px solid #8b0000;
border: 2px solid darkred;
margin: 3px;
font-weight: bold;
background-color: #f2dede;
background-color: #F2DEDE;
}
.info_message {
border: 1px solid #cccccc;
margin: 4px;
background-color: #dff0d8;
background-color: #DFF0D8;
}
.notification {
padding: 3px;
......
......@@ -6,7 +6,7 @@
top: 32px;
right: 0;
width: unset;
background-color: #ffffff;
background-color: #FFFFFF;
margin: 6px 0 0 0;
}
#vmi-menu div {
......@@ -67,13 +67,13 @@ ul {
user-select: none;
width: 100%;
overflow: hidden;
background: #ffffff;
background: #FFFFFF;
}
#top-container {
flex: 0 1 auto;
height: 32px;
width: 100%;
background: #ffffff;
background: #FFFFFF;
}
#top-container.alert {
background: yellow;
......@@ -96,7 +96,7 @@ ul {
#upload_summary {
display: none;
z-index: 10;
background-color: #ffffff;
background-color: #FFFFFF;
}
.upload_field {
width: 100%;
......@@ -118,14 +118,14 @@ ul {
top: 32px;
left: 0;
bottom: 125px ;
background: #ffffff;
background: #FFFFFF;
margin: 6px;
display: flex;
flex: auto;
overflow: hidden;
}
.vidjil-panels-left {
width: calc(100% - -64px);
width: calc(100% - 6px - 70px);
}
.vidjil-panels-full {
width: calc(100% - 6px);
......@@ -177,7 +177,7 @@ line {
flex: 0 0 auto;
font-size: 13px;
padding: 3px;
background: #ffffff;
background: #FFFFFF;
}
.info_line {
border-bottom: solid;
......@@ -205,10 +205,10 @@ line {
}
/*Style polyline / graph*/
.background_graph {
fill: #ffffff;
fill: #FFFFFF;
}
.background_graph2 {
fill: #ffffff;
fill: #FFFFFF;
}
.graph_line {
stroke-width: 1.5px;
......@@ -242,12 +242,12 @@ line {
}
.axis_m {
stroke: #777777;