aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontend/src/components/pages/ConfigurationPage.js1
-rw-r--r--frontend/src/components/pages/ConfigurationPage.scss1
-rw-r--r--frontend/src/components/pages/MainPage.js15
-rw-r--r--frontend/src/components/pages/MainPage.scss6
-rw-r--r--frontend/src/components/pages/common.scss3
5 files changed, 11 insertions, 15 deletions
diff --git a/frontend/src/components/pages/ConfigurationPage.js b/frontend/src/components/pages/ConfigurationPage.js
index 8f9b68b..c8646fb 100644
--- a/frontend/src/components/pages/ConfigurationPage.js
+++ b/frontend/src/components/pages/ConfigurationPage.js
@@ -28,7 +28,6 @@ import TextField from "../fields/TextField";
import Header from "../Header";
import LinkPopover from "../objects/LinkPopover";
import "../panels/common.scss";
-import "./common.scss";
import "./ConfigurationPage.scss";
class ConfigurationPage extends Component {
diff --git a/frontend/src/components/pages/ConfigurationPage.scss b/frontend/src/components/pages/ConfigurationPage.scss
index 2ceccd5..6ff933c 100644
--- a/frontend/src/components/pages/ConfigurationPage.scss
+++ b/frontend/src/components/pages/ConfigurationPage.scss
@@ -1,6 +1,7 @@
@import "../../colors";
.configuration-page {
+ height: 100vh;
background-color: $color-primary-0;
.header-title {
diff --git a/frontend/src/components/pages/MainPage.js b/frontend/src/components/pages/MainPage.js
index 5d42f4d..3bf8065 100644
--- a/frontend/src/components/pages/MainPage.js
+++ b/frontend/src/components/pages/MainPage.js
@@ -17,6 +17,7 @@
import React, {Component} from "react";
import {ReflexContainer, ReflexElement, ReflexSplitter} from "react-reflex";
+import "react-reflex/styles.css"
import {Route, Switch} from "react-router-dom";
import Filters from "../dialogs/Filters";
import Header from "../Header";
@@ -28,14 +29,12 @@ import SearchPane from "../panels/SearchPane";
import ServicesPane from "../panels/ServicesPane";
import StreamsPane from "../panels/StreamsPane";
import Timeline from "../Timeline";
-import "./common.scss";
import "./MainPage.scss";
-import 'react-reflex/styles.css'
class MainPage extends Component {
state = {
- timelineHeight: 175
+ timelineHeight: 210
};
handleTimelineResize = (e) => {
@@ -55,10 +54,12 @@ class MainPage extends Component {
return (
<ReflexContainer orientation="horizontal" className="page main-page">
- <ReflexElement className="page-header">
- <Header onOpenFilters={() => this.setState({filterWindowOpen: true})} configured={true}/>
- {modal}
- </ReflexElement>
+ <div className="fuck-css">
+ <ReflexElement className="page-header">
+ <Header onOpenFilters={() => this.setState({filterWindowOpen: true})} configured={true}/>
+ {modal}
+ </ReflexElement>
+ </div>
<ReflexElement className="page-content" flex={1}>
<ReflexContainer orientation="vertical" className="page-content">
diff --git a/frontend/src/components/pages/MainPage.scss b/frontend/src/components/pages/MainPage.scss
index 4fc5853..8d1fa96 100644
--- a/frontend/src/components/pages/MainPage.scss
+++ b/frontend/src/components/pages/MainPage.scss
@@ -1,13 +1,11 @@
@import "../../colors";
.main-page {
- .page-header {
- min-height: 80px;
- }
+ height: 100vh !important;
.page-footer {
overflow: hidden !important;
- min-height: 175px;
+ min-height: 210px;
}
.page-content {
diff --git a/frontend/src/components/pages/common.scss b/frontend/src/components/pages/common.scss
deleted file mode 100644
index 2b0cd05..0000000
--- a/frontend/src/components/pages/common.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.page {
- height: 100vh !important;
-}