diff --git a/services/web/app/views/beta_program/opt_in.pug b/services/web/app/views/beta_program/opt_in.pug index 411301f15e..3e08d27643 100644 --- a/services/web/app/views/beta_program/opt_in.pug +++ b/services/web/app/views/beta_program/opt_in.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container.beta-opt-in-wrapper .row .col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2 diff --git a/services/web/app/views/general/400.pug b/services/web/app/views/general/400.pug index 6abb0634dc..74f0182c33 100644 --- a/services/web/app/views/general/400.pug +++ b/services/web/app/views/general/400.pug @@ -5,7 +5,7 @@ block vars block body body.full-height - main.content.content-alt.full-height + main.content.content-alt.full-height#main-content .container.full-height .error-container.full-height .error-details diff --git a/services/web/app/views/general/404.pug b/services/web/app/views/general/404.pug index 90bd544a7a..aa749166af 100644 --- a/services/web/app/views/general/404.pug +++ b/services/web/app/views/general/404.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .error-container .error-details diff --git a/services/web/app/views/general/500.pug b/services/web/app/views/general/500.pug index bd74d947b3..a2f66d0a4f 100644 --- a/services/web/app/views/general/500.pug +++ b/services/web/app/views/general/500.pug @@ -5,7 +5,7 @@ block vars block body body.full-height - main.content.content-alt.full-height + main.content.content-alt.full-height#main-content .container.full-height .error-container.full-height .error-details diff --git a/services/web/app/views/general/account-merge-error.pug b/services/web/app/views/general/account-merge-error.pug index 4f8e4725cb..44ee6b1511 100644 --- a/services/web/app/views/general/account-merge-error.pug +++ b/services/web/app/views/general/account-merge-error.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3 diff --git a/services/web/app/views/general/closed.pug b/services/web/app/views/general/closed.pug index 112ef7b1d1..ee56d89097 100644 --- a/services/web/app/views/general/closed.pug +++ b/services/web/app/views/general/closed.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content + main.content#main-content .container .row .col-md-8.col-md-offset-2.text-center diff --git a/services/web/app/views/general/post-gateway.pug b/services/web/app/views/general/post-gateway.pug index 04d223fdbd..8be63d516d 100644 --- a/services/web/app/views/general/post-gateway.pug +++ b/services/web/app/views/general/post-gateway.pug @@ -3,6 +3,7 @@ extends ../layout block vars - var suppressNavbar = true - var suppressFooter = true + - var suppressSkipToContent = true block content script(type="template", id="gateway-data")!= StringHelper.stringifyJsonForScript({ params: form_data }) diff --git a/services/web/app/views/general/unsupported-browser.pug b/services/web/app/views/general/unsupported-browser.pug index 2859edbd5c..1d36d30fdf 100644 --- a/services/web/app/views/general/unsupported-browser.pug +++ b/services/web/app/views/general/unsupported-browser.pug @@ -5,7 +5,7 @@ block vars block body body.full-height - main.content.content-alt.full-height + main.content.content-alt.full-height#main-content .container.full-height .error-container.full-height .error-details diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index 085eb3447c..aa73207736 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -107,6 +107,8 @@ html( if(settings.recaptcha && settings.recaptcha.siteKeyV3) script(type="text/javascript", nonce=scriptNonce, src="https://www.recaptcha.net/recaptcha/api.js?render="+settings.recaptcha.siteKeyV3) + if (typeof(suppressSkipToContent) == "undefined") + a(class="skip-to-content" href="#main-content") #{translate('skip_to_content')} if (typeof(suppressNavbar) == "undefined") include layout/navbar diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index 97aa494119..36b87d1bc7 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -3,6 +3,7 @@ extends ../layout block vars - var suppressNavbar = true - var suppressFooter = true + - var suppressSkipToContent = true - metadata.robotsNoindexNofollow = true block _headLinks diff --git a/services/web/app/views/project/importing.pug b/services/web/app/views/project/importing.pug index 4674b7b3e2..6d62114806 100644 --- a/services/web/app/views/project/importing.pug +++ b/services/web/app/views/project/importing.pug @@ -3,6 +3,7 @@ extends ../layout block vars - var suppressNavbar = true - var suppressFooter = true + - var suppressSkipToContent = true - metadata.robotsNoindexNofollow = true block content diff --git a/services/web/app/views/project/invite/not-valid.pug b/services/web/app/views/project/invite/not-valid.pug index a9b8731405..15f5599a85 100644 --- a/services/web/app/views/project/invite/not-valid.pug +++ b/services/web/app/views/project/invite/not-valid.pug @@ -1,7 +1,7 @@ extends ../../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-8.col-md-offset-2 @@ -15,4 +15,4 @@ block content .row.text-center.actions .col-md-12 a.btn.btn-info(href="/project") #{translate("back_to_your_projects")} - \ No newline at end of file + diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug index f56416be75..9b759bc76f 100644 --- a/services/web/app/views/project/invite/show.pug +++ b/services/web/app/views/project/invite/show.pug @@ -1,7 +1,7 @@ extends ../../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-8.col-md-offset-2 diff --git a/services/web/app/views/project/list.pug b/services/web/app/views/project/list.pug index c2c8a7f1ea..ea7cbc4b59 100644 --- a/services/web/app/views/project/list.pug +++ b/services/web/app/views/project/list.pug @@ -16,7 +16,7 @@ block append meta block content - main.content.content-alt.project-list-page( + main.content.content-alt.project-list-page#main-content( ng-controller="ProjectPageController" role="main" ) diff --git a/services/web/app/views/subscriptions/canceled_subscription.pug b/services/web/app/views/subscriptions/canceled_subscription.pug index 300a671eb8..5d8c6e4bea 100644 --- a/services/web/app/views/subscriptions/canceled_subscription.pug +++ b/services/web/app/views/subscriptions/canceled_subscription.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-8.col-md-offset-2 diff --git a/services/web/app/views/subscriptions/dashboard.pug b/services/web/app/views/subscriptions/dashboard.pug index aa12cc46db..574e902548 100644 --- a/services/web/app/views/subscriptions/dashboard.pug +++ b/services/web/app/views/subscriptions/dashboard.pug @@ -14,7 +14,7 @@ block append meta meta(name="ol-recomendedCurrency" content=personalSubscription.recurly.currency) block content - main.content.content-alt(ng-cloak) + main.content.content-alt#main-content(ng-cloak) .container .row .col-md-8.col-md-offset-2 diff --git a/services/web/app/views/subscriptions/new.pug b/services/web/app/views/subscriptions/new.pug index e9921bc1a6..b4e58512e2 100644 --- a/services/web/app/views/subscriptions/new.pug +++ b/services/web/app/views/subscriptions/new.pug @@ -9,7 +9,7 @@ block head-scripts script(type="text/javascript", nonce=scriptNonce, src="https://js.recurly.com/v4/recurly.js") block content - main.content.content-alt + main.content.content-alt#main-content .container(ng-controller="NewSubscriptionController" ng-cloak) .row.card-group .col-md-5.col-md-push-4 diff --git a/services/web/app/views/subscriptions/plans.pug b/services/web/app/views/subscriptions/plans.pug index c3e0695e23..1db7c400ec 100644 --- a/services/web/app/views/subscriptions/plans.pug +++ b/services/web/app/views/subscriptions/plans.pug @@ -11,7 +11,7 @@ block append meta meta(name="ol-groupPlans" data-type="json" content=groupPlans) block content - .content.content-alt + main.content.content-alt#main-content .container .user-notifications ul.list-unstyled(ng-cloak) @@ -21,7 +21,7 @@ block content span To help you work from home throughout 2021, we're providing discounted plans and special initiatives. .notification-action a.btn.btn-sm.btn-info(href="https://www.overleaf.com/events/wfh2021" event-tracking="Event-Pages" event-tracking-trigger="click" event-tracking-ga="WFH-Offer-Click" event-tracking-label="Plans-Banner") Upgrade - main.content-page + .content-page .plans(ng-controller="PlansController") .container(ng-cloak) .row diff --git a/services/web/app/views/subscriptions/successful_subscription.pug b/services/web/app/views/subscriptions/successful_subscription.pug index 771739e3d0..384358a30f 100644 --- a/services/web/app/views/subscriptions/successful_subscription.pug +++ b/services/web/app/views/subscriptions/successful_subscription.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-8.col-md-offset-2 diff --git a/services/web/app/views/subscriptions/team/invite.pug b/services/web/app/views/subscriptions/team/invite.pug index 70d8234489..40f19a8703 100644 --- a/services/web/app/views/subscriptions/team/invite.pug +++ b/services/web/app/views/subscriptions/team/invite.pug @@ -5,7 +5,7 @@ block append meta meta(name="ol-inviteToken" content=inviteToken) block content - main.content.content-alt.team-invite + main.content.content-alt.team-invite#main-content .container .row .col-md-8.col-md-offset-2 diff --git a/services/web/app/views/subscriptions/upgradeToAnnual.pug b/services/web/app/views/subscriptions/upgradeToAnnual.pug index 07993df507..cb13bcc535 100644 --- a/services/web/app/views/subscriptions/upgradeToAnnual.pug +++ b/services/web/app/views/subscriptions/upgradeToAnnual.pug @@ -2,7 +2,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container(ng-controller="AnnualUpgradeController") .row(ng-cloak) .col-md-6.col-md-offset-3 @@ -22,5 +22,3 @@ block content div(ng-show="upgradeComplete") h3 #{translate("annual_billing_enabled")}, #{translate("thank_you")}. - - diff --git a/services/web/app/views/user/confirm_email.pug b/services/web/app/views/user/confirm_email.pug index a42f29e741..6b0453a7ab 100644 --- a/services/web/app/views/user/confirm_email.pug +++ b/services/web/app/views/user/confirm_email.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 diff --git a/services/web/app/views/user/login.pug b/services/web/app/views/user/login.pug index 19361f6dbc..f4a4b4f69b 100644 --- a/services/web/app/views/user/login.pug +++ b/services/web/app/views/user/login.pug @@ -4,7 +4,7 @@ block vars - metadata = { viewport: true } block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 diff --git a/services/web/app/views/user/logout.pug b/services/web/app/views/user/logout.pug index e889cad9d4..a22c833983 100644 --- a/services/web/app/views/user/logout.pug +++ b/services/web/app/views/user/logout.pug @@ -5,7 +5,7 @@ block vars block content .content.content-alt - main.login-register-container + main.login-register-container#main-content .card.login-register-card .login-register-header h1.login-register-header-heading #{translate("log_out")} diff --git a/services/web/app/views/user/one_time_login.pug b/services/web/app/views/user/one_time_login.pug index ae5c7252eb..c57d7cddc4 100644 --- a/services/web/app/views/user/one_time_login.pug +++ b/services/web/app/views/user/one_time_login.pug @@ -4,7 +4,7 @@ block vars - metadata = { viewport: true } block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 diff --git a/services/web/app/views/user/passwordReset.pug b/services/web/app/views/user/passwordReset.pug index cd8075193d..12c09f1cc7 100644 --- a/services/web/app/views/user/passwordReset.pug +++ b/services/web/app/views/user/passwordReset.pug @@ -16,7 +16,7 @@ block content data-badge="inline" ) - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug index e91cf4c10a..551ef09dfc 100644 --- a/services/web/app/views/user/reconfirm.pug +++ b/services/web/app/views/user/reconfirm.pug @@ -14,7 +14,7 @@ block content data-badge="inline" ) - main.content.content-alt + main.content.content-alt#main-content .container .row .col-sm-12.col-md-6.col-md-offset-3 diff --git a/services/web/app/views/user/register.pug b/services/web/app/views/user/register.pug index e2b0eda23f..38c4e5fd4a 100644 --- a/services/web/app/views/user/register.pug +++ b/services/web/app/views/user/register.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .registration_message diff --git a/services/web/app/views/user/restricted.pug b/services/web/app/views/user/restricted.pug index bad2e4e44b..1e87a835a8 100644 --- a/services/web/app/views/user/restricted.pug +++ b/services/web/app/views/user/restricted.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content + main.content#main-content .container .row .col-md-8.col-md-offset-2.text-center @@ -10,4 +10,4 @@ block content p a(href="/") i.fa.fa-arrow-circle-o-left(aria-hidden="true") - | #{translate("take_me_home")} \ No newline at end of file + | #{translate("take_me_home")} diff --git a/services/web/app/views/user/sessions.pug b/services/web/app/views/user/sessions.pug index 4ab511ae4c..315aa06ae1 100644 --- a/services/web/app/views/user/sessions.pug +++ b/services/web/app/views/user/sessions.pug @@ -6,7 +6,7 @@ block append meta block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2 diff --git a/services/web/app/views/user/setPassword.pug b/services/web/app/views/user/setPassword.pug index a0e1541783..2e5c10a455 100644 --- a/services/web/app/views/user/setPassword.pug +++ b/services/web/app/views/user/setPassword.pug @@ -4,7 +4,7 @@ block append meta meta(name="ol-passwordStrengthOptions" data-type="json" content=settings.passwordStrengthOptions) block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4 diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index 2e86894ffc..0b501ad824 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -8,7 +8,7 @@ block append meta meta(name="ol-thirdPartyIds", data-type="json", content=thirdPartyIds) block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-12.col-lg-10.col-lg-offset-1 diff --git a/services/web/app/views/user_membership/index.pug b/services/web/app/views/user_membership/index.pug index 28cab5b782..ee0583e52b 100644 --- a/services/web/app/views/user_membership/index.pug +++ b/services/web/app/views/user_membership/index.pug @@ -6,7 +6,7 @@ block append meta meta(name="ol-groupSize", data-type="json", content=groupSize) block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-10.col-md-offset-1 diff --git a/services/web/app/views/user_membership/new.pug b/services/web/app/views/user_membership/new.pug index 6eaf399c8f..30543da2e9 100644 --- a/services/web/app/views/user_membership/new.pug +++ b/services/web/app/views/user_membership/new.pug @@ -1,7 +1,7 @@ extends ../layout block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-10.col-md-offset-1 diff --git a/services/web/frontend/stylesheets/components/navbar.less b/services/web/frontend/stylesheets/components/navbar.less index 12427c3e53..29d03a7873 100755 --- a/services/web/frontend/stylesheets/components/navbar.less +++ b/services/web/frontend/stylesheets/components/navbar.less @@ -585,3 +585,27 @@ padding: @navbar-default-padding-v 0; } } + +// Accessibility +.skip-to-content { + color: @navbar-default-link-color; + background-color: @navbar-default-link-bg; + border: 2px solid transparent; + border-radius: @navbar-btn-border-radius; + font-size: @navbar-btn-font-size; + font-weight: @navbar-btn-font-weight; + left: @navbar-brand-width + @padding-lg; + line-height: @navbar-btn-line-height; + padding: @navbar-btn-padding; + position: absolute; + top: -200px; + z-index: @zindex-navbar + 1; + + &:focus { + background-color: @navbar-default-link-hover-bg; + border: 2px solid @navbar-default-link-hover-color; + color: @white; + text-decoration: none; + top: @navbar-default-padding-v; + } +} diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 4e89277399..d200dd2932 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1478,5 +1478,6 @@ "page_current": "Page __page__, Current Page", "go_page": "Go to page __page__", "pagination_navigation": "Pagination Navigation", - "can_now_relink_dropbox": "You can now <0>relink your Dropbox account." + "can_now_relink_dropbox": "You can now <0>relink your Dropbox account.", + "skip_to_content": "Skip to content" } diff --git a/services/web/modules/user-activate/app/views/user/activate.pug b/services/web/modules/user-activate/app/views/user/activate.pug index 7b7b32d7e1..69ca0d0652 100644 --- a/services/web/modules/user-activate/app/views/user/activate.pug +++ b/services/web/modules/user-activate/app/views/user/activate.pug @@ -4,7 +4,7 @@ block append meta meta(name="ol-passwordStrengthOptions" data-type="json" content=settings.passwordStrengthOptions) block content - main.content.content-alt + main.content.content-alt#main-content .container .row .col-md-6.col-md-offset-3.col-lg-4.col-lg-offset-4