composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°3649 - Activity panel: Code cleanup

Browse Source 
- Move entry form toggler SCSS to proper file
- Rename entry form toggler
This commit is contained in:
Molkobain
2021-01-23 11:41:14 +01:00
parent 927fd980f6
commit 9a4f956153
4 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
css/backoffice/layout/activity-panel/_caselog-entry-form.scss
View File

@@ -9,18 +9,7 @@ $ibo-caselog-entry-form--background-color: $ibo-activity-panel--tab-toolbar--bac
$ibo-caselog-entry-form--actions--margin-top: 6px !default;
$ibo-caselog-entry-form--actions--margin-bottom: 8px !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--right: 4px !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--margin-top: calc(#{$ibo-activity-panel--tab-toolbar-actions--height} + 4px) !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--diameter: 36px !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--background-color: $ibo-color-primary-600 !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--color: $ibo-color-white-100 !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--border-radius: $ibo-border-radius-full !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--box-shadow: $ibo-elevation-100 !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--icon--height: 100% !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--icon--width: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--height !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--icon--font-size: 16px !default;
$ibo-activity-panel--body--add-caselog-entry--toggler--icon--line-height: 33px !default;
.ibo-caselog-entry-form{
display: block;
width: 100%;
@@ -37,34 +26,6 @@ $ibo-activity-panel--body--add-caselog-entry--toggler--icon--line-height: 33px !
margin-bottom: $ibo-caselog-entry-form--actions--margin-bottom;
}
.ibo-activity-panel--body--add-caselog-entry--toggler{
@extend %ibo-baseline-centered-content;
position: absolute;
right: $ibo-activity-panel--body--add-caselog-entry--toggler--right;
margin-top: $ibo-activity-panel--body--add-caselog-entry--toggler--margin-top;
width: $ibo-activity-panel--body--add-caselog-entry--toggler--diameter;
height: $ibo-activity-panel--body--add-caselog-entry--toggler--diameter;
background-color: $ibo-activity-panel--body--add-caselog-entry--toggler--background-color;
color: $ibo-activity-panel--body--add-caselog-entry--toggler--color;
border-radius: $ibo-activity-panel--body--add-caselog-entry--toggler--border-radius;
box-shadow: $ibo-activity-panel--body--add-caselog-entry--toggler--box-shadow;
> i{
text-align: center;
height: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--height;
width: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--width;
font-size: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--font-size;
line-height: $ibo-activity-panel--body--add-caselog-entry--toggler--icon--line-height;
}
&:hover {
color: $ibo-activity-panel--body--add-caselog-entry--toggler--color;
}
&.ibo-is-hidden{
display: none;
}
}
.ibo-caselog-entry-form--action-buttons--main-actions > .ibo-popover-menu{
z-index: 1;
}

2
css/print.css
View File

@@ -207,7 +207,7 @@ div.explain-printable button{
.printable-content .ibo-field--fullscreen-toggler,
.printable-content .ibo-activity-panel--expand-icon,
.printable-content .ibo-activity-panel--collapse-icon,
.printable-content .ibo-activity-panel--body--add-caselog-entry--toggler,
.printable-content .ibo-activity-panel--add-caselog-entry-button,
#ibo-top-container, #ibo-navigation-menu, .itop_popup {
display: none;
}

2
js/layouts/activity-panel/caselog-entry-form.js
View File

@@ -38,7 +38,7 @@ $(function() {
activity_panel: '[data-role="ibo-activity-panel"]',
activity_panel_toolbar: '[data-role="ibo-activity-panel--tab-toolbar"]',
form: '[data-role="ibo-caselog-entry-form"]', // Any caselog entry form
toggler: '[data-role="ibo-activity-panel--body--add-caselog-entry--toggler"]',
toggler: '[data-role="ibo-activity-panel--add-caselog-entry-button"]',
main_actions: '[data-role="ibo-caselog-entry-form--action-buttons--main-actions"]',
cancel_button: '[data-role="ibo-caselog-entry-form--action-buttons--main-actions"] [data-role="ibo-button"][name="cancel"]',
send_button: '[data-role="ibo-caselog-entry-form--action-buttons--main-actions"] [data-role="ibo-button"][name="send"]',

2
templates/base/layouts/activity-panel/layout.html.twig
View File

@@ -43,7 +43,7 @@
</div>
</div>
{% if oUIBlock.HasAnEditableCaseLogTab() and oUIBlock.IsCaseLogsSubmitAutonomous() %}
<a href="#" class="ibo-activity-panel--body--add-caselog-entry--toggler" data-role="ibo-activity-panel--body--add-caselog-entry--toggler"><i class="fas fa-feather"></i></a>
<a href="#" class="ibo-activity-panel--add-caselog-entry-button" data-role="ibo-activity-panel--add-caselog-entry-button"><i class="fas fa-feather"></i></a>
{% endif %}
<div class="ibo-activity-panel--body">
{% if oUIBlock.GetGroupedEntries()|length > 0 %}