Theming: Fix missing color usage by juliusknorr · Pull Request #771 · nextcloud/server

juliusknorr · 2016-08-08T17:08:28Z

Theming: colorize primary buttons
Remove internal from getThemingDefaults, maybe @LukasReschke can check if that makes sense
Theming: colorize jquery ui elements jQuery UI not affected by Theming #830
Theming: fix federated sharing button color
federated sharing button text color / custom logo

requires #1026

jancborchardt · 2016-08-25T08:31:52Z

cc @Mar1u5 @nickvergessen @nextcloud/designers @nextcloud/theming please help reviewing :)

juliusknorr · 2016-08-25T08:35:01Z

@jancborchardt still not complete for review ;) - we need #1026 for all the remaining theming pull requests. But i'll rebase this one later today and make it ready.

juliusknorr · 2016-08-25T13:36:18Z

CI is happy, ready for review @nextcloud/designers @nextcloud/theming

I've included #1026 for easier testing, will rebase to master once this is merged.

nickvergessen · 2016-08-25T14:24:52Z

apps/federatedfilesharing/settings-personal.php

+$theme = \OC::$server->query("ThemingDefaults");
+$color = $theme->getMailHeaderColor();
+$textColor = "#ffffff";
+if($theme instanceof \OCA\Theming\ThemingDefaults) {


This will throw an Exception if the theming app is disabled.

@nickvergessen Hmm, I've disabled it, but there was no Exception for me.

Sould I just check if the app is enabled like this:

if(\OC::$server->getAppManager()->isEnabledForUser("theming")) { ...

Yeah that's better since it's more explicit.

juliusknorr · 2016-08-25T14:48:51Z

@nickvergessen Thanks for the comments. I've just pushed an update.

nickvergessen · 2016-08-25T14:56:53Z

apps/federatedfilesharing/settings-personal.php

+$textColor = "#ffffff";
+if(\OC::$server->getAppManager()->isEnabledForUser("theming")) {
+	$logoPath = $theme->getLogo();
+	$util = \OC::$server->query("\OCA\Theming\Util");


This could throw an exception OCP\AppFramework\QueryException, better catch it so the page still displayes 😉

juliusknorr · 2016-08-25T18:25:05Z

@nickvergessen ok, i've added a try-catch-block as well.

oparoz · 2016-08-26T07:32:00Z

Does that fix media type icons? That's the biggest problem right now.

LukasReschke · 2016-08-26T07:37:03Z

@oparoz #840

oparoz · 2016-08-26T07:42:46Z

Awesome, thanks.

rullzer · 2016-08-26T09:53:57Z

#1026 is in. @juliushaertl can you rebase?

juliusknorr · 2016-08-26T10:09:04Z

@rullzer done.

nickvergessen · 2016-08-26T10:40:43Z

👍 works and looks nice. Thanks!

nickvergessen · 2016-08-26T10:42:38Z

apps/federatedfilesharing/templates/settings-personal.php

@@ -66,7 +65,7 @@ class='js-gs-share social-gnu'>
 			<?php p($l->t('HTML Code:')); ?>
 			<xmp><a target="_blank" rel="noreferrer" href="<?php p($_['reference']); ?>"
 	style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;">


You forgot to use the colors here? It still uses blue+white instead of what the preview shows.

Ah also forgot to apply the style changes here. I'll fix that.

@nickvergessen ok, i've updated the html code as well.

nickvergessen · 2016-08-26T11:39:39Z

Second review, @rullzer ?

rullzer · 2016-08-26T13:02:17Z

LGTM

juliusknorr added enhancement 2. developing Work in progress feature: theming labels Aug 8, 2016

juliusknorr added this to the Nextcloud 11.0 milestone Aug 8, 2016

juliusknorr mentioned this pull request Aug 10, 2016

jQuery UI not affected by Theming #830

Closed

juliusknorr force-pushed the theming-fixes branch from f3edbbc to 1debc12 Compare August 10, 2016 20:07

jancborchardt mentioned this pull request Aug 11, 2016

All theming issues still to be fixed #454

Closed

10 tasks

This was referenced Aug 19, 2016

Should the primary button have the color of the theming app? #985

Closed

Theming: Add logo and background to ThemingDefaults #1026

Merged

juliusknorr force-pushed the theming-fixes branch from 1debc12 to 6e98c8b Compare August 25, 2016 10:54

juliusknorr added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 25, 2016

juliusknorr force-pushed the theming-fixes branch 2 times, most recently from 6870e43 to 6b68f3b Compare August 25, 2016 11:19

nickvergessen reviewed Aug 25, 2016
View reviewed changes

juliusknorr force-pushed the theming-fixes branch from 6b68f3b to f753839 Compare August 25, 2016 14:48

nickvergessen reviewed Aug 25, 2016
View reviewed changes

juliusknorr force-pushed the theming-fixes branch from f753839 to 64179d3 Compare August 25, 2016 18:22

juliusknorr added 2 commits August 26, 2016 12:07

Theming: fix federated sharing button color

a7c5f1b

Remove internal from getThemingDefaults

fdab008

juliusknorr added 2 commits August 26, 2016 12:07

Theming: colorize primary buttons

2b0ed6c

Theming: Adjust jquery ui elements

218e2f7

juliusknorr force-pushed the theming-fixes branch from 64179d3 to 4573df4 Compare August 26, 2016 10:08

nickvergessen reviewed Aug 26, 2016
View reviewed changes

Make federadedfilesharing button match the theming values

a7273f1

juliusknorr force-pushed the theming-fixes branch from 4573df4 to a7273f1 Compare August 26, 2016 10:52

rullzer merged commit 53725d4 into master Aug 26, 2016

rullzer deleted the theming-fixes branch August 26, 2016 13:02

juliusknorr mentioned this pull request Sep 14, 2016

Theming: coloring of folders and log in background #378

Closed

MorrisJobke mentioned this pull request Sep 21, 2016

Release review polishing #735

Closed

67 tasks

MorrisJobke mentioned this pull request Aug 18, 2017

jQuery UI tabs should match the Nextcloud tab style #1090

Closed

Uh oh!

Conversation

juliusknorr commented Aug 8, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jancborchardt commented Aug 25, 2016

Uh oh!

juliusknorr commented Aug 25, 2016

Uh oh!

juliusknorr commented Aug 25, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Aug 25, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Aug 25, 2016

Uh oh!

oparoz commented Aug 26, 2016

Uh oh!

LukasReschke commented Aug 26, 2016

Uh oh!

oparoz commented Aug 26, 2016

Uh oh!

rullzer commented Aug 26, 2016

Uh oh!

juliusknorr commented Aug 26, 2016

Uh oh!

nickvergessen commented Aug 26, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nickvergessen commented Aug 26, 2016

Uh oh!

rullzer commented Aug 26, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

juliusknorr commented Aug 8, 2016 •

edited

Loading