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

N°8274 - Move mixins declarations to utils, move their usage to themes/ to be able to have their variables overloaded

Browse Source
This commit is contained in:
Stephen Abello
2025-04-11 10:43:03 +02:00
parent 06cc64f6d6
commit 5e6d96019d
13 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css vendored
View File

File diff suppressed because one or more lines are too long

2
datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss vendored
View File

@@ -1 +1 @@
@import "themes/all";
@import "themes/all";

10
datamodels/2.x/itop-portal-base/portal/public/css/components/_tile.scss
View File

@@ -38,7 +38,6 @@ $ipb-tile--manage-brick--top-list--margin-top: $common-spacing-500 !default;
&[data-role="navigation-trigger"] {
cursor: pointer;
@include ipb-heavy-animated-border;
}
}
@@ -141,25 +140,16 @@ $ipb-tile--manage-brick--top-list--margin-top: $common-spacing-500 !default;
/* title */
.ipb-tile--manage .ipb-tile--title {
display: flex;
align-items: center;
> span:first-child {
@include ipb-text-overflow-ellipsis;
}
> span:nth-child(2) {
@include ipb-following-dot;
> .class-icon {
width: 20px;
margin-left: 5px;
vertical-align: baseline;
}
}
}
/* chart */

29
datamodels/2.x/itop-portal-base/portal/public/css/layout/_navigation-menu.scss
View File

@@ -42,11 +42,6 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
&.ipb-is-expanded {
width: $ipb-navigation-menu--nav-vertical--is-expanded--width;
// expand menu toggle animation
.ipb-navigation-menu--top-part--toggle--expand-menu {
@include ipb-toggle-nav-animated-chevron-right;
}
// make menu entry fill available space
.ipb-navigation-menu--menu-entry--brick-item {
width: 100%;
@@ -82,11 +77,6 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
}
// expand toggle menu
.ipb-navigation-menu--top-part--toggle--expand-menu {
@include ipb-toggle-nav;
}
// SEPARATOR ////////////////////////////////////////////
.ipb-navigation-menu--separator {
@@ -101,7 +91,6 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
display: flex;
flex-direction: column;
padding: 0 $ipb-navigation-menu--middle-part--is-vertical--padding;
@include ipb-scrollbar;
}
// menu entries
@@ -118,10 +107,8 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
// entry wrapper
.ipb-navigation-menu--menu-entry--wrapper {
// entry title
.ipb-navigation-menu--menu-entry--title {
@include ipb-text-overflow-ellipsis;
@extend %common-font-ral-nor-200;
}
}
@@ -140,7 +127,6 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
align-items: center;
column-gap: $ipb-navigation-menu--menu-entry--wrapper--flex-column-gap;
border-radius: $ipb-navigation-menu--menu-entry--border-radius;
@include ipb-transition(#{"background-color, color"});
// entry icon
.ipb-navigation-menu--menu-entry--icon {
@@ -219,21 +205,12 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
.ipb-navigation-menu--user-card--name {
flex-grow: 1;
overflow-x: hidden;
> div {
@include ipb-text-overflow-ellipsis;
}
}
}
}
// MOBILE MENU ////////////////////////////////////////////
// mobile open toggle menu
.ipb-navigation-menu--user-part--toggle--open-mobile-menu {
@include ipb-toggle-nav;
}
// mobile menu overlay
.ipb-navigation-menu-overlay {
display: none;
@@ -380,7 +357,6 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
max-height: 0;
padding: 0 12px;
z-index: 9999;
@include ipb-transition(max-height, ease, 0.5s);
.ipb-navigation-menu--menu-entries {
margin: 15px 0;
@@ -430,11 +406,6 @@ $dropdown-menu--items-remainder--border-radius: $common-border-radius-700 !defau
.ipb-navigation-menu--middle-part {
max-height: 100%;
}
// toggle animation
.ipb-navigation-menu--user-part--toggle--open-mobile-menu {
@include ipb-toggle-nav-animated-cross;
}
}
}
}

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

@@ -51,10 +51,6 @@ body{
.ipb-page--main-header--information--title{
font-size: $ipb-page--main-header--information--title--font-size;
font-weight: bold;
> span ~ span {
@include ipb-following-dot;
}
}
.ipb-page--main-header--information--subtitle{

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

File diff suppressed because one or more lines are too long

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

@@ -1,7 +1,6 @@
@import "utils/variables/path";
@import 'common/main.scss';
@import "utils/all";
@import "mixins";
@import "components/all";
@import "vendors/all";
@import "pages/all";

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

File diff suppressed because one or more lines are too long

13
datamodels/2.x/itop-portal-base/portal/public/css/themes/components/_tile.scss
View File

@@ -21,6 +21,10 @@ $ipb-tile--description--color: $common-base-variable--text-color !default;
.ipb-tile{
background-color: $ipb-tile--background-color;
border: $ipb-tile--border;
&[data-role="navigation-trigger"] {
@include ipb-heavy-animated-border;
}
}
@@ -46,3 +50,12 @@ $ipb-tile--description--color: $common-base-variable--text-color !default;
.ipb-tile--description{
color: $ipb-tile--description--color;
}
.ipb-tile--manage .ipb-tile--title {
> span:first-child {
@include ipb-text-overflow-ellipsis;
}
> span:nth-child(2) {
@include ipb-following-dot;
}
}

42
datamodels/2.x/itop-portal-base/portal/public/css/themes/layout/_navigation-menu.scss
View File

@@ -27,10 +27,28 @@ $ipb-navigation-menu-overlay--backdrop-filter: blur(2px) !default;
.ipb-navigation-menu {
background-color: $ipb-navigation-menu--background-color;
&.ipb-is-expanded {
.ipb-navigation-menu--top-part--toggle--expand-menu {
@include ipb-toggle-nav-animated-chevron-right;
}
}
}
.ipb-navigation-menu--top-part--toggle--expand-menu {
@include ipb-toggle-nav;
}
.ipb-navigation-menu--middle-part {
@include ipb-scrollbar;
}
// entry wrapper
.ipb-navigation-menu--menu-entry--wrapper {
.ipb-navigation-menu--menu-entry--title {
@include ipb-text-overflow-ellipsis;
}
&.active .ipb-navigation-menu--menu-entry {
background-color: $ipb-navigation-menu--menu-entry--active--background-color;
color: $ipb-navigation-menu--menu-entry--active--color;
@@ -45,12 +63,15 @@ $ipb-navigation-menu-overlay--backdrop-filter: blur(2px) !default;
.ipb-navigation-menu--menu-entry,
.ipb-dropdown-menu--items-remainder > li > a {
color: $ipb-navigation-menu--dropdown-menu--items-remainder--color;
@include ipb-transition(#{"background-color, color"});
&:hover, &:focus:not(.ipb-not-focusable) {
color: $ipb-navigation-menu--dropdown-menu--items-remainder--hover--color;
background-color: $ipb-navigation-menu--dropdown-menu--items-remainder--hover--background-color;
}
}
.ipb-dropdown-menu--items-remainder {
background-color: $ipb-navigation-menu--background-color;
}
@@ -64,18 +85,39 @@ $ipb-navigation-menu-overlay--backdrop-filter: blur(2px) !default;
.ipb-navigation-menu--user-card--photo {
background-color: $ipb-navigation-menu--user-card--photo--background-color;
}
.ipb-navigation-menu--user-card--infos {
// username
.ipb-navigation-menu--user-card--name {
> div {
@include ipb-text-overflow-ellipsis;
}
}
}
}
.ipb-navigation-menu-overlay {
background-color: common-adjust-alpha($ipb-navigation-menu-overlay--background-color, $ipb-navigation-menu-overlay--opacity);
backdrop-filter: $ipb-navigation-menu-overlay--backdrop-filter;
}
.ipb-navigation-menu--user-part--toggle--open-mobile-menu {
@include ipb-toggle-nav;
}
@include mobile {
.ipb-body {
.ipb-navigation-menu {
.ipb-navigation-menu--middle-part {
background-color: $ipb-navigation-menu--background-color;
@include ipb-transition(max-height, ease, 0.5s);
}
&.ipb-is-opened {
// toggle animation
.ipb-navigation-menu--user-part--toggle--open-mobile-menu {
@include ipb-toggle-nav-animated-cross;
}
}
}
}

5
datamodels/2.x/itop-portal-base/portal/public/css/themes/layout/_page.scss
View File

@@ -20,8 +20,11 @@ body{
.ipb-page--main-header--information--title{
color: $ipb-page--main-header--information--title--color;
> span ~ span {
@include ipb-following-dot;
}
}
.ipb-page--main-header--information--subtitle {
color: $ipb-page--main-header--information--subtitle--color;
}
}

3
datamodels/2.x/itop-portal-base/portal/public/css/utils/_all.scss
View File

@@ -1,2 +1,3 @@
@import "helpers/all";
@import "variables/all";
@import "variables/all";
@import "mixins/all";

1
datamodels/2.x/itop-portal-base/portal/public/css/mixins.scss → datamodels/2.x/itop-portal-base/portal/public/css/utils/mixins/_all.scss
View File

@@ -3,6 +3,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
/* TODO 3.3.0: move these to individual files */
/* SCSS variables (can be overloaded) */
$ipb-following-dot--size: $common-size-150 !default;
$ipb-following-dot--color: $ipb-color-primary-600 !default;