mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3150 from nextcloud/highlight-active-navigation 

highlight active navigation entry better, fix #2096
This commit is contained in:
John Molakvoæ 2017-01-19 06:47:30 +01:00 committed by GitHub
parent 2d73a003d7 3798f842c0
commit 2cfedb3623
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/theming/lib/Controller/ThemingController.php
View File

@ -374,6 +374,7 @@ class ThemingController extends Controller {
'; ';
$responseCss .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); $responseCss .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color);
$responseCss .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $responseCss .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color);
$responseCss .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}' . "\n", $color);
} }
$logo = $this->config->getAppValue($this->appName, 'logoMime'); $logo = $this->config->getAppValue($this->appName, 'logoMime');

4
apps/theming/tests/Controller/ThemingControllerTest.php
View File

@ -487,6 +487,7 @@ class ThemingControllerTest extends TestCase {
'; ';
$expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color);
$expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color);
$expectedData .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}' . "\n", $color);
$expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n"; $expectedData .= '.nc-theming-contrast {color: #ffffff}' . "\n";
$expectedData .= '.icon-file,.icon-filetype-text {' . $expectedData .= '.icon-file,.icon-filetype-text {' .
'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" . 'background-image: url(\'./img/core/filetypes/text.svg?v=0\');' . "}\n" .
@ -581,6 +582,7 @@ class ThemingControllerTest extends TestCase {
'; ';
$expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color);
$expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color);
$expectedData .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}' . "\n", $color);
$expectedData .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n"; $expectedData .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n";
$expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n"; $expectedData .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
$expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n"; $expectedData .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
@ -768,6 +770,7 @@ class ThemingControllerTest extends TestCase {
'; ';
$expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color);
$expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color);
$expectedData .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}' . "\n", $color);
$expectedData .= sprintf( $expectedData .= sprintf(
'#header .logo {' . '#header .logo {' .
'background-image: url(\'./logo?v=0\');' . 'background-image: url(\'./logo?v=0\');' .
@ -879,6 +882,7 @@ class ThemingControllerTest extends TestCase {
'; ';
$expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color);
$expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color); $expectedData .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color);
$expectedData .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}' . "\n", $color);
$expectedData .= sprintf( $expectedData .= sprintf(
'#header .logo {' . '#header .logo {' .
'background-image: url(\'./logo?v=0\');' . 'background-image: url(\'./logo?v=0\');' .

2
core/css/apps.scss
View File

@ -1,4 +1,5 @@
/** /**
* @copyright Copyright (c) 2014, Jan-Christoph Borchardt (http://jancborchardt.net)
* @copyright Copyright (c) 2017, John Molakvoæ (skjnldsv@protonmail.com) * @copyright Copyright (c) 2017, John Molakvoæ (skjnldsv@protonmail.com)
* *
* @license GNU AGPL version 3 or any later version * @license GNU AGPL version 3 or any later version
@ -101,6 +102,7 @@ em {
.active, .active,
.active a { .active a {
opacity: 1; opacity: 1;
box-shadow: inset 2px 0 #0082c9;
} }
.collapse { .collapse {
display: none; display: none;