From fed4a7d31341e3b642456eec5a911f12a8207e63 Mon Sep 17 00:00:00 2001 From: Emiliano Ciavatta Date: Sat, 9 May 2020 15:31:14 +0200 Subject: Fix css style errors --- frontend/src/colors.scss | 28 +++++++++++++------------- frontend/src/components/Connection.scss | 2 +- frontend/src/components/ConnectionContent.scss | 4 +--- frontend/src/index.scss | 17 ++++++++-------- frontend/src/views/App.scss | 2 +- frontend/src/views/Connections.js | 2 +- frontend/src/views/Connections.scss | 6 +----- frontend/src/views/Header.scss | 2 +- frontend/src/views/MainPane.scss | 2 -- 9 files changed, 29 insertions(+), 36 deletions(-) diff --git a/frontend/src/colors.scss b/frontend/src/colors.scss index 244e869..ba0da55 100644 --- a/frontend/src/colors.scss +++ b/frontend/src/colors.scss @@ -1,19 +1,19 @@ -$color-primary-0: #17223B; // Main Primary color */ -$color-primary-1: #040B1B; -$color-primary-2: #0F192E; -$color-primary-3: #1D2841; -$color-primary-4: #EAEAEA; +$color-primary-0: #17223b; // Main Primary color */ +$color-primary-1: #040b1b; +$color-primary-2: #0f192e; +$color-primary-3: #1d2841; +$color-primary-4: #eaeaea; -$color-secondary-0: #FF6767; -$color-secondary-1: #A20A0A; -$color-secondary-2: #DF3030; -$color-secondary-3: #FF9D9D; -$color-secondary-4: #FFDFDF; +$color-secondary-0: #ff6767; +$color-secondary-1: #a20a0a; +$color-secondary-2: #df3030; +$color-secondary-3: #ff9d9d; +$color-secondary-4: #ffdfdf; $color-blue: #247085; -$color-blue-light: #A5B8BE; -$color-blue-dark: #013B4C; +$color-blue-light: #a5b8be; +$color-blue-dark: #013b4c; -$color-green: #25965D; -$color-green-light: #CDE4D8; +$color-green: #25965d; +$color-green-light: #cde4d8; $color-green-dark: #004321; \ No newline at end of file diff --git a/frontend/src/components/Connection.scss b/frontend/src/components/Connection.scss index 5ad195d..d3003bd 100644 --- a/frontend/src/components/Connection.scss +++ b/frontend/src/components/Connection.scss @@ -58,4 +58,4 @@ .arrow::after { border-right-color: $color-primary-4; } -} +} \ No newline at end of file diff --git a/frontend/src/components/ConnectionContent.scss b/frontend/src/components/ConnectionContent.scss index 074d975..61d9f63 100644 --- a/frontend/src/components/ConnectionContent.scss +++ b/frontend/src/components/ConnectionContent.scss @@ -5,7 +5,6 @@ height: 100%; overflow: auto; - pre { background-color: $color-primary-0; padding: 10px 20px; @@ -23,6 +22,5 @@ background-color: $color-primary-3; border-top: 1px solid $color-primary-1; } - } -} \ No newline at end of file +} diff --git a/frontend/src/index.scss b/frontend/src/index.scss index b7f0cf4..c93d4b4 100644 --- a/frontend/src/index.scss +++ b/frontend/src/index.scss @@ -22,7 +22,6 @@ pre { font-size: 14px; } - .btn { border-radius: 0; background-color: $color-primary-2; @@ -33,12 +32,14 @@ pre { padding: 5px 12px; font-weight: 500; - &:hover, &:active { + &:hover, + &:active { background-color: $color-primary-1; color: $color-primary-4; } - &:focus, &:active { + &:focus, + &:active { outline: none !important; box-shadow: none !important; } @@ -128,6 +129,10 @@ a { } } +textarea.form-control { + resize: none; +} + input.form-control, textarea.form-control { background-color: $color-primary-2; border: none; @@ -153,14 +158,10 @@ input.form-control, textarea.form-control { } } -textarea.form-control { - resize: none; -} - .table { color: $color-primary-4; } .text-muted { color: $color-primary-4 !important; -} +} \ No newline at end of file diff --git a/frontend/src/views/App.scss b/frontend/src/views/App.scss index 2ee17ac..d5813f9 100644 --- a/frontend/src/views/App.scss +++ b/frontend/src/views/App.scss @@ -1,2 +1,2 @@ .app { -} \ No newline at end of file +} diff --git a/frontend/src/views/Connections.js b/frontend/src/views/Connections.js index 400f4e0..1eeaede 100644 --- a/frontend/src/views/Connections.js +++ b/frontend/src/views/Connections.js @@ -25,7 +25,7 @@ class Connections extends Component { this.handleScroll = this.handleScroll.bind(this); } - + componentDidMount() { this.loadConnections({limit: this.queryLimit, hidden: this.state.showHidden}); } diff --git a/frontend/src/views/Connections.scss b/frontend/src/views/Connections.scss index 6d2de3f..7d561a9 100644 --- a/frontend/src/views/Connections.scss +++ b/frontend/src/views/Connections.scss @@ -4,7 +4,6 @@ background-color: $color-primary-3; padding: 0 10px; position: relative; - height: 100%; overflow: auto; @@ -27,7 +26,6 @@ border-top: 3px solid $color-primary-3; border-bottom: 3px solid $color-primary-3; font-size: 13.5px; - position: sticky; top: 10px; padding: 5px; @@ -36,6 +34,4 @@ &:hover::-webkit-scrollbar-thumb { background: $color-secondary-2; } - - -} \ No newline at end of file +} diff --git a/frontend/src/views/Header.scss b/frontend/src/views/Header.scss index 0c524e6..e5040d8 100644 --- a/frontend/src/views/Header.scss +++ b/frontend/src/views/Header.scss @@ -15,4 +15,4 @@ margin: 5px 0; text-align: right; } -} \ No newline at end of file +} diff --git a/frontend/src/views/MainPane.scss b/frontend/src/views/MainPane.scss index d0d25b1..20720ba 100644 --- a/frontend/src/views/MainPane.scss +++ b/frontend/src/views/MainPane.scss @@ -1,8 +1,6 @@ .main-pane { - .pane { height: calc(100vh - 210px); position: relative; } - } -- cgit v1.2.3-70-g09d2