mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # composer.json # composer.lock # core/email.class.inc.php # css/ui-lightness/jqueryui.scss # lib/bin/php-parse # lib/bin/php-parse.bat # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/composer/platform_check.php # lib/nikic/php-parser/grammar/php7.y # lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Builder/Param.php # lib/nikic/php-parser/lib/PhpParser/Builder/Property.php # lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php # lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php # lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php # lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php # lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php # lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Param.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php # lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php # lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php # lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php # lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php # lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php # test/core/ConfigValidator/iTopConfigAstValidatorTest.php
This commit is contained in:
@@ -4,6 +4,8 @@
|
||||
* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=custom-theme&bgImgOpacityError=18&bgImgOpacityHighlight=75&bgImgOpacityActive=65&bgImgOpacityHover=100&bgImgOpacityDefault=100&bgImgOpacityContent=100&bgImgOpacityHeader=35&cornerRadiusShadow=5px&offsetLeftShadow=-5px&offsetTopShadow=-5px&thicknessShadow=5px&opacityShadow=20&bgImgOpacityShadow=10&bgTextureShadow=flat&bgColorShadow=%23000000&opacityOverlay=50&bgImgOpacityOverlay=20&bgTextureOverlay=diagonals_thick&bgColorOverlay=%23666666&iconColorError=%23ffd27a&fcError=%23ffffff&borderColorError=%23cd0a0a&bgTextureError=diagonals_thick&bgColorError=%23b81900&iconColorHighlight=%231c94c4&fcHighlight=%23363636&borderColorHighlight=%23fed22f&bgTextureHighlight=flat&bgColorHighlight=%23ffe45c&iconColorActive=%23E87C1E&fcActive=%23E87C1E&borderColorActive=%23E87C1E&bgTextureActive=flat&bgColorActive=%23ffffff&iconColorHover=%23E87C1E&fcHover=%23E87C1E&borderColorHover=%23E87C1E&bgTextureHover=flat&bgColorHover=%23fde17c&iconColorDefault=%23F26522&fcDefault=%23555555&borderColorDefault=%23cccccc&bgTextureDefault=flat&bgColorDefault=%23f1f1f1&iconColorContent=%23222222&fcContent=%23333333&borderColorContent=%23dddddd&bgTextureContent=flat&bgColorContent=%23eeeeee&iconColorHeader=%23ffffff&fcHeader=%23ffffff&borderColorHeader=%23F26522&bgTextureHeader=flat&bgColorHeader=%23E87C1E&cornerRadius=0&fwDefault=bold&fsDefault=1.1em&ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif
|
||||
* Copyright jQuery Foundation and other contributors; Licensed MIT
|
||||
* The original css file has been scssized (through www.css2scss.com)
|
||||
*
|
||||
* Other modification done : replaced the `Alpha(` by `alpha(` to avoid warnings generated by SCSSPHP
|
||||
*/
|
||||
.ui-draggable-handle {
|
||||
-ms-touch-action: none;
|
||||
@@ -46,26 +48,27 @@
|
||||
}
|
||||
}
|
||||
.ui-helper-zfix {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
filter: Alpha(Opacity=0);
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
filter: alpha(Opacity=0);
|
||||
}
|
||||
.ui-front {
|
||||
z-index: 100;
|
||||
}
|
||||
.ui-state-disabled {
|
||||
cursor: default !important;
|
||||
pointer-events: none;
|
||||
opacity: .35;
|
||||
filter: Alpha(Opacity=35);
|
||||
background-image: none;
|
||||
.ui-icon {
|
||||
filter: Alpha(Opacity=35);
|
||||
}
|
||||
cursor: default !important;
|
||||
pointer-events: none;
|
||||
opacity: .35;
|
||||
filter: alpha(Opacity=35);
|
||||
background-image: none;
|
||||
|
||||
.ui-icon {
|
||||
filter: alpha(Opacity=35);
|
||||
}
|
||||
}
|
||||
.ui-icon {
|
||||
display: inline-block;
|
||||
@@ -93,7 +96,7 @@
|
||||
height: 100%;
|
||||
// background: #666666 url($approot-relative + "css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=" + $version) 50% 50% repeat;
|
||||
opacity: .5;
|
||||
filter: Alpha(Opacity=50);
|
||||
filter: alpha(Opacity=50);
|
||||
}
|
||||
.ui-resizable {
|
||||
position: relative;
|
||||
@@ -1078,13 +1081,13 @@ body {
|
||||
}
|
||||
.ui-priority-secondary {
|
||||
opacity: .7;
|
||||
filter: Alpha(Opacity=70);
|
||||
filter: alpha(Opacity=70);
|
||||
//font-weight: normal;
|
||||
}
|
||||
.ui-state-disabled {
|
||||
opacity: .35;
|
||||
filter: Alpha(Opacity=35);
|
||||
background-image: none;
|
||||
opacity: .35;
|
||||
filter: alpha(Opacity=35);
|
||||
background-image: none;
|
||||
}
|
||||
.ui-icon {
|
||||
background-image: url($approot-relative + "css/ui-lightness/images/ui-icons_222222_256x240.png?v=" + $version);
|
||||
@@ -1148,13 +1151,13 @@ body {
|
||||
}
|
||||
.ui-priority-secondary {
|
||||
opacity: .7;
|
||||
filter: Alpha(Opacity=70);
|
||||
filter: alpha(Opacity=70);
|
||||
//font-weight: normal;
|
||||
}
|
||||
.ui-state-disabled {
|
||||
opacity: .35;
|
||||
filter: Alpha(Opacity=35);
|
||||
background-image: none;
|
||||
opacity: .35;
|
||||
filter: alpha(Opacity=35);
|
||||
background-image: none;
|
||||
}
|
||||
.ui-icon {
|
||||
background-image: url($approot-relative + "css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=" + $version);
|
||||
@@ -1362,7 +1365,7 @@ a {
|
||||
}
|
||||
.ui-priority-secondary {
|
||||
opacity: .7;
|
||||
filter: Alpha(Opacity=70);
|
||||
filter: alpha(Opacity=70);
|
||||
//font-weight: normal;
|
||||
}
|
||||
.ui-icon-blank {
|
||||
|
||||
Reference in New Issue
Block a user