Skip to content

Commit c3026fb

Browse files
jrobinsojrobinso
authored
Merge branch 'master' into roi_set_margin_top
2 parents c21bb23 + a19e377 commit c3026fb

28 files changed

+1177
-992
lines changed

‎css/_igv-generic-container.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
align-items: center;
1919

2020
// header bar
21-
div:first-child {
21+
>div:nth-child(1) {
2222

2323
cursor: move;
2424

‎css/_igv-ui-colorpicker.scss

Lines changed: 77 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,64 @@
22
$igv-color-swatch-size: 32px;
33
$igv-color-swatch-border-width: 2px;
44

5+
.igv-ui-generic-container {
6+
7+
left: 50%;
8+
top: 75%;
9+
transform: translate(-50%, -25%);
10+
11+
flex-direction: column;
12+
flex-wrap: nowrap;
13+
justify-content: flex-start;
14+
align-items: center;
15+
16+
background-color: #eee;
17+
18+
// color swatches
19+
>div:nth-child(2) {
20+
display: flex;
21+
flex-direction: row;
22+
flex-wrap: wrap;
23+
justify-content: flex-start;
24+
align-items: center;
25+
}
26+
27+
// more colors
28+
>div:nth-child(3) {
29+
30+
box-sizing: border-box;
31+
position: relative;
32+
33+
display: flex;
34+
flex-flow: row;
35+
flex-wrap: nowrap;
36+
justify-content: flex-start;
37+
align-items: center;
38+
39+
padding: .5rem;
40+
font-family: $igv-default-font-face;
41+
font-size: 1rem;
42+
font-weight: 400;
43+
44+
width: 100%;
45+
46+
border-top-style: solid;
47+
border-top-width: thin;
48+
border-top-color: $igv-dark-grey-color;
49+
50+
}
51+
52+
// recent colors
53+
>div:nth-child(4) {
54+
width: 100%;
55+
display: flex;
56+
flex-direction: row;
57+
flex-wrap: wrap;
58+
justify-content: flex-start;
59+
align-items: center;
60+
}
61+
}
62+
563
.igv-ui-color-swatch {
664

765
position: relative;
@@ -14,50 +72,40 @@ $igv-color-swatch-border-width: 2px;
1472
justify-content: center;
1573
align-items: center;
1674

75+
margin: 2px;
1776
width: $igv-color-swatch-size;
1877
height: $igv-color-swatch-size;
1978

2079
border-style: solid;
21-
border-width: $igv-color-swatch-border-width;
80+
border-width: 0;
2281
border-color: white;
23-
border-radius: 4px;
24-
25-
//margin: 1px;
82+
border-radius: 3px;
2683

2784
}
2885

29-
.igv-ui-color-swatch:hover {
30-
border-color: dimgray;
31-
}
86+
.igv-ui-color-swatch-shim {
87+
88+
cursor: pointer;
89+
90+
position: relative;
3291

33-
.igv-ui-colorpicker-menu-close-button {
92+
box-sizing: content-box;
3493

3594
display: flex;
3695
flex-flow: row;
37-
flex-wrap: nowrap;
38-
justify-content: flex-end;
96+
flex-wrap: wrap;
97+
justify-content: center;
3998
align-items: center;
4099

41-
width: 100%;
42-
height: 32px;
43-
44-
margin-top: 4px;
45-
margin-bottom: 4px;
100+
width: $igv-color-swatch-size;
101+
height: $igv-color-swatch-size;
46102

47-
padding-right: 8px;
103+
background-color: white;
48104

49-
i.fa {
50-
display: block;
51-
margin-left: 4px;
52-
margin-right: 4px;
53-
color: #5f5f5f;
54-
}
55-
56-
i.fa:hover,
57-
i.fa:focus,
58-
i.fa:active {
59-
cursor: pointer;
60-
color: #0f0f0f;
61-
}
105+
border-style: solid;
106+
border-width: thin;
107+
border-color: white;
108+
border-radius: 4px;
62109

63110
}
111+

‎css/igv.css

Lines changed: 80 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/igv.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ $igv-trackgear-default-font-face: 'Open Sans', sans-serif;
9191
@import "igv-ui-dropdown";
9292
@import "igv-ui-popover";
9393
@import "igv-ui-alert-dialog";
94-
@import "igv-ui-colorpicker";
9594
@import "igv-ui-generic-dialog-container";
9695
@import "igv-ui-generic-container";
96+
@import "igv-ui-colorpicker";
9797
@import "igv-ui-dialog";
9898
@import "igv-ui-panel";
9999
@import "igv-ui-textbox";

‎dev/misc/vanillPicker.html

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<link href=https://igv.org/web/img/favicon.ico rel="shortcut icon">
6+
<title>IGV - Dev</title>
7+
</head>
8+
9+
<body>
10+
11+
<div id="myDiv" style="padding-top: 50px;padding-bottom: 20px; height: auto">
12+
13+
</div>
14+
15+
<script type="module">
16+
17+
import igv from "../../js/index.js";
18+
19+
const div = document.getElementById("myDiv");
20+
const options = {
21+
locus: '19:49301000-49305700',
22+
genome: "hg19",
23+
tracks: [
24+
{
25+
name: 'All pos bars',
26+
url: '../../test/data/wig/allPositive.bedgraph',
27+
// color: '#0f0',
28+
indexed: false
29+
},
30+
]
31+
};
32+
33+
igv.createBrowser(div, options).then(function (browser) {
34+
});
35+
36+
37+
</script>
38+
39+
</body>
40+
41+
</html>
42+

0 commit comments

Comments
 (0)