Skip to content

Commit

Permalink
Merge pull request #330 from jpmorganchase/material-fixes
Browse files Browse the repository at this point in the history
Material fixes
  • Loading branch information
texodus committed Nov 30, 2018
2 parents c07866c + 566d131 commit f142e82
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 5 deletions.
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
"prettier": "^1.14.2",
"rimraf": "^2.6.2",
"ts-loader": "^3.5.0",
"typeface-open-sans": "0.0.54",
"typeface-roboto-mono": "0.0.54",
"typescript": "~2.9.2",
"webpack": "^3.5.6"
},
Expand Down
10 changes: 10 additions & 0 deletions packages/perspective-viewer-highcharts/src/less/highcharts.less
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@
position: relative;
width: 100%;
height: 100%;
min-width: 0;
min-height: 0;
}

.chart:last-child:first-child {
position: absolute;
top: 0;
left: 0;
right:0;
bottom:0;
}

tspan,
Expand Down
8 changes: 8 additions & 0 deletions packages/perspective-viewer/src/less/default.less
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,14 @@
background-color: var(--plugin--background, white);
}

#drop_target{
border: var(--plugin--border,none);
}

#pivot_chart_container{
box-shadow: var(--plugin--box-shadow, none);
}

#filters perspective-row {
margin: 0 24px 0 0;
--filter_operator-display: inline-block;
Expand Down
14 changes: 11 additions & 3 deletions packages/perspective-viewer/src/themes/material.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
*/

@import "../less/variables";
@import url("https://fonts.googleapis.com/css?family=Material+Icons");

@import url("~typeface-open-sans/index.css");
@import url("~typeface-roboto-mono/index.css");
@import url("https://fonts.googleapis.com/css?family=Material+Icons");
@import url("https://fonts.googleapis.com/css?family=Open+Sans"); // ~typeface-open-sans/index.css");
@import url("https://fonts.googleapis.com/css?family=Roboto+Mono"); // ~typeface-roboto-mono/index.css");

perspective-viewer {
--interface--font-family: "Open Sans";
Expand Down Expand Up @@ -78,4 +78,12 @@ perspective-viewer {
--top_panel--padding: 0px 0px 24px 0px;
--hypergrid-scrollbar--width: 8px;
--hypergrid-scrollbar--border-radius: 5px;

--hypergrid-positive--color: #1078d1;
--hypergrid-negative--color: #de3838;

--hypergrid--font-size: 12px;
--hypergrid-header--font-size: 12px;
--hypergrid--font-family: "Open Sans";
--hypergrid-header--font-family: "Open Sans";
}

0 comments on commit f142e82

Please sign in to comment.