Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Status.im theme #5578

Merged
merged 57 commits into from Nov 13, 2017

Conversation

@ara4n
Copy link
Member

ara4n commented Nov 11, 2017

Land the long-lived Status.im theme branch. Obviously this should ideally be split up into PRs, but unfortunately life is too short atm :/

Twinned with matrix-org/matrix-react-sdk#1605

Stuff to be aware of here:

  • Completely refactors and consolidates the CSS for buttons (using a SCSS mixin rather than an CSS class)
  • Complete rewrites the Tinter to handle tintable themes
  • Might introduce regressions into the default Riot theme where refactoring happened in order to incorporate the Status theme.
ara4n and others added 26 commits Oct 20, 2017
WIP
>
> as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered
coc
@turt2live

This comment has been minimized.

Copy link
Member

turt2live commented on 50b348c Oct 26, 2017

ooi, what does this end up looking like?

Figured it out:
image

image

ara4n added 3 commits Oct 26, 2017
ara4n and others added 21 commits Oct 27, 2017
@ara4n ara4n referenced this pull request Nov 11, 2017
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
"disable_3pid_login": false,

This comment has been minimized.

Copy link
@turt2live

turt2live Nov 12, 2017

Member

Note to self: These should be pulled into GranularSettings when it lands

This comment has been minimized.

Copy link
@turt2live

turt2live Nov 13, 2017

Member

decided to not make these granular - they are app-level anyways and affect people who aren't logged in, so granularity isn't feasible.

- e.g. if we replace `Login.js` with `StatusLogin.js`, then we should similarly be able to replace `_Login.scss` with `_StatusLogin.scss`.

random thoughts;
- should we be able to change the entire skin at runtime (more like wordpress) - to the extent of replacing entire components?

This comment has been minimized.

Copy link
@MTRNord

MTRNord Nov 12, 2017

Contributor

What about color pickers for now? Not like just tint but changing different parts of the Design without needing to change the code

@@ -250,16 +251,20 @@ async function loadApp() {

if (!preventRedirect) {
if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
window.location = "https://status.im/join-riot.html";

This comment has been minimized.

Copy link
@MTRNord

MTRNord Nov 12, 2017

Contributor

Won't that cause problems for selfhosted Riots?

This comment has been minimized.

Copy link
@betz

betz Nov 12, 2017

thanks for noticing this.
Yes, please don't hijack people

This comment has been minimized.

Copy link
@ara4n

ara4n Nov 12, 2017

Author Member

heh, looks like this crept in whilst my back was turned. of course it’s not meant to be there; will turn it into a config options. thanks!

This comment has been minimized.

Copy link
@MTRNord

MTRNord Nov 12, 2017

Contributor

@ara4n Note a few lines below this is the same line again ;)

ara4n added 2 commits Nov 13, 2017
@ara4n

This comment has been minimized.

Copy link
Member Author

ara4n commented Nov 13, 2017

@dbkr LGTMed this at high level OOB, so merging. It'll probably break everything, but y'all should be testing /staging for 0.13.0-rc2 anyway, and I want to give @turt2live a chance to merge it to his GranularSettings tonight (and then merge that too).

@ara4n ara4n merged commit 557fd8f into develop Nov 13, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.