diff --git a/src/main/webapp/app/resources/styles/sass/app.scss b/src/main/webapp/app/resources/styles/sass/app.scss index 320b499b0a..3b91a07909 100644 --- a/src/main/webapp/app/resources/styles/sass/app.scss +++ b/src/main/webapp/app/resources/styles/sass/app.scss @@ -479,19 +479,24 @@ sidebox .heading-text { cursor: pointer; } +// Collapsed content is also made invisible, not just zero height, so that its +// controls drop out of the tab order. Visibility flips only after the collapse +// animation finishes, and immediately when expanding. .sidebox-body { display: block; background-color: #ECECEC; padding: 8px 0 1px; overflow-y: hidden; max-height: 0; - transition: max-height 0.35s ease-out; + visibility: hidden; + transition: max-height 0.35s ease-out, visibility 0s linear 0.35s; } .sidebox-body.expanded { max-height: 5000px; overflow-y: visible; - transition: max-height 0.35s ease-out; + visibility: visible; + transition: max-height 0.35s ease-out, visibility 0s; } .sidebox-sub-heading { @@ -1349,19 +1354,22 @@ input[type=color]:focus { transition: width 0.5s ease-out; } +// Hidden as well as collapsed so a closed pane's controls leave the tab order. .accordion .panel-body { max-height: 0; overflow-y: auto; /* degree codes need scroll overflow: hidden;*/ padding: 0; - -webkit-transition: max-height 0.5s ease-out; - transition: max-height 0.5s ease-out; + visibility: hidden; + -webkit-transition: max-height 0.5s ease-out, visibility 0s linear 0.5s; + transition: max-height 0.5s ease-out, visibility 0s linear 0.5s; } .accordion .panel-body.expanded { max-height: 700px; - -webkit-transition: max-height 0.5s ease-out; - transition: max-height 0.5s ease-out; + visibility: visible; + -webkit-transition: max-height 0.5s ease-out, visibility 0s; + transition: max-height 0.5s ease-out, visibility 0s; } .accordion .panel-body .remove { @@ -1604,8 +1612,9 @@ input[type=color]:focus { .further-filter-by .status-list { max-height: 0; overflow: hidden; - -webkit-transition: max-height 0.5s ease-out; - transition: max-height 0.5s ease-out; + visibility: hidden; + -webkit-transition: max-height 0.5s ease-out, visibility 0s linear 0.5s; + transition: max-height 0.5s ease-out, visibility 0s linear 0.5s; } .further-filter-by .filter:hover { @@ -1620,8 +1629,9 @@ input[type=color]:focus { .further-filter-by .submissiontype-list.expanded, .further-filter-by .status-list.expanded { max-height: 1000px; - -webkit-transition: max-height 0.5s ease-in; - transition: max-height 0.5s ease-in; + visibility: visible; + -webkit-transition: max-height 0.5s ease-in, visibility 0s; + transition: max-height 0.5s ease-in, visibility 0s; } .further-filter-by .document-level, diff --git a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss index 8852b457c4..3e4c1b8366 100644 --- a/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss +++ b/src/main/webapp/app/resources/styles/sass/views/submission/_submissionDialog.scss @@ -116,12 +116,18 @@ ul.dialog-actions-list { color: red; } +// Closed content is made invisible too, so its controls leave the tab order and +// screen readers skip it. Visibility waits for the collapse, but not the expand. .dialog-closed { opacity: 0; max-height: 0; + visibility: hidden; + transition: max-height 0.45s ease-in-out, opacity 0.25s ease-in-out, visibility 0s linear 0.45s; } .dialog-open { opacity: 1; max-height: 5000px; + visibility: visible; + transition: max-height 0.45s ease-in-out, opacity 0.25s ease-in-out, visibility 0s; } diff --git a/src/main/webapp/app/views/admin/info/edit/input-checkbox.html b/src/main/webapp/app/views/admin/info/edit/input-checkbox.html index e3e0f1b490..9d57c0b76f 100644 --- a/src/main/webapp/app/views/admin/info/edit/input-checkbox.html +++ b/src/main/webapp/app/views/admin/info/edit/input-checkbox.html @@ -1,7 +1,7 @@
|
-
-
+
+ |
+
diff --git a/src/main/webapp/app/views/admin/settings/application/lookAndFeel.html b/src/main/webapp/app/views/admin/settings/application/lookAndFeel.html
index c1be2e06da..3496feff1e 100644
--- a/src/main/webapp/app/views/admin/settings/application/lookAndFeel.html
+++ b/src/main/webapp/app/views/admin/settings/application/lookAndFeel.html
@@ -15,6 +15,8 @@
Main Color
@@ -53,6 +55,8 @@
Background Main Color
@@ -85,6 +89,8 @@
Background Highlight Color
@@ -114,6 +120,8 @@
Header Text Color
@@ -143,6 +151,8 @@
Footer Text Color
@@ -183,6 +193,8 @@
Background Main Color
@@ -213,6 +225,8 @@
Background Highlight Color
@@ -245,6 +259,8 @@
Text Color
@@ -287,6 +303,8 @@
Background Main Color
@@ -322,6 +340,8 @@
Background Highlight Color
@@ -354,6 +374,8 @@
Text Color
@@ -393,6 +415,8 @@
Background Main Color
@@ -428,6 +452,8 @@
Background Selected Color
@@ -460,6 +486,8 @@
Main Text Color
@@ -489,6 +517,8 @@
Selected Text Color
@@ -537,11 +567,13 @@
Header Logo
-
diff --git a/src/main/webapp/app/views/admin/settings/organization.html b/src/main/webapp/app/views/admin/settings/organization.html
index ecd0b6e8c9..08c76d7575 100644
--- a/src/main/webapp/app/views/admin/settings/organization.html
+++ b/src/main/webapp/app/views/admin/settings/organization.html
@@ -14,23 +14,29 @@
-
+
|
-
-
+
+
|
|
|---|