Skip to content

Commit

Permalink
Feature/material redesign (apereo#4730)
Browse files Browse the repository at this point in the history
* Updated markup for material design

* Updated markup for standard login flow

* Fixed pathing using webjars

* Updated password reset to use material design

* Updated error pages with material design

* Applied recent CAS changes to material theme

* Updated fragments on login page

* Updated error screens

* Added label to button

* Removed close buttons from alerts

* Updated consent view with material

* Updated passwordless screens with material

* Fixed th:text for button labels

* Updated GUA views with material design

* Updated MFA screens with material design

* Updated skin

* Added additional MFA page

* Updated misc pages with material

* Updated protocol screens with material design

* Updated buttons

Co-authored-by: apereocas-bot <[email protected]>
Co-authored-by: Misagh Moayyed <[email protected]>
  • Loading branch information
3 people authored Feb 29, 2020
1 parent 66c53c5 commit fe612d3
Show file tree
Hide file tree
Showing 82 changed files with 2,623 additions and 13,585 deletions.
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@ fontAwesomeVersion=5.12.0
jqueryUiVersion=1.12.1
jqueryVersion=3.4.1
zxcvbnVersion=4.4.2
bootstrapVersion=4.4.1-1
bootstrapVersion=4.4.1
datatablesVersion=1.10.20
bootstrapSelectVersion=1.13.11
mdiFontVersion=4.8.95
materialVersion=4.0.0
normalizeVersion=8.0.1
9 changes: 9 additions & 0 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3789,6 +3789,15 @@ ext.libraries = [
exclude(group: "org.webjars", module: "jquery")
exclude(group: "org.webjars", module: "bootstrap")
force = true
},
dependencies.create("org.webjars.npm:material-components-web:$materialVersion") {
force = true
},
dependencies.create("org.webjars.npm:mdi__font:$mdiFontVersion") {
force = true
},
dependencies.create("org.webjars.npm:normalize.css:$normalizeVersion") {
force = true
}
]
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
cas.standard.css.file=/css/cas.css
cas.javascript.file=/js/cas.js
cas.standard.js.file=/js/cas.js

webjars.normalize.css=/webjars/normalize.css/8.0.1/normalize.css
webjars.zxcvbn.js=/webjars/zxcvbn/dist/zxcvbn.js
webjars.headmin.js=/webjars/headjs/1.0.3/head.min.js
webjars.jquery.js=/webjars/jquery/3.4.1/jquery.min.js
webjars.bootstrap-grid.css=/webjars/bootstrap/4.4.1/css/bootstrap-grid.min.css
webjars.material-components.js=/webjars/material-components-web/4.0.0/dist/material-components-web.js
webjars.material-components.css=/webjars/material-components-web/4.0.0/dist/material-components-web.css
webjars.mdi-font.css=/webjars/mdi__font/4.8.95/css/materialdesignicons.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ screen.pm.reset.sentInstructions=You should shortly receive an email with follow
screen.pm.reset.sent=Password Reset Instructions Sent Successfully.
screen.pm.reset.title=Reset your password
screen.pm.reset.instructions=Please provide your username. You will receive an email with follow-up instructions on how to reset your password.
screen.pm.reset.answer=Answer {0}
screen.pm.password.policyViolation=Password does not match the password policy requirement.
screen.pm.password.confirmMismatch=Passwords do not match.
screen.pm.password.strength=Strength:
Expand Down
Loading

0 comments on commit fe612d3

Please sign in to comment.