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

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source 
# Conflicts:
#	composer.json
#	css/light-grey.scss
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
This commit is contained in:
Molkobain
2020-09-08 17:30:32 +02:00
parent 46fe1661db b5cfd1c61e
commit 8193ada159
144 changed files with 19950 additions and 1687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
css/css-variables.scss
View File

@@ -15,10 +15,7 @@
*
* You should have received a copy of the GNU Affero General Public License
*/
// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
$version: "v2.8.0";
$approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
$approot-relative: "../../../../" !default; // relative to env-***/branding/themes/***/main.css
// Base colors
$gray-base: #000 !default;
@@ -127,3 +124,8 @@ $highlight-item-color: $white !default;
$content-color: #eeeeee !default;
$default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
$icons-filter: hue-rotate(0deg) !default;
%font-awesome-prerequisites{
font-family: 'Font Awesome 5 Free';
font-weight: 600;
}

29
css/light-grey.scss
View File

@@ -3157,15 +3157,34 @@
}
.sort_none {
background: url($approot-relative + "images/bg.gif?v=" + $version) no-repeat center;
padding-right: 5px;
&::after {
@extend %font-awesome-prerequisites;
text-align: right;
content: '\f0dc';
color: $complement-color;
float: right;
}
}
.sort_asc {
background: url($approot-relative + "images/desc.gif?v=" + $version) no-repeat center;
padding-right: 5px;
&::after {
@extend %font-awesome-prerequisites;
text-align: right;
content: '\f0d8';
color: $complement-color;
float: right;
}
}
.sort_desc {
background: url($approot-relative + "images/asc.gif?v=" + $version) no-repeat center;
padding-right: 5px;
&::after {
@extend %font-awesome-prerequisites;
text-align: right;
content: '\f0d7';
color: $complement-color;
float: right;
}
}
.sort_hidden {