upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #10924 from nextcloud/bugfix/10901/theming-bugfix-primary

Browse source 
Fix SCSS variable management with the theming app
This commit is contained in:
Julius Härtl 2018-08-30 17:35:40 +02:00 committed by GitHub
commit 25857c4900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/accessibility/lib/Controller/AccessibilityController.php
View file

@ -149,8 +149,8 @@ class AccessibilityController extends Controller {
try {
$css .= $scss->compile(
$imports .
'@import "variables.scss";' .
$this->getInjectedVariables() .
'@import "variables.scss";' .
'@import "css-variables.scss";'
);
} catch (ParserException $e) {

5
apps/theming/css/theming.scss
View file

@ -71,6 +71,11 @@
@include icon-color('checkbox-mark', 'actions', $color-white, 1, true);
}
}
#body-user {
.primary {
border: 1px solid transparent;
}
}
} @else {
#appmenu:not(.inverted) svg {
filter: none;

2
apps/theming/lib/Util.php
View file

@ -79,7 +79,7 @@ class Util {
public function elementColor($color) {
$l = $this->calculateLuminance($color);
if($l>0.8) {
return '#555555';
return '#dddddd';
}
return $color;
}

2
apps/theming/tests/CapabilitiesTest.php
View file

@ -74,7 +74,7 @@ class CapabilitiesTest extends TestCase {
'slogan' => 'slogan',
'color' => '#FFFFFF',
'color-text' => '#000000',
'color-element' => '#555555',
'color-element' => '#dddddd',
'logo' => 'http://absolute/logo',
'background' => 'http://absolute/background',
'background-plain' => false,

2
apps/theming/tests/UtilTest.php
View file

@ -105,7 +105,7 @@ class UtilTest extends TestCase {
public function testElementColorOnBrightBackground() {
$elementColor = $this->util->elementColor('#ffffff');
$this->assertEquals('#555555', $elementColor);
$this->assertEquals('#dddddd', $elementColor);
}
public function testGenerateRadioButtonWhite() {

4
core/css/variables.scss
View file

@ -38,8 +38,8 @@ $color-main-background: #fff !default;
$color-background-dark: nc-darken($color-main-background, 7%) !default;
$color-background-darker: nc-darken($color-main-background, 14%) !default;
$color-primary: #0082c9;
$color-primary-text: #ffffff;
$color-primary: #0082c9 !default;
$color-primary-text: #ffffff !default;
// do not use nc-darken/lighten in case of overriding because
// primary-text is independent of color-main-text
$color-primary-text-dark: darken($color-primary-text, 7%) !default;

4
lib/private/Template/SCSSCacher.php
View file

@ -284,9 +284,9 @@ class SCSSCacher {
try {
$compiledScss = $scss->compile(
'$webroot: \'' . $this->getRoutePrefix() . '\';' .
$this->getInjectedVariables() .
'@import "variables.scss";' .
'@import "functions.scss";' .
$this->getInjectedVariables() .
'@import "' . $fileNameSCSS . '";');
} catch (ParserException $e) {
$this->logger->error($e, ['app' => 'core']);
@ -349,7 +349,7 @@ class SCSSCacher {
}
$variables = '';
foreach ($this->defaults->getScssVariables() as $key => $value) {
$variables .= '$' . $key . ': ' . $value . ';';
$variables .= '$' . $key . ': ' . $value . ' !default;';
}
// check for valid variables / otherwise fall back to defaults