-
Notifications
You must be signed in to change notification settings - Fork 24
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
ENH Update styles to match new RealME branding #113
ENH Update styles to match new RealME branding #113
Conversation
3d2998b
to
277b0f3
Compare
NOTE: The js test fails because there's no |
client/src/styles/bundle.scss
Outdated
@import 'links'; | ||
@import 'popup'; | ||
@import 'icons'; | ||
// @import 'themes'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
webpack.config.js
Outdated
FILES_PATH: '../', | ||
ROOT: Path.resolve(), | ||
SRC: Path.resolve('client/src'), | ||
DIST: Path.resolve('client/css'), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make it so that uses client/dist (or whatever the standard path is) so that the JS CI jump passes? If you're still concerned about backwards compatibility then add in a copy step that copies to the legacy folder and add a comment in here that it's for BC
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done by building the file twice, since I can't use the webpack copy plugin to copy files after they're built and a cp
in the package.json build script wouldn't be used by CI.
<% if ShowNewWindowIcon %><span class="realme_icon_new_window"></span><% end_if %> <span class="realme_icon_padlock"></span> | ||
<span class="realme_button_login-icon"></span> | ||
<span class="realme_button_login-text"> | ||
$Label <% if ShowNewWindowIcon %><span class="realme_icon_new_window"></span><% end_if %></span> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$Label <% if ShowNewWindowIcon %><span class="realme_icon_new_window"></span><% end_if %></span> | |
$Label <% if $ShowNewWindowIcon %><span class="realme_icon_new_window"></span><% end_if %></span> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't want to touch the stuff that was already there that didn't need changing. But this is effectively a no-change so I'll do it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
277b0f3
to
eb64c7c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have viewed demo of these components on Guys computer
Notes
yml
config from that documentation and then manually slap aSilverStripe\RealMe\Authenticator\LoginForm
somewhere. It won't let you log in that way obviously but a) I couldn't log in either even doing the "mts" thing and b) this is just about styling, so it doesn't matter if you can log in or not.Changes made
Example of change
OLD (default theme)
integration_type set to "login"
integration_type set to "assert"
NEW
integration_type set to "login"
integration_type set to "assert"
Issue