mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 02:58:43 +02:00
Merge remote-tracking branch 'origin/release/2.6' into develop
# Conflicts: # application/itopwebpage.class.inc.php # core/config.class.inc.php # css/css-variables.scss # css/light-grey.css # datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php # datamodels/2.x/itop-incident-mgmt-itil/nl.dict.itop-incident-mgmt-itil.php # datamodels/2.x/version.xml
This commit is contained in:
Pierre Goiffon
@@ -481,7 +481,7 @@ input.textSearch {
|
||||
|
||||
.ui-accordion-content ul {
|
||||
list-style:none;
|
||||
list-style-image: url(data:0);
|
||||
list-style-image: none;
|
||||
padding-left:16px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
@@ -494,7 +494,7 @@ input.textSearch {
|
||||
padding: 8px 0px 8px 8px;
|
||||
margin:0;
|
||||
list-style:none;
|
||||
list-style-image: url(data:0);
|
||||
list-style-image: none;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
@@ -629,7 +629,9 @@ div.actions_menu > ul > li {
|
||||
padding: 0;
|
||||
height: 25px;
|
||||
}
|
||||
|
||||
.itop_popup > ul > li > ul, #logOffBtn > ul > li > ul {
|
||||
box-shadow: 3px 3px 5px 0px rgba(0,0,0,0.5);
|
||||
}
|
||||
.itop_popup li a, #logOffBtn li a {
|
||||
display: block;
|
||||
padding: 5px 12px;
|
||||
@@ -1105,6 +1107,7 @@ input.dp-applied {
|
||||
.sfc_form_group{
|
||||
/* Form group (operators) is displayed only when the criteria is toggled to opened state */
|
||||
display: none;
|
||||
max-width: 450px;
|
||||
max-height: 520px;
|
||||
overflow: auto;
|
||||
|
||||
@@ -3443,8 +3446,8 @@ table.listResults .originColor{
|
||||
.switch {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
width: 41px;
|
||||
height: 23px;
|
||||
width: 36px;
|
||||
height: 20px;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
@@ -3460,19 +3463,17 @@ table.listResults .originColor{
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-color: #ccc;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
}
|
||||
|
||||
.slider:before {
|
||||
position: absolute;
|
||||
content: "";
|
||||
height: 17px;
|
||||
width: 17px;
|
||||
left: 4px;
|
||||
height: 15px;
|
||||
width: 15px;
|
||||
left: 3px;
|
||||
bottom: 3px;
|
||||
background-color: white;
|
||||
-webkit-transition: .4s;
|
||||
transition: .4s;
|
||||
}
|
||||
|
||||
@@ -3485,16 +3486,178 @@ input:focus + .slider {
|
||||
}
|
||||
|
||||
input:checked + .slider:before {
|
||||
-webkit-transform: translateX(16px);
|
||||
-ms-transform: translateX(16px);
|
||||
transform: translateX(16px);
|
||||
transform: translateX(14.5px);
|
||||
}
|
||||
|
||||
/* Rounded sliders */
|
||||
.slider.round {
|
||||
border-radius: 34px;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
.slider.round:before {
|
||||
border-radius: 50%;
|
||||
}
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
///////////////////////////
|
||||
// Newsroom menu
|
||||
|
||||
#newsroom_menu li span {
|
||||
display: block;
|
||||
padding: 5px 12px;
|
||||
text-decoration: none;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#newsroom_menu li li p {
|
||||
text-align: left;
|
||||
margin: 2px;
|
||||
margin-left: 5px;
|
||||
margin-right: 5px;
|
||||
cursor: pointer;
|
||||
background-color: transparent;
|
||||
}
|
||||
#newsroom_menu > ul > li > ul {
|
||||
margin-top: 8px;
|
||||
}
|
||||
#newsroom_menu > ul > li > ul > li {
|
||||
display: block;
|
||||
border-bottom: 1px #ddd solid;
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
text-align: left;
|
||||
}
|
||||
#newsroom_menu > ul > li > ul > li:hover, #newsroom_menu > ul > li > ul > li:hover h1, #newsroom_menu > ul > li > ul > li:hover h2, #newsroom_menu > ul > li > ul > li:hover h3 {
|
||||
background: $popup-menu-highlight-color;
|
||||
color: $popup-menu-text-higlight-color;
|
||||
}
|
||||
#newsroom_menu li li:last-of-type {
|
||||
border-bottom: 0;
|
||||
}
|
||||
#newsroom_menu li {
|
||||
list-style: none;
|
||||
cursor: pointer;
|
||||
color: $popup-menu-text-color;
|
||||
}
|
||||
#newsroom_menu li ul {
|
||||
width: 300px;
|
||||
}
|
||||
#top-left-newsroom-cell {
|
||||
padding-right: 11px !important;
|
||||
}
|
||||
#newsroom_menu_icon {
|
||||
position:relative;
|
||||
top:8px;
|
||||
}
|
||||
#newsroom_menu_counter_container {
|
||||
position:relative;
|
||||
top:-26px;
|
||||
left:4px;
|
||||
}
|
||||
#newsroom_menu_counter {
|
||||
display:inline-block;
|
||||
padding:2px;
|
||||
border-radius:8px;
|
||||
text-align:center;
|
||||
width: 12px;
|
||||
box-shadow: 1px 1px 2px 0px $gray;
|
||||
font-size: 8pt;
|
||||
background-color:$complement-color;
|
||||
color: $white;
|
||||
cursor: pointer;
|
||||
}
|
||||
.newsroom_extra_messages_counter {
|
||||
display:inline-block !important;
|
||||
padding:2px !important;
|
||||
border-radius:8px;
|
||||
text-align:center;
|
||||
font-size: 8pt;
|
||||
min-width: 12px;
|
||||
background-color:$gray-light;
|
||||
color: $white;
|
||||
float: right;
|
||||
margin-right: 5px;
|
||||
}
|
||||
.newsroom_menu_item > div > img {
|
||||
float:left;
|
||||
width:32px;
|
||||
max-height:32px;
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
margin-left:5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
#newsroom_menu_dismiss_all, #newsroom_menu_show_all {
|
||||
text-align: center !important;
|
||||
}
|
||||
#newsroom_show_all_submenu {
|
||||
text-align: center;
|
||||
padding-top: 0 !important;
|
||||
padding-bottom: 0 !important;
|
||||
}
|
||||
#newsroom_show_all_submenu > ul {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
#newsroom_show_all_submenu > ul > li > ul {
|
||||
margin-top: 8px;
|
||||
}
|
||||
#newsroom_show_all_submenu > ul > li > ul > li {
|
||||
display: block;
|
||||
border-bottom: 1px #ddd solid;
|
||||
padding-left: 5px;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 6px;
|
||||
text-align: left;
|
||||
}
|
||||
#newsroom_show_all_submenu > ul > li > ul > li:hover {
|
||||
background: $popup-menu-highlight-color;
|
||||
color: $popup-menu-text-higlight-color;
|
||||
}
|
||||
#newsroom_show_all_submenu li ul {
|
||||
width: 200px;
|
||||
color:#000;
|
||||
}
|
||||
.no-padding {
|
||||
padding: 0 !important;
|
||||
}
|
||||
.newsroom_menu_item_date {
|
||||
padding: 0 !important;
|
||||
margin-bottom: -10px;
|
||||
font-size: 8pt;
|
||||
text-align: right;
|
||||
margin-top: -2px;
|
||||
margin-right: 5px;
|
||||
color: $white;
|
||||
}
|
||||
#newsroom_display_size {
|
||||
height: 1em;
|
||||
width: 3em;
|
||||
}
|
||||
#newsroom_no_new_message p {
|
||||
text-align: center !important;
|
||||
cursor: default !important;
|
||||
font-style: italic;
|
||||
}
|
||||
#newsroom_no_new_message {
|
||||
color: $gray-dark !important;
|
||||
}
|
||||
#newsroom_no_new_message:hover {
|
||||
cursor: default !important;
|
||||
color: $gray-dark !important;
|
||||
background-color: $white !important;
|
||||
}
|
||||
#newsroom_menu h1 {
|
||||
font-weight: 700;
|
||||
font-size: 16px;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
#newsroom_menu h2 {
|
||||
font-weight: 700;
|
||||
font-size: 14px;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
#newsroom_menu h3, #newsroom_menu h4, #newsroom_menu h5 {
|
||||
font-weight: 700;
|
||||
font-size: 12px;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user