Skip to content

Commit

Permalink
Tighten UI Proportions (#1767)
Browse files Browse the repository at this point in the history
* Adjust proportions

* Ensure contents don't touch the bottom of the viewport
  • Loading branch information
alexpaxton authored Dec 6, 2018
1 parent 83c23c8 commit 0abac38
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions ui/src/dashboards/components/VEO.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
@import 'src/style/modules';

.veo {
width: calc(100% - 60px);
height: calc(100% - 30px);
width: calc(100% - #{$ix-marg-e});
height: calc(100% - #{$ix-marg-d});
margin: 0 auto;
display: flex;
flex-direction: column;
Expand All @@ -16,7 +16,7 @@
}

.veo .time-machine {
padding: 8px 32px;
padding: $page-gutter;
padding-top: 0;
height: calc(100% - 80px);
height: calc(100% - #{$page-header-size});
}
2 changes: 1 addition & 1 deletion ui/src/dataExplorer/components/DataExplorer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
.data-explorer {
width: 100%;
height: 100%;
padding-bottom: $ix-marg-d;
padding-bottom: $page-gutter;
}
2 changes: 1 addition & 1 deletion ui/src/pageLayout/components/Page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@

.container-fluid {
margin: 0 auto;
padding: $page-gutter;
padding-top: 0;
padding: 0 $page-gutter;
max-width: $page-max-width;

&.full-width {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/shared/components/TimeMachine.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import TimeMachineVis from 'src/shared/components/TimeMachineVis'
import TimeSeries from 'src/shared/components/TimeSeries'

// Constants
const INITIAL_RESIZER_HANDLE = 0.4
const INITIAL_RESIZER_HANDLE = 0.6

// Utils
import {getActiveTimeMachine} from 'src/shared/selectors/timeMachines'
Expand Down
4 changes: 2 additions & 2 deletions ui/src/style/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
This more or less copies what Bootstrap uses
*/

$grid--gutter: 14px;
$grid--gutter: 8px;
$grid--form-gutter: 6px;

$grid--breakpoint-sm: 768px;
$grid--breakpoint-sm: 750px;
$grid--breakpoint-md: 992px;
$grid--breakpoint-lg: 1200px;

Expand Down
8 changes: 4 additions & 4 deletions ui/src/style/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

/* Page Layout */

$nav-size: 54px;
$nav-size: 50px;
$nav-breakpoint: 800px;
$page-header-size: 80px;
$page-header-size: 66px;
$page-max-width: 1300px;
$page-gutter: 32px;
$page-gutter: 16px;
$page-title-size: 21px;
$page-title-weight: 400;
$sidebar--width: 54px; //delete this later
$sidebar--width: 50px; //delete this later

/* Z Variables */

Expand Down

0 comments on commit 0abac38

Please sign in to comment.