mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-19 16:48:42 +02:00
Merge remote-tracking branch 'origin/develop' into feature/8772_form_dependencies_manager
This commit is contained in:
@@ -7,4 +7,5 @@
|
||||
@import "display-block/all";
|
||||
@import "linked-set/all";
|
||||
@import "tabular-fields/all";
|
||||
@import "welcome-popup/all";
|
||||
@import "welcome-popup/all";
|
||||
@import "user-rights";
|
||||
33
css/backoffice/application/_user-rights.scss
Normal file
33
css/backoffice/application/_user-rights.scss
Normal file
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* @copyright Copyright (C) 2010-2025 Combodo SAS
|
||||
* @license http://opensource.org/licenses/AGPL-3.0
|
||||
*/
|
||||
|
||||
$ibo-user-rights--padding-x: $ibo-spacing-400 !default;
|
||||
$ibo-user-rights--padding-y: $ibo-spacing-200 !default;
|
||||
$ibo-user-rights--border-radius: $ibo-border-radius-400 !default;
|
||||
|
||||
$ibo-user-rights--is-success--background-color: $ibo-color-success-100 !default;
|
||||
$ibo-user-rights--is-success--color: $ibo-color-success-950 !default;
|
||||
$ibo-user-rights--is-success--border-color: $ibo-color-success-500 !default;
|
||||
$ibo-user-rights--is-success--border: 1px solid $ibo-user-rights--is-success--border-color !default;
|
||||
|
||||
$ibo-user-rights--is-failure--background-color: $ibo-color-danger-100 !default;
|
||||
$ibo-user-rights--is-failure--color: $ibo-color-danger-950 !default;
|
||||
$ibo-user-rights--is-failure--border-color: $ibo-color-danger-500 !default;
|
||||
$ibo-user-rights--is-failure--border: 1px solid $ibo-user-rights--is-failure--border-color !default;
|
||||
|
||||
.ibo-user-rights {
|
||||
padding: $ibo-user-rights--padding-y $ibo-user-rights--padding-x;
|
||||
border-radius: $ibo-user-rights--border-radius;
|
||||
&.ibo-is-success {
|
||||
background-color: $ibo-user-rights--is-success--background-color;
|
||||
color: $ibo-user-rights--is-success--color;
|
||||
border: $ibo-user-rights--is-success--border;
|
||||
}
|
||||
&.ibo-is-failure {
|
||||
background-color: $ibo-user-rights--is-failure--background-color;
|
||||
color: $ibo-user-rights--is-failure--color;
|
||||
border: $ibo-user-rights--is-failure--border;
|
||||
}
|
||||
}
|
||||
@@ -81,9 +81,10 @@ $ibo-field--enable-bulk--checkbox--margin-left: $ibo-spacing-300 !default;
|
||||
}
|
||||
}
|
||||
|
||||
/*N°6543 - We need the rule to keep text inside the column when width is defined */
|
||||
/* N°6543 - We need the rule to keep text inside the column when width is defined */
|
||||
&[data-attribute-type="AttributeHTML"],
|
||||
&[data-attribute-type="AttributeText"] {
|
||||
&[data-attribute-type="AttributeText"],
|
||||
&[data-attribute-type="AttributeLongText"] {
|
||||
&[data-attribute-flag-read-only="true"] {
|
||||
display: grid;
|
||||
|
||||
|
||||
@@ -127,7 +127,8 @@ $ibo-datatable--selected-result-count--padding-left: 0.1em !default;
|
||||
}
|
||||
/* N°6543 - We need the rule to keep text inside the column when width is defined */
|
||||
> [data-attribute-type="AttributeHTML"],
|
||||
> [data-attribute-type="AttributeText"] {
|
||||
> [data-attribute-type="AttributeText"],
|
||||
> [data-attribute-type="AttributeLongText"] {
|
||||
max-width: 100%;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
@@ -202,6 +202,11 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
// N°7982 Default selectize stylesheet override
|
||||
.selectize-dropdown-content{
|
||||
max-height: $ibo-input-select-selectize--dropdown--max-height;
|
||||
}
|
||||
|
||||
.selectize-dropdown.ui-menu .ui-state-active {
|
||||
margin: unset;
|
||||
background-color: $ibo-input-select-selectize--item--active--background-color;
|
||||
|
||||
@@ -15,9 +15,10 @@ $ibo-activity-panel--padding-y: $ibo-spacing-0 !default;
|
||||
/* - Header */
|
||||
$ibo-activity-panel--header--background-color: $ibo-color-grey-100 !default;
|
||||
|
||||
$ibo-activity-panel--togglers--color: $ibo-color-grey-600 !default;
|
||||
$ibo-activity-panel--togglers--on-hover--color: $ibo-color-grey-800 !default;
|
||||
$ibo-activity-panel--togglers--elements-spacing: 0.75rem !default;
|
||||
$ibo-activity-panel--actions--color: $ibo-color-grey-600 !default;
|
||||
$ibo-activity-panel--actions--on-hover--color: $ibo-color-grey-800 !default;
|
||||
$ibo-activity-panel--actions--elements-spacing: 0.75rem !default;
|
||||
$ibo-activity-panel--actions-padding-right: $ibo-activity-panel--padding-x !default;
|
||||
|
||||
/* - Tabs togglers*/
|
||||
$ibo-activity-panel--tabs-togglers--padding-x: $ibo-activity-panel--padding-x * 3 !default; /* We need to increase this so the size toggler which will be set in abs. pos. can overlap it nicely */
|
||||
@@ -152,35 +153,45 @@ $ibo-activity-panel--open-icon--margin-left: 0.75rem !default;
|
||||
background-color: $ibo-activity-panel--header--background-color;
|
||||
|
||||
/* Remove hyperlinks default color */
|
||||
> .ibo-activity-panel--tabs-togglers a{
|
||||
.ibo-activity-panel--togglers a{
|
||||
color: $ibo-activity-panel--tab-toolbar--text-color;
|
||||
}
|
||||
}
|
||||
|
||||
/* Size/display togglers */
|
||||
/* All toggles container */
|
||||
.ibo-activity-panel--togglers {
|
||||
position: absolute;
|
||||
right: $ibo-activity-panel--padding-x;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
@extend %ibo-fully-centered-content;
|
||||
color: $ibo-activity-panel--togglers--color;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
/* Size/display togglers */
|
||||
.ibo-activity-panel--actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-grow: 0;
|
||||
position: sticky;
|
||||
padding-right: $ibo-activity-panel--actions-padding-right;
|
||||
|
||||
background-color: $ibo-activity-panel--header--background-color;
|
||||
color: $ibo-activity-panel--actions--color;
|
||||
|
||||
&:hover {
|
||||
color: $ibo-activity-panel--togglers--on-hover--color;
|
||||
color: $ibo-activity-panel--actions--on-hover--color;
|
||||
}
|
||||
|
||||
> *:not(:first-child) {
|
||||
margin-left: $ibo-activity-panel--togglers--elements-spacing;
|
||||
margin-left: $ibo-activity-panel--actions--elements-spacing;
|
||||
}
|
||||
}
|
||||
|
||||
/* Tabs togglers */
|
||||
.ibo-activity-panel--tabs-togglers{
|
||||
position: relative; /* For size toggler */
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: safe center;
|
||||
flex-grow: 1;
|
||||
padding-left: $ibo-activity-panel--tabs-togglers--padding-x;
|
||||
padding-right: $ibo-activity-panel--tabs-togglers--padding-x;
|
||||
@extend %ibo-fully-centered-content;
|
||||
overflow-x: auto;
|
||||
}
|
||||
.ibo-activity-panel--tab-toggler{
|
||||
&.ibo-is-active{
|
||||
|
||||
5
css/backoffice/vendors/_selectize.scss
vendored
5
css/backoffice/vendors/_selectize.scss
vendored
@@ -34,6 +34,10 @@ $ibo-vendors-selectize--dropdown--color: $ibo-vendors-selectize-input--color!de
|
||||
$ibo-vendors-selectize--header--padding-x: 8px !default;
|
||||
$ibo-vendors-selectize--header--padding-y: 5px !default;
|
||||
|
||||
.selectize-dropdown, .selectize-input, .selectize-input input {
|
||||
color: $ibo-vendors-selectize-input--color;
|
||||
}
|
||||
|
||||
.selectize-control.single .selectize-input {
|
||||
box-shadow: unset;
|
||||
background-color: $ibo-vendors-selectize-input--background-color;
|
||||
@@ -66,6 +70,7 @@ $ibo-vendors-selectize--header--padding-y: 5px !default;
|
||||
display: inline-flex;
|
||||
}
|
||||
|
||||
|
||||
.selectize-control.single .selectize-input, .selectize-dropdown.single {
|
||||
border-color: $ibo-vendors-selectize--input--border-color;
|
||||
}
|
||||
|
||||
@@ -46,6 +46,7 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
|
||||
.ck-editor {
|
||||
width: 100% !important; /* Force editor to always take its container full width (not less, not more) */
|
||||
display: inline-grid; /* Force editor to always take its container full width (not less, not more) */
|
||||
z-index: 1;
|
||||
|
||||
.ck-editor__main {
|
||||
overflow: auto;
|
||||
|
||||
Reference in New Issue
Block a user