diff --git a/js/components/dodlogin.js b/js/components/dodlogin.js new file mode 100644 index 00000000..a4d76fb5 --- /dev/null +++ b/js/components/dodlogin.js @@ -0,0 +1,15 @@ +export default { + name: 'dodlogin', + + data: function() { + return { + visible: false, + } + }, + + methods: { + displayNotice: function() { + this.visible = true + }, + }, +} diff --git a/js/index.js b/js/index.js index 5f5a886e..478f9b39 100644 --- a/js/index.js +++ b/js/index.js @@ -6,6 +6,7 @@ import classes from '../styles/atat.scss' import Vue from 'vue/dist/vue' import VTooltip from 'v-tooltip' +import dodlogin from './components/dodlogin' import levelofwarrant from './components/levelofwarrant' import optionsinput from './components/options_input' import multicheckboxinput from './components/multi_checkbox_input' @@ -47,6 +48,7 @@ Vue.mixin(Modal) const app = new Vue({ el: '#app-root', components: { + dodlogin, toggler, levelofwarrant, optionsinput, diff --git a/styles/atat.scss b/styles/atat.scss index bd947aea..7d2b9c87 100644 --- a/styles/atat.scss +++ b/styles/atat.scss @@ -42,6 +42,7 @@ @import 'components/audit_log'; @import 'components/usa_banner'; @import 'components/checklist'; +@import 'components/dod_login_notice.scss'; @import 'sections/login'; @import 'sections/home'; diff --git a/styles/components/_dod_login_notice.scss b/styles/components/_dod_login_notice.scss new file mode 100644 index 00000000..892ddbe1 --- /dev/null +++ b/styles/components/_dod_login_notice.scss @@ -0,0 +1,24 @@ +.dod-login-notice { + background: rgba(0,0,0,.5); + bottom: 0; + left: 0; + overflow: scroll; + padding: $gap*4 0; + position: fixed; + right: 0; + text-align: left; + top: 0; + z-index: 999; + + .usa-alert { + margin: 0 auto; + max-width: $article-max-width + $nav-width; + + a.usa-button, a.usa-button:hover { + -moz-transition: none; + -webkit-transition: none; + -o-transition: color 0 ease-in; + transition: none; + } + } +} diff --git a/styles/elements/_buttons.scss b/styles/elements/_buttons.scss index af167ade..37add3b7 100644 --- a/styles/elements/_buttons.scss +++ b/styles/elements/_buttons.scss @@ -31,3 +31,4 @@ button, box-shadow: inset 0 0 0 1px $color-red-darkest; } } + diff --git a/styles/sections/_login.scss b/styles/sections/_login.scss index a4853230..5236c829 100644 --- a/styles/sections/_login.scss +++ b/styles/sections/_login.scss @@ -19,6 +19,10 @@ max-width: 25rem; margin: ($gap * 2) auto; } + + .login-banner__button { + margin-right: 0; + } } } } diff --git a/templates/fragments/dod_login.html b/templates/fragments/dod_login.html new file mode 100644 index 00000000..c8116c5b --- /dev/null +++ b/templates/fragments/dod_login.html @@ -0,0 +1,35 @@ + +
+ + + +
+
diff --git a/templates/login.html b/templates/login.html index 24a861f1..bdfd63f9 100644 --- a/templates/login.html +++ b/templates/login.html @@ -21,11 +21,7 @@ - - - {{ "login.login_button" | translate }} - - + {% include "fragments/dod_login.html" %} {% with %} diff --git a/translations.yaml b/translations.yaml index 87027761..026326d3 100644 --- a/translations.yaml +++ b/translations.yaml @@ -21,6 +21,7 @@ common: back: Back cancel: Cancel confirm: Confirm + continue: Continue delete_confirm: 'Please type the word DELETE to confirm:' edit: Edit hide: Hide