diff --git a/core/static/core/colors.scss b/core/static/core/colors.scss index 6d6337b8..9ed493ba 100644 --- a/core/static/core/colors.scss +++ b/core/static/core/colors.scss @@ -37,8 +37,4 @@ $deepblue: #354a5f; @mixin shadow { box-shadow: rgba(60, 64, 67, 0.3) 0 1px 3px 0, rgba(60, 64, 67, 0.15) 0 4px 8px 3px; -} - - -$pinktober: hsl(313, 88%, 76%); -$pinktober-secondary: hsl(318, 83%, 63%); \ No newline at end of file +} \ No newline at end of file diff --git a/core/static/core/header.scss b/core/static/core/header.scss index 7fffefee..7eca52f9 100644 --- a/core/static/core/header.scss +++ b/core/static/core/header.scss @@ -8,15 +8,9 @@ $background-color-hovered: #283747; $red-text-color: #eb2f06; $hovered-red-text-color: #ff4d4d; -/** - * Behold the dirtiest css I wrote in a while. - * I had less than an hour to do it, and it will be removed - * in two weeks anyway - */ - - .header { box-sizing: border-box; + background-color: $deepblue; box-shadow: 3px 3px 3px 0 #dfdfdf; border-radius: 0; width: 100%; @@ -26,28 +20,6 @@ $hovered-red-text-color: #ff4d4d; padding: 10px; gap: 10px; - - // PINKTOBER - background-color: $pinktober; - border-bottom: 5px solid $pinktober-secondary; - .header-lang { - input { - background-color: $pinktober!important; - - } - } - form input[type="text"].header-input { - background-color: $pinktober-secondary!important; - color: black!important; - - } - *, .right * { - color: #050525; - &:hover { - color: #303060; - } - } - @media (max-width: 700px) { height: auto; } @@ -243,7 +215,7 @@ $hovered-red-text-color: #ff4d4d; background-position: center center; background-size: cover; background-repeat: no-repeat; - //background-color: $deepblue; + background-color: $deepblue; } >.options { @@ -261,11 +233,11 @@ $hovered-red-text-color: #ff4d4d; } >a { - //color: $text-color; - // - //&:hover { - // color: $hovered-text-color; - //} + color: $text-color; + + &:hover { + color: $hovered-text-color; + } } } @@ -282,13 +254,14 @@ $hovered-red-text-color: #ff4d4d; a, button { font-size: 100%; + margin: 0; text-align: right; - //color: $text-color; - margin: auto 0 0; + color: $text-color; + margin-top: auto; - //&:hover { - // color: $hovered-text-color; - //} + &:hover { + color: $hovered-text-color; + } } form#logout-form { @@ -443,12 +416,12 @@ $hovered-red-text-color: #ff4d4d; border-radius: 5px; font-size: .9em; margin: 0; - background-color: $pinktober-secondary; + background-color: $background-color-hovered; padding: 0 10px; - //color: $text-color; + color: $text-color; &::placeholder { - color: black; + color: $hovered-text-color; } } } diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss index 9ccab2f7..9b77bf77 100644 --- a/core/static/core/navbar.scss +++ b/core/static/core/navbar.scss @@ -3,7 +3,7 @@ $desktop-size: 500px; nav.navbar { - background-color: $pinktober-secondary; + background-color: $primary-dark-color; margin: 1em; color: white; border-radius: 0.6em; diff --git a/core/templates/core/base/header.jinja b/core/templates/core/base/header.jinja index 3438ff68..cb47a47c 100644 --- a/core/templates/core/base/header.jinja +++ b/core/templates/core/base/header.jinja @@ -1,9 +1,6 @@