composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2602 Portal : fix no more border around new caselog editor

Browse Source 
With the new version of CKE N°2271, container is span.cke on MSIE instead of div.cke
This commit is contained in:
Pierre Goiffon
2020-01-16 10:27:06 +01:00
parent e5f3daf88a
commit 4945f25d49
2 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
datamodels/2.x/itop-portal-base/portal/public/css/portal.css
View File

@@ -1,4 +1,21 @@
/*
/*!
* Copyright (C) 2013-2020 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
/*!
* Copyright (C) 2013-2020 Combodo SARL
*
* This file is part of iTop.
@@ -15,7 +32,6 @@
*
* You should have received a copy of the GNU Affero General Public License
*/
/*!
* Combodo portal template v1.0.0
*/
@@ -82,7 +98,7 @@ footer {
background-size: 100%;
background-position: center center;
background-color: #585653;
border: 2px solid #fff;
border: 2px solid #FFFFFF;
border-radius: 100%;
box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4);
}
@@ -98,7 +114,6 @@ footer {
}
/* Sidebar */
@media (min-width: 768px) {
/* Main content */
#sidebar {
position: fixed;
top: 0px;
@@ -119,15 +134,15 @@ footer {
background-position: center center;
background-color: #585653;
background-repeat: no-repeat;
border: 2px solid #fff;
border: 2px solid #FFFFFF;
border-radius: 100%;
}
#sidebar .user_card .user_infos {
font-size: 1em;
color: #fff;
color: #FFFFFF;
}
#sidebar .user_card .user_infos .dropdown-toggle {
color: #fff;
color: #FFFFFF;
}
#sidebar .user_card .user_options.dropdown-menu {
width: 92%;
@@ -162,6 +177,7 @@ footer {
#sidebar .logo img {
max-width: 100%;
max-height: 50px;
/* Main content */
}
#main-wrapper {
margin-top: 20px;
@@ -359,7 +375,7 @@ footer {
margin-bottom: 8px;
padding: 0em 1em;
min-height: 4em;
background-color: #fff;
background-color: #FFFFFF;
background-image: none;
border: none;
border-radius: 0px;
@@ -379,11 +395,11 @@ footer {
color: #777;
}
.home .tile .tile_title > span.icon {
color: #ea7d1e;
color: #EA7D1E;
}
.home .tile .tile_description {
display: none;
color: #555;
color: #555555;
}
/**********************************/
/* ManageBrick badge tile display */
@@ -604,7 +620,7 @@ footer {
/* Home tile */
.home .tile.tile_communication {
padding: 20px;
background-color: #ededed;
background-color: #EDEDED;
border: none;
font-weight: initial;
}
@@ -793,7 +809,7 @@ table .group-actions {
height: 55px;
margin-bottom: 10px;
text-align: center;
color: #fff;
color: #FFFFFF;
}
.mosaic-group-back {
font-size: 25px;
@@ -807,7 +823,7 @@ table .group-actions {
transition: all linear 0.3s;
}
.mosaic-item, .mosaic-item:hover, .mosaic-item:active, .mosaic-item:focus, .mosaic-item:visited {
color: #fff;
color: #FFFFFF;
text-decoration: none;
}
.mosaic-item:active {
@@ -832,16 +848,13 @@ table .group-actions {
right: 5px;
}
.mosaic-group-item-actions > a {
color: #fff;
color: #FFFFFF;
text-decoration: none;
}
.mosaic-group-item-actions > a:hover, .mosaic-group-item-actions > a:focus {
color: #eee;
color: #EEEEEE;
}
@media (max-width: 768px) {
/* All layouts */
/* Layout 2 */
/* Layout 5/7 */
.mosaic-group-item > .mosaic-group-item-actions {
top: 12px;
right: 6px;
@@ -851,6 +864,7 @@ table .group-actions {
}
.mosaic-group-item-actions > a {
font-size: 20px;
/* All layouts */
}
.mosaic-item-image {
width: 55px;
@@ -866,22 +880,17 @@ table .group-actions {
}
.mosaic-item-description {
display: none;
/* Layout 2 */
}
.mosaic-item-layout-2 .mosaic-item-description {
display: block;
/* Layout 5/7 */
}
.mosaic-item-layout-5 .mosaic-item-name, .mosaic-item-layout-7 .mosaic-item-name {
padding-right: 40px;
}
}
@media (min-width: 768px) {
/* All layouts */
/* .mosaic-item-image{
vertical-align: inherit; Note: This was introduced to avoid image from going down the tile when .mosaic-item-name was way too long, but the .mosaic-item-image glitched by being a little too high. As a very long .mosaic-item-name is extremely rare, we decided that it was not worth it.
}*/
/* Layout 1 */
/* Layout 7 */
/* Layout 5 & 7 */
.mosaic-group-item {
display: inline-block;
width: 32%;
@@ -894,8 +903,12 @@ table .group-actions {
padding: 10px;
}
.mosaic-item:hover, .mosaic-item:focus {
background-color: #ea7d1e;
background-color: #EA7D1E;
box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.2);
/* All layouts */
/* .mosaic-item-image{
vertical-align: inherit; Note: This was introduced to avoid image from going down the tile when .mosaic-item-name was way too long, but the .mosaic-item-image glitched by being a little too high. As a very long .mosaic-item-name is extremely rare, we decided that it was not worth it.
}*/
}
.mosaic-item-text .mosaic-item-text-wrapper {
max-height: 100px;
@@ -911,10 +924,12 @@ table .group-actions {
.mosaic-item-description {
overflow: hidden;
text-overflow: ellipsis;
/* Layout 1 */
}
.mosaic-item-layout-1 .mosaic-item-name {
font-weight: inherit;
font-size: 14px;
/* Layout 7 */
}
.mosaic-item-layout-7 .mosaic-item-image {
display: none;
@@ -923,6 +938,7 @@ table .group-actions {
margin-top: 10px;
max-height: 40px;
font-size: 10px;
/* Layout 5 & 7 */
}
.mosaic-item-layout-5 .mosaic-item-image, .mosaic-item-layout-7 .mosaic-item-image {
display: table-cell;
@@ -938,12 +954,12 @@ table .group-actions {
}
}
@media (min-width: 992px) {
/* Layout 5 & 7 */
.mosaic-item {
padding: 10px 15px;
}
.mosaic-group-back {
font-size: 40px;
/* Layout 5 & 7 */
}
.mosaic-item-layout-5 .mosaic-item-image, .mosaic-item-layout-7 .mosaic-item-image {
width: 105px;
@@ -960,11 +976,11 @@ table .group-actions {
}
}
@media (min-width: 1200px) {
/* All layouts */
.mosaic-group-item {
width: 24%;
height: 140px;
margin-right: 1.3%;
/* All layouts */
}
.mosaic-item-text .mosaic-item-text-wrapper {
max-height: 120px;
@@ -1032,7 +1048,7 @@ table .group-actions {
content: "\002a";
position: relative;
left: 3px;
color: #ea7d1e;
color: #EA7D1E;
font-size: 0.9em;
}
/* ExternalKey */
@@ -1052,8 +1068,8 @@ table .group-actions {
.caselog_field_entry_header {
padding: 6px;
font-size: 0.9em;
border-bottom: 1px solid #fff;
background-color: #f2f2f2;
border-bottom: 1px solid #FFFFFF;
background-color: #F2F2F2;
}
.caselog_field_entry_button {
display: block;
@@ -1067,7 +1083,7 @@ table .group-actions {
cursor: pointer;
}
.caselog_field_entry_button:hover {
background-color: #ccc;
background-color: #cccccc;
}
.caselog_field_entry_button:before {
content: "▴";
@@ -1096,7 +1112,7 @@ table .group-actions {
.form_linkedset_toggler > .glyphicon, .form_upload_toggler > .glyphicon {
margin-left: 0.5em;
font-size: 0.85em;
color: #ea7d1e;
color: #EA7D1E;
transition: transform 0.2s linear;
}
.form_linkedset_toggler > .glyphicon.collapsed, .form_upload_toggler > .glyphicon.collapsed {
@@ -1124,7 +1140,7 @@ table .group-actions {
.fileupload_field_content {
padding: 8px 23px;
border: 1px solid #ddd;
background-color: #f9f9f9;
background-color: #F9F9F9;
}
.fileupload_field_content > div {
margin-bottom: 15px;
@@ -1286,7 +1302,6 @@ table .group-actions {
display: none;
}
@media (min-width: 768px) {
/* Making regular button sticky */
.form_buttons .form_btn_misc {
float: left !important;
}
@@ -1299,6 +1314,7 @@ table .group-actions {
}
.form_buttons .form_btn_regular .btn {
width: inherit;
/* Making regular button sticky */
}
.form_btn_regular.sticky {
display: block;
@@ -1307,7 +1323,7 @@ table .group-actions {
right: -2px;
/* TODO : SASS this to col-xs-12 padding */
padding: 15px;
background-color: #fff;
background-color: #FFFFFF;
border: 1px solid #ddd;
border-radius: 0px;
transition: right 0.3s;
@@ -1323,10 +1339,10 @@ table .group-actions {
}
}
/* CKEditor : Adding BS error feedback */
.form_field div.cke {
.form_field .cke {
border: 1px solid #ddd;
}
.form_field.has-error div.cke {
.form_field.has-error .cke {
border: 1px solid #b94a48;
border-radius: 0px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -1338,7 +1354,7 @@ table .group-actions {
margin-bottom: 18px;
border: 1px solid transparent;
border-radius: 4px;
background-color: #fff;
background-color: #FFFFFF;
}
.cke_notification_close {
position: absolute;

4
datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
View File

@@ -1423,10 +1423,10 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
}
/* CKEditor : Adding BS error feedback */
.form_field div.cke{
.form_field .cke{
border: 1px solid $gray-lighter;
}
.form_field.has-error div.cke{
.form_field.has-error .cke{
border: 1px solid $state-danger-text;
border-radius: $border-radius-base;
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);