Skip to content

Commit

Permalink
MERGE: Merge branch '7.2' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@kdambekalns
kdambekalns committed Sep 29, 2021
2 parents 494c065 + dbebebc commit 024a192
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 29 deletions.
1 change: 0 additions & 1 deletion Neos.ContentRepository/Tests/Functional/Domain/Fixtures/RelatedEntity.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?php
namespace Neos\ContentRepository\Tests\Functional\Domain\Fixtures;

use Doctrine\ORM\Mapping as ORM;
use Neos\Flow\Annotations as Flow;

/**
Expand Down
1 change: 0 additions & 1 deletion Neos.Fusion/Tests/Functional/FusionObjects/Fixtures/TypeConverter/TestModelConverter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Flow\Property\PropertyMappingConfigurationInterface;
use Neos\Flow\Property\TypeConverter\AbstractTypeConverter;
use Neos\Fusion\Tests\Functional\FusionObjects\Fixtures\Model\TestModel;
Expand Down
1 change: 0 additions & 1 deletion Neos.Fusion/Tests/Functional/FusionObjects/Fixtures/TypeConverter/TestModelSerializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Flow\Property\PropertyMappingConfigurationInterface;
use Neos\Flow\Property\TypeConverter\AbstractTypeConverter;
use Neos\Fusion\Tests\Functional\FusionObjects\Fixtures\Model\TestModel;
Expand Down
1 change: 0 additions & 1 deletion Neos.Fusion/Tests/Functional/FusionObjects/Fixtures/WrappedNestedObjectRenderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Fusion\FusionObjects\AbstractArrayFusionObject;

/**
Expand Down
1 change: 0 additions & 1 deletion ...sion/Tests/Functional/Parser/Fixtures/Dsl/FusionObjectExpressionTestDslImplementation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Fusion\Core\DslInterface;

class FusionObjectExpressionTestDslImplementation implements DslInterface
Expand Down
1 change: 0 additions & 1 deletion Neos.Fusion/Tests/Functional/Parser/Fixtures/Dsl/PassthroughTestDslImplementation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Fusion\Core\DslInterface;

class PassthroughTestDslImplementation implements DslInterface
Expand Down
1 change: 0 additions & 1 deletion Neos.Fusion/Tests/Functional/View/Fixtures/TestRenderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* source code.
*/

use Neos\Flow\Annotations as Flow;
use Neos\Fusion\FusionObjects\AbstractArrayFusionObject;

/**
Expand Down
14 changes: 14 additions & 0 deletions Neos.Media.Browser/Resources/Private/Styles/Media/_Media.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,26 @@

&.neos-active {
background-color: #fff;

.neos-media-assetsource-icon {
filter: invert(.5) sepia(1) saturate(5) hue-rotate(175deg);
}

&:hover {
.neos-media-assetsource-icon {
filter: none;
}
}
}

&:not(.neos-active) {
&:hover {
background-color: #fff;
color: $blue;

.neos-media-assetsource-icon {
filter: invert(.5) sepia(1) saturate(5) hue-rotate(175deg);
}
}

&.neos-drag-active::after {
Expand Down
26 changes: 18 additions & 8 deletions Neos.Media.Browser/Resources/Public/Styles/MediaBrowser.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,17 +284,22 @@
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a.neos-active {
background-color: #fff;
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a.neos-active .neos-media-assetsource-icon {
filter: invert(0.5) sepia(1) saturate(5) hue-rotate(175deg);
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a.neos-active:hover .neos-media-assetsource-icon {
filter: none;
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a:not(.neos-active):hover {
background-color: #fff;
color: #00b5ff;
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a:not(.neos-active):hover .neos-media-assetsource-icon {
filter: invert(0.5) sepia(1) saturate(5) hue-rotate(175deg);
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a:not(.neos-active).neos-drag-active::after {
position: static;
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a > img {
width: 16px;
height: 16px;
}
.neos.media-browser .neos-media-content.neos-media-aside-condensed .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a > span {
background-color: #fff;
color: #00b5ff;
Expand Down Expand Up @@ -406,17 +411,22 @@
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a.neos-active {
background-color: #fff;
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a.neos-active .neos-media-assetsource-icon {
filter: invert(0.5) sepia(1) saturate(5) hue-rotate(175deg);
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a.neos-active:hover .neos-media-assetsource-icon {
filter: none;
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a:not(.neos-active):hover {
background-color: #fff;
color: #00b5ff;
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a:not(.neos-active):hover .neos-media-assetsource-icon {
filter: invert(0.5) sepia(1) saturate(5) hue-rotate(175deg);
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a:not(.neos-active).neos-drag-active::after {
position: static;
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a > img {
width: 16px;
height: 16px;
}
.neos.media-browser .neos-media-content .neos-media-aside .neos-media-aside-group .neos-media-aside-list li > a > span {
background-color: #fff;
color: #00b5ff;
Expand Down
5 changes: 4 additions & 1 deletion Neos.Media.Browser/Resources/Public/Styles/MediaBrowser.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Neos.Neos/Classes/Service/IconNameMappingService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class IconNameMappingService
'header' => 'fas fa-heading',
'heart-o' => 'far fa-heart',
'hospital-o' => 'far fa-hospital',
'hotel' => 'fas fa-bed',
'hotel' => 'fas fa-hotel',
'hourglass-1' => 'fas fa-hourglass-start',
'hourglass-2' => 'fas fa-hourglass-half',
'hourglass-3' => 'fas fa-hourglass-end',
Expand Down
5 changes: 1 addition & 4 deletions Neos.Neos/Tests/Functional/Controller/Backend/BackendControllerSecurityTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function indexActionIsGrantedForAdministrator()
{
$backendRedirectionServiceMock = $this->getMockBuilder(BackendRedirectionService::class)->getMock();
$backendRedirectionServiceMock
->expects(self::any())
->expects(self::atLeastOnce())
->method('getAfterLoginRedirectionUri')
->willReturn('http://localhost/');

Expand All @@ -44,9 +44,6 @@ public function indexActionIsGrantedForAdministrator()
$account = $this->authenticateRoles(['Neos.Neos:Administrator']);
$account->setAccountIdentifier('admin');
$this->browser->request('http://localhost/neos/login');

// dummy assertion to avoid PHPUnit warning
self::assertTrue(true);
}

/**
Expand Down
14 changes: 7 additions & 7 deletions Neos.Neos/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
"description": "An open source Content Application Platform based on Flow. A set of core Content Management features is resting within a larger context that allows you to build a perfectly customized experience for your users.",
"require": {
"php": "^7.3 || ^8.0",
"neos/diff": "~7.1.0",
"neos/flow": "~7.1.0",
"neos/media-browser": "~7.1.0",
"neos/diff": "*",
"neos/flow": "*",
"neos/media-browser": "*",
"neos/party": "*",
"neos/twitter-bootstrap": "*",
"neos/content-repository": "~7.1.0",
"neos/fusion": "~7.1.0",
"neos/content-repository": "*",
"neos/fusion": "*",
"neos/fusion-afx": "*",
"neos/fusion-form": "^1.0 || ^2.0",
"neos/fluid-adaptor": "~7.1.0",
"neos/fluid-adaptor": "*",
"behat/transliterator": "~1.0",
"neos/media": "~7.1.0"
"neos/media": "*"
},
"suggest": {
"neos/site-kickstarter": "Helps with creating new site packages for Neos.",
Expand Down
2 changes: 1 addition & 1 deletion Neos.SiteKickstarter/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"neos/flow": "*",
"neos/utility-files": "*",
"neos/fluid-adaptor": "*",
"neos/kickstarter": "~7.1.0",
"neos/kickstarter": "*",

"neos/content-repository": "self.version"
},
Expand Down

0 comments on commit 024a192

Please sign in to comment.