From 5835068c75dc07fef196836b655b50bb882ec200 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Tue, 30 Apr 2019 10:29:20 -0400 Subject: [PATCH] Use more specific naming --- js/components/{fullpagenotice.js => dodlogin.js} | 2 +- js/index.js | 4 ++-- styles/atat.scss | 2 +- .../{_full_page_notice.scss => _dod_login_notice.scss} | 2 +- templates/fragments/{dod_notice.html => dod_login.html} | 6 +++--- templates/login.html | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename js/components/{fullpagenotice.js => dodlogin.js} (86%) rename styles/components/{_full_page_notice.scss => _dod_login_notice.scss} (92%) rename templates/fragments/{dod_notice.html => dod_login.html} (94%) diff --git a/js/components/fullpagenotice.js b/js/components/dodlogin.js similarity index 86% rename from js/components/fullpagenotice.js rename to js/components/dodlogin.js index eb58db8e..a4d76fb5 100644 --- a/js/components/fullpagenotice.js +++ b/js/components/dodlogin.js @@ -1,5 +1,5 @@ export default { - name: 'fullpagenotice', + name: 'dodlogin', data: function() { return { diff --git a/js/index.js b/js/index.js index 7cfcb56e..a4c5ae79 100644 --- a/js/index.js +++ b/js/index.js @@ -6,7 +6,7 @@ import classes from '../styles/atat.scss' import Vue from 'vue/dist/vue' import VTooltip from 'v-tooltip' -import fullpagenotice from './components/fullpagenotice' +import dodlogin from './components/dodlogin' import levelofwarrant from './components/levelofwarrant' import optionsinput from './components/options_input' import multicheckboxinput from './components/multi_checkbox_input' @@ -47,7 +47,7 @@ Vue.mixin(Modal) const app = new Vue({ el: '#app-root', components: { - fullpagenotice, + dodlogin, toggler, levelofwarrant, optionsinput, diff --git a/styles/atat.scss b/styles/atat.scss index 40cc5bbc..7d2b9c87 100644 --- a/styles/atat.scss +++ b/styles/atat.scss @@ -42,7 +42,7 @@ @import 'components/audit_log'; @import 'components/usa_banner'; @import 'components/checklist'; -@import 'components/full_page_notice.scss'; +@import 'components/dod_login_notice.scss'; @import 'sections/login'; @import 'sections/home'; diff --git a/styles/components/_full_page_notice.scss b/styles/components/_dod_login_notice.scss similarity index 92% rename from styles/components/_full_page_notice.scss rename to styles/components/_dod_login_notice.scss index 6f40fd2a..b2f08d9e 100644 --- a/styles/components/_full_page_notice.scss +++ b/styles/components/_dod_login_notice.scss @@ -1,4 +1,4 @@ -.full-page-notice { +.dod-login-notice { background: rgba(0,0,0,.5); bottom: 0; left: 0; diff --git a/templates/fragments/dod_notice.html b/templates/fragments/dod_login.html similarity index 94% rename from templates/fragments/dod_notice.html rename to templates/fragments/dod_login.html index 6f9b5670..3db4879e 100644 --- a/templates/fragments/dod_notice.html +++ b/templates/fragments/dod_login.html @@ -1,10 +1,10 @@ - +
-
+ - + diff --git a/templates/login.html b/templates/login.html index 67549734..bdfd63f9 100644 --- a/templates/login.html +++ b/templates/login.html @@ -21,7 +21,7 @@ - {% include "fragments/dod_notice.html" %} + {% include "fragments/dod_login.html" %}
{% with %}