Merge branch 'develop' into feature/fast-theme-compilation

This commit is contained in:
odain-cbd
2020-08-07 16:12:47 +02:00
committed by GitHub
358 changed files with 6357 additions and 4182 deletions

View File

@@ -15,6 +15,10 @@
*
* 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
// Base colors
@@ -115,6 +119,9 @@ $primary-text-color: #333333 !default;
$secondary-text-color: $grey-color !default;
$error-text-color: $white !default;
$highlight-text-color: #363636 !default;
$button-content-background-color: $gray-extra-light !default;
$button-header-background-color: $gray-extra-light !default;
$main-menu-background-color: $gray-extra-light !default;
$hover-background-color: #fde17c !default;
$border-highlight-color: $brand-primary-dark !default;
$highlight-item-color: $white !default;

View File

@@ -1,7 +0,0 @@
/**
This was the file containing the rules of Font Awesome v4. Kept for scripts that included it directly.
@deprecated 2.7.0 N°2269, use /css/font-awesome/css/all.min.css instead (Font Awesome v5)
*/
@import "all.min.css";
@import "v4-shims.min.css";

File diff suppressed because one or more lines are too long

View File

@@ -2690,7 +2690,7 @@ td.prop_icon {
font-size: 16px;
text-decoration: none;
}
.dashlet-content .display_block {
.main_header h1 {
text-align:left;
}
.dashlet-unknown, .dashlet-proxy {
@@ -3903,4 +3903,64 @@ input:checked + .slider:before {
}
.ui-dialog .ui-dialog-content .treecontrol a {
font-size: small;
}
}
/*for autocomplete*/
.ui-autocomplete {
padding: 0px;
background-color: white;
overflow: hidden;
z-index: 99999;
/*for scrollbar*/
max-height: 180px;
overflow-y: auto;
/* prevent horizontal scrollbar */
overflow-x: hidden;
ul {
width: 100%;
list-style-position: outside;
list-style: none;
padding: 0;
margin: 0;
}
li.ui-menu-item {
margin: 0px;
padding: 2px 5px;
white-space: nowrap;
padding-right: 20px; /* Space for the scrollbar */
cursor: default;
display: block;
/*
if width will be 100% horizontal scrollbar will apear
when scroll mode will be used
*/
/*width: 100%;*/
font: menu;
font-size: 12px;
/*
it is very important, if line-height not setted or setted
in relative units scroll will be broken in firefox
*/
line-height: 16px;
overflow: hidden;
&:nth-child(odd) {
background-color: #eee;
}
&.ui-state-focus {
background-color: #0A246A;
border-color: #0A246A;
color: white;
}
}
}
.field_autocomplete
{
background: #fff url($approot-relative + "images/ac-background.gif?v=" + $version) no-repeat right;
border: 1px solid black;
&:focus{
border: 2px solid black;
}
}

View File

@@ -1024,7 +1024,7 @@ body {
}
.ui-state-default {
border: 1px solid #cccccc;
background: #f1f1f1;
background: $button-content-background-color;
font-weight: bold;
color: $secondary-text-color;
}
@@ -1092,7 +1092,7 @@ body {
}
.ui-state-default {
border: 1px solid #cccccc;
background: #f1f1f1;
background: $button-header-background-color;
font-weight: bold;
color: $secondary-text-color;
}
@@ -1152,7 +1152,7 @@ body {
}
.ui-state-default {
border: 1px solid #cccccc;
background: #f1f1f1;
background: $main-menu-background-color;
font-weight: bold;
color: $secondary-text-color;
a {