diff --git a/app/main.css b/app/main.css index 71d87247..d7f73cad 100644 --- a/app/main.css +++ b/app/main.css @@ -3,7 +3,6 @@ @import './pages/signin/signin.css'; @import './pages/unsupported/unsupported.css'; @import './pages/welcome/welcome.css'; -@import './templates/activeBackground/activeBackground.css'; @import './templates/downloadButton/downloadButton.css'; @import './templates/downloadPassword/downloadPassword.css'; @import './templates/file/file.css'; diff --git a/app/routes/index.js b/app/routes/index.js index ede0a11c..86caf891 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -5,7 +5,6 @@ const download = require('./download'); const footer = require('../templates/footer'); const fxPromo = require('../templates/fxPromo'); const signupPromo = require('../templates/signupPromo'); -const activeBackground = require('../templates/activeBackground'); const fileList = require('../templates/fileList'); const profile = require('../templates/userAccount'); const modal = require('../templates/modal'); @@ -29,7 +28,7 @@ module.exports = function() { function body(template) { return function(state, emit) { - const b = html` + const b = html` ${modalDialog(state, emit)} ${banner(state, emit)}
diff --git a/app/templates/activeBackground/activeBackground.css b/app/templates/activeBackground/activeBackground.css deleted file mode 100644 index de7ef2d7..00000000 --- a/app/templates/activeBackground/activeBackground.css +++ /dev/null @@ -1,14 +0,0 @@ -.background { - background-position: center center; - background-repeat: no-repeat; - background-attachment: fixed; - background-size: cover; -} - -.background_1 { - background-image: url('../assets/background_1.jpg'); -} - -.background_2 { - background-image: url('../assets/background_2.jpg'); -} diff --git a/app/templates/activeBackground/index.js b/app/templates/activeBackground/index.js deleted file mode 100644 index a4b7e4c2..00000000 --- a/app/templates/activeBackground/index.js +++ /dev/null @@ -1,12 +0,0 @@ -const assets = require('../../../common/assets'); - -module.exports = function(state) { - if (!state.backgroundClass) { - const backgrounds = assets.match(/background_/); - state.backgroundClass = `background_${Math.floor( - Math.random() * backgrounds.length - ) + 1}`; - } - - return state.backgroundClass; -}; diff --git a/app/templates/footer/footer.css b/app/templates/footer/footer.css index 42d371dc..2de2518f 100644 --- a/app/templates/footer/footer.css +++ b/app/templates/footer/footer.css @@ -19,18 +19,13 @@ } .legalSection__link { - color: #fff; - text-shadow: 0 0 3px #000; + color: var(--lightTextColor); white-space: nowrap; margin-right: 2vw; } -.legalSection__link:visited { - color: #ededf0; -} - .legalSection__link:hover { - color: #d7d7db; + color: var(--textColor); } .footer__mozLogo { @@ -46,13 +41,13 @@ } .feedback { - background-color: var(--primaryControlBGColor); + background-color: #000; background-image: url('../assets/feedback.svg'); background-position: 2px 4px; background-repeat: no-repeat; background-size: 18px; border-radius: 3px; - border: 1px solid var(--primaryControlBGColor); + border: 1px solid #000; color: var(--primaryControlFGColor); cursor: pointer; display: block; @@ -67,15 +62,6 @@ white-space: nowrap; } -.feedback:hover, -.feedback:focus { - min-width: 30px; - max-width: 300px; - text-indent: 2px; - padding: 5px 5px 5px 20px; - background-color: var(--primaryControlHoverColor); -} - .feedback:active { background-color: var(--primaryControlHoverColor); } diff --git a/assets/background_1.jpg b/assets/background_1.jpg deleted file mode 100644 index 1742afeb..00000000 Binary files a/assets/background_1.jpg and /dev/null differ diff --git a/assets/background_2.jpg b/assets/background_2.jpg deleted file mode 100644 index 1742afeb..00000000 Binary files a/assets/background_2.jpg and /dev/null differ