Skip to content

Commit a39db7c

Browse files
committed
Bug Fix/CSS cleanup: add some more specific css to fix conflicts with NED
1 parent 5b1508a commit a39db7c

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed

src/firefly/html/css/global.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ div.rootStyle>img, div.rootStyle > html {
3636
border:0 none;
3737
}
3838

39+
div.rootStyle img {
40+
max-width: unset;
41+
}
3942

4043
#App {
4144
position: absolute;

src/firefly/js/ui/ButtonGroup.css

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11

22
.buttonGroupButton {
33
background-color: #aaa;
4+
background-image: none;
5+
border-radius: 0;
6+
padding: 1px 7px 2px 7px;
7+
48
border: 1px solid #ccc;
59
border-left: 0;
610
cursor: pointer;
711
margin: 0;
8-
/*padding: 5px 10px;*/
912
position: relative;
1013
}
1114

@@ -21,15 +24,27 @@
2124

2225
.buttonGroupButton.On:focus {
2326
outline-width: 0;
27+
background-image: none;
28+
border-radius: 0;
2429
}
2530

2631
.buttonGroupButton.Off:focus {
2732
outline-width: 0;
33+
background-image: none;
34+
border-radius: 0;
2835
}
2936

3037
.buttonGroupButton.Off:hover {
31-
background-color: #999;
38+
background-color: #ddd;
39+
background-image: none;
40+
border-radius: 0;
3241
}
3342
.buttonGroupButton.On:hover {
34-
background-color: #999;
43+
background-color: #aaa;
44+
background-image: none;
45+
border-radius: 0;
3546
}
47+
48+
.buttonGroupButton.Off:ACTIVE {
49+
background-color: #bbb;
50+
}

src/firefly/js/visualize/ui/VisCtxToolbarView.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,9 @@ function makeConvertButton(pv) {
423423

424424
const {autoConvertOnZoom:auto}= pv.plotViewCtx.hipsImageConversion;
425425
return (
426-
<div style={{display: 'flex', marginLeft: 5, marginRight: 5, marginTop: -6, padding: '1px 2px 1px 2px',
427-
border: '1px solid rgba(60,60,60,.2', borderRadius: '5px'}}>
426+
<div style={{display: 'flex', alignItems: 'center',
427+
padding: '1px 2px 1px 2px', margin: '0 5px 0 5px',
428+
border: '1px solid rgba(60,60,60,.2)', borderRadius: '5px'}}>
428429
<RadioGroupInputFieldView options={options} value={value}
429430
buttonGroup={true}
430431
onChange={(ev) => doConvert(pv,ev.target.value)} />
@@ -443,7 +444,7 @@ function makeHiPSImageTable(pv, surveysId) {
443444

444445
const inputEntry = () => {
445446
return (
446-
<div style={{margin: '0 5px 7px 4px'}}>
447+
<div style={{margin: '0 5px 0 4px'}}>
447448
<input type='button'
448449
value='Change HiPS'
449450
title={'Choose a different HiPS Survey'}
@@ -478,7 +479,7 @@ function makeHiPSCoordSelect(pv) {
478479

479480

480481
return (
481-
<div style={{marginBottom:7}}>
482+
<div>
482483
<ListBoxInputFieldView
483484

484485
inline={true}

0 commit comments

Comments
 (0)