Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts: # css/backoffice/pages/_csv-import.scss # pages/ajax.render.php
- Loading branch information
Showing
18 changed files
with
242 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 28 additions & 14 deletions
42
css/backoffice/application/tabular-fields/_tabular-fields-selector.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,60 @@ | ||
| /* | ||
| * @copyright Copyright (C) 2010-2021 Combodo SARL | ||
| * @copyright Copyright (C) 2010-2023 Combodo SARL | ||
| * @license http://opensource.org/licenses/AGPL-3.0 | ||
| */ | ||
|
|
||
| $ibo-table-preview--header-cell--padding: $ibo-spacing-200 $ibo-spacing-600 $ibo-spacing-200 $ibo-spacing-200 !default; | ||
| $ibo-table-preview--header-cell--background-color: $ibo-color-white-200 !default; | ||
| $ibo-table-preview--header-cell--border-width: 1px 1px 0 !default; | ||
|
|
||
| $ibo-table-preview--body-cell--padding-x: $ibo-spacing-200 !default; | ||
| $ibo-table-preview--body-cell--border-width: 0 1px !default; | ||
| $ibo-table-preview--body-cell--last--border-bottom-width: 1px !default; | ||
|
|
||
| $ibo-preview-header--margin-bottom: $ibo-spacing-200 !default; | ||
| $ibo-table-preview--remove-column--top: $ibo-spacing-300 !default; | ||
| $ibo-table-preview--remove-column--right: $ibo-spacing-300 !default; | ||
| $ibo-table-preview--remove-column--font-size: 8px !default; | ||
|
|
||
| $ibo-form-part-interactive-fields--margin-top: $ibo-spacing-600 !default; | ||
|
|
||
| .ibo-table-preview { | ||
| margin-top: 20px; | ||
| overflow-x: auto; | ||
|
|
||
| th { | ||
| position: relative; | ||
| padding: 5px; | ||
| padding-right: $ibo-spacing-600; | ||
| border-width: 1px 1px 0; | ||
| padding: $ibo-table-preview--header-cell--padding; | ||
| border-width: $ibo-table-preview--header-cell--border-width; | ||
| border-style: groove groove none; | ||
| background: $ibo-color-white-200; | ||
| background: $ibo-table-preview--header-cell--background-color; | ||
| } | ||
|
|
||
| td { | ||
| padding-right: 5px; | ||
| padding-left: 5px; | ||
| border-width: 0 1px; | ||
| padding-right: $ibo-table-preview--body-cell--padding-x; | ||
| padding-left: $ibo-table-preview--body-cell--padding-x; | ||
| border-width: $ibo-table-preview--body-cell--border-width; | ||
| border-style: none groove; | ||
| } | ||
|
|
||
| tr:last-child td { | ||
| border-bottom-width: 1px; | ||
| border-bottom-width: $ibo-table-preview--body-cell--last--border-bottom-width; | ||
| border-bottom-style: groove; | ||
| } | ||
| } | ||
|
|
||
| .ibo-preview-header { | ||
| margin-bottom: 5px; | ||
| margin-bottom: $ibo-preview-header--margin-bottom; | ||
| } | ||
| .ibo-table-preview--remove-column { | ||
| position: absolute; | ||
| top: $ibo-spacing-300; | ||
| right: $ibo-spacing-300; | ||
| top: $ibo-table-preview--remove-column--top; | ||
| right: $ibo-table-preview--remove-column--right; | ||
| display: inline-block; | ||
| cursor: pointer; | ||
| font-size: 8px; | ||
| font-size: $ibo-table-preview--remove-column--font-size; | ||
| } | ||
|
|
||
| #form_part_interactive_fields_xlsx, #form_part_interactive_fields_csv, #form_part_interactive_fields_pdf { | ||
| margin-top: $ibo-spacing-600; | ||
| margin-top: $ibo-form-part-interactive-fields--margin-top; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
css/backoffice/utils/variables/colors/_skeleton-palette.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /* | ||
| * @copyright Copyright (C) 2010-2023 Combodo SARL | ||
| * @license http://opensource.org/licenses/AGPL-3.0 | ||
| */ | ||
|
|
||
| /* Skeleton palette */ | ||
| /* - Colors used by skeletons svg to display placeholders */ | ||
|
|
||
| $ibo-skeleton-start-color: $ibo-color-grey-200 !default; | ||
| $ibo-skeleton-stop-color: $ibo-color-blue-grey-100 !default; | ||
|
|
||
| /* CSS variables */ | ||
| /* Skeleton CSS3 variables are not ibo prefixed as they are not iTop backoffice exclusives*/ | ||
| :root { | ||
| --skeleton-start-color: #{$ibo-skeleton-start-color}; | ||
| --skeleton-stop-color: #{$ibo-skeleton-stop-color}; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| .ace-eclipse .ace_gutter { | ||
| background: unset !important; | ||
| border-right: unset !important; | ||
| color: $ibo-color-grey-400 !important; | ||
| } | ||
| .ace-eclipse .ace_print-margin { | ||
| width: 1px !important; | ||
| background: $ibo-color-grey-500 !important; | ||
| } | ||
| .ace-eclipse { | ||
| background-color: $ibo-color-grey-800 !important; | ||
| color: $ibo-color-grey-200 !important; | ||
| } | ||
| .ace-eclipse .ace_entity.ace_other.ace_attribute-name, | ||
| .ace-eclipse .ace_storage { | ||
| color: $ibo-color-grey-200 !important; | ||
| } | ||
| .ace-eclipse .ace_cursor { | ||
| color: $ibo-color-grey-200 !important; | ||
| } | ||
| .ace-eclipse .ace_string.ace_regexp { | ||
| color: $ibo-color-red-600 !important; | ||
| } | ||
| .ace-eclipse .ace_marker-layer .ace_active-line { | ||
| background: $ibo-color-grey-600 !important; | ||
| } | ||
| .ace-eclipse .ace_marker-layer .ace_selection { | ||
| background: $ibo-color-grey-600 !important; | ||
| } | ||
| .ace-eclipse.ace_multiselect .ace_selection.ace_start { | ||
| box-shadow: 0 0 3px 0px $ibo-color-grey-800 !important; | ||
| } | ||
| .ace-eclipse .ace_marker-layer .ace_step { | ||
| background: $nord13 !important; | ||
| } | ||
| .ace-eclipse .ace_marker-layer .ace_bracket { | ||
| margin: -1px 0 0 -1px !important; | ||
| border: 1px solid $ibo-color-primary-300 !important; | ||
| } | ||
| .ace-eclipse .ace_gutter-active-line { | ||
| background-color: $ibo-color-grey-600 !important; | ||
| } | ||
| .ace-eclipse .ace_marker-layer .ace_selected-word { | ||
| border: 1px solid $ibo-color-primary-300 !important; | ||
| } | ||
| .ace-eclipse .ace_invisible { | ||
| color: $ibo-color-grey-500 !important; | ||
| } | ||
| .ace-eclipse .ace_keyword, | ||
| .ace-eclipse .ace_meta, | ||
| .ace-eclipse .ace_support.ace_class, | ||
| .ace-eclipse .ace_support.ace_type { | ||
| color: $ibo-color-primary-500 !important; | ||
| } | ||
| .ace-eclipse .ace_constant.ace_character, | ||
| .ace-eclipse .ace_constant.ace_other { | ||
| color: $ibo-color-grey-200 !important; | ||
| } | ||
| .ace-eclipse .ace_constant.ace_language { | ||
| color: $ibo-color-primary-800 !important; | ||
| } | ||
| .ace-eclipse .ace_constant.ace_escape { | ||
| color: $nord13 !important; | ||
| } | ||
| .ace-eclipse .ace_constant.ace_numeric { | ||
| color: $nord15 !important; | ||
| } | ||
| .ace-eclipse .ace_fold { | ||
| background-color: $ibo-color-grey-500 !important; | ||
| border-color: $ibo-color-grey-200 !important; | ||
| } | ||
| .ace-eclipse .ace_entity.ace_name.ace_function, | ||
| .ace-eclipse .ace_entity.ace_name.ace_tag, | ||
| .ace-eclipse .ace_support.ace_function, | ||
| .ace-eclipse .ace_variable, | ||
| .ace-eclipse .ace_variable.ace_language { | ||
| color: #8fbcbb !important; | ||
| } | ||
| .ace-eclipse .ace_string { | ||
| color: $nord14 !important; | ||
| } | ||
| .ace-eclipse .ace_comment { | ||
| color: $nord7 !important; | ||
| } | ||
| .ace-eclipse .ace_indent-guide { | ||
| box-shadow: inset -1px 0 0 0 $ibo-color-grey-600 !important; | ||
| } | ||
| .ace-eclipse .ace_indent-guide-active { | ||
| box-shadow: inset -1px 0 0 0 $ibo-color-grey-400 !important; | ||
| } |
Oops, something went wrong.