From 0da65164d683ea62daecc41f5a9b4b3794af0267 Mon Sep 17 00:00:00 2001 From: Magnus Lindberg Date: Fri, 22 Nov 2024 08:29:07 +0100 Subject: [PATCH] Removed inline styling on login page --- static/js/chart.js | 2 -- static/js/nodes.js | 1 - static/main-v2.css | 64 ++++++++++++++++++++++++++++++++-------------- views/login.ecr | 12 ++++----- 4 files changed, 51 insertions(+), 28 deletions(-) diff --git a/static/js/chart.js b/static/js/chart.js index 28ba50a1d9..97640b18e5 100644 --- a/static/js/chart.js +++ b/static/js/chart.js @@ -11,8 +11,6 @@ Chart.register(Tooltip) Chart.register(Title) Chart.register(Filler) -//const chartColors = ['#003f5c', '#ffa600', '#665191', '#a05195', '#d45087', '#f95d6a', '#ff7c43', '#2f4b7c', - //'#EE6868', '#2F6497', '#6C8893'] const chartColors = ['#54be7e', '#4589ff', '#d12771', '#d2a106', '#08bdba', '#bae6ff', '#ba4e00', '#d4bbff', '#8a3ffc', '#33b1ff', '#007d79'] diff --git a/static/js/nodes.js b/static/js/nodes.js index cced159715..22df7f4c9a 100644 --- a/static/js/nodes.js +++ b/static/js/nodes.js @@ -28,7 +28,6 @@ function update (cb) { function render (data) { document.querySelector('#version').textContent = data[0].applications[0].version - console.log(document.querySelector('#version')) for (const node of data) { updateDetails(node) updateStats(node) diff --git a/static/main-v2.css b/static/main-v2.css index 3d019c5772..c6a396dbf1 100644 --- a/static/main-v2.css +++ b/static/main-v2.css @@ -39,7 +39,7 @@ --bg-color-darkest: #181818; --bg-color-dark: #1D1D1D; --separator-color: rgba(185, 185, 185, 0.507); - --border-color-lightest: rgb(247 245 242 / 0.1); + --border-color-light: rgb(247 245 242 / 0.1); --bg-green-dark: #54BE7E; } @@ -75,20 +75,6 @@ a:hover { } /* Base end */ -/* Login page */ -body.login { - display: block; -} - -body.login main { - min-height: 100vh; - margin: 0 auto; - width: 100%; - min-width: 100%; - max-width: 100%; -} -/* Login page end */ - /* Form */ .field-label { color: var(--font-color-light); @@ -481,6 +467,46 @@ header h2 { } /* Buttons end */ +/* Login page */ +body.login { + display: block; +} + +body.login main { + min-height: 100vh; + margin: 0 auto; + width: 100%; + min-width: 100%; + max-width: 100%; +} + +.login-logo { + width: 140px; + margin-bottom: 48px; +} + +.login-label { + text-align: left; + margin-bottom: 8px; + display: none !important; +} + +.login-input { + width: auto !important; + border-radius: 8px !important; + padding: 1rem 1rem !important; +} + +.login-btn { + width: 100%; + margin-left: 0 !important; + font-size: 1rem; + padding: 1rem 1rem; + line-height: 1.5rem; + margin-top: 24px; +} +/* Login page end */ + /* Components */ .page-title { font-size: 18px; @@ -503,14 +529,14 @@ header h2 { } .regular-card { - border: 1px solid var(--border-color-lightest); + /*border: 1px solid var(--border-color-light);*/ padding: 1rem 1.5rem 1.5rem; border-radius: 0.75rem; background-color: var(--bg-color-dark); } .tb-card { - border: 1px solid var(--border-color-lightest); + /*border: 1px solid var(--border-color-light);*/ padding: 0; border-radius: 0.75rem; background-color: var(--bg-color-dark); @@ -559,7 +585,7 @@ header h2 { font-size: 1rem; line-height: 1.25rem; padding: 1rem 1.5rem; - border-bottom: 1px solid var(--border-color-lightest); + border-bottom: 1px solid var(--border-color-light); margin-bottom: 0; } @@ -729,7 +755,7 @@ footer .logo { border-radius: 0.75rem; padding: 1.75rem 1.5rem; align-items: center; - border: 1px solid var(--border-color-lightest); + /*border: 1px solid var(--border-color-light);*/ background-color: var(--bg-color-dark); } diff --git a/views/login.ecr b/views/login.ecr index 0a4ab370fd..d6d232e231 100644 --- a/views/login.ecr +++ b/views/login.ecr @@ -13,17 +13,17 @@