Lynn's Styles changes #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added new images and changed the “Password” resource string to just Password (from Current Password - there is already a current password resource string).
Changed the login text string to use Sign in
Changed the icon to use a X icon for closing the config menu
The color of the warning should be sufficient to attract the user’s attention to view warnings.
# Conflicts: # src/main/webapp/WEB-INF/jsp/configmanager-login.jsp # src/main/webapp/WEB-INF/jsp/fragment/header-warnings.jsp # src/main/webapp/WEB-INF/jsp/login-passwordonly.jsp # src/main/webapp/WEB-INF/jsp/peoplesearch.jsp # src/main/webapp/private/index.jsp # src/main/webapp/public/resources/js/configmanager.js
this will be maintained in SVN
Conflicts: src/main/resources/password/pwm/i18n/Display.properties src/main/resources/password/pwm/i18n/Display_de.properties src/main/resources/password/pwm/i18n/Display_fi.properties src/main/resources/password/pwm/i18n/Display_fr.properties src/main/resources/password/pwm/i18n/Display_nn.properties src/main/resources/password/pwm/i18n/Display_no.properties src/main/resources/password/pwm/i18n/Display_pt_BR.properties src/main/resources/password/pwm/i18n/Display_sv.properties src/main/webapp/WEB-INF/jsp/configmanager-login.jsp src/main/webapp/WEB-INF/jsp/fragment/header-warnings.jsp src/main/webapp/WEB-INF/jsp/fragment/header.jsp src/main/webapp/WEB-INF/jsp/login-passwordonly.jsp src/main/webapp/WEB-INF/jsp/login.jsp src/main/webapp/WEB-INF/jsp/peoplesearch.jsp src/main/webapp/private/index.jsp src/main/webapp/public/resources/js/configmanager.js src/main/webapp/public/resources/mobileStyle.css src/main/webapp/public/resources/style.css
|
The following needs to be addressed prior to merge.
|
Conflicts: src/main/webapp/private/index.jsp
Changed the default style so the default icons come from font-awesome. Also fixed the footer so when you resize the window, the footer doesn't flow behind the tiles.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes jsp, css, and js file changes. I’ve tested to confirm the mobile layout is good, too.
@jrivard please review and merge :)