Skip to content

Commit

Permalink
Fix initial position of chat widget
Browse files Browse the repository at this point in the history
  • Loading branch information
axelboc authored and marcus-oscarsson committed Aug 23, 2024
1 parent 38c0945 commit e97c62f
Show file tree
Hide file tree
Showing 22 changed files with 68 additions and 72 deletions.
2 changes: 1 addition & 1 deletion ui/src/components/Equipment/GenericEquipment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function GenericEquipment(props) {
state={props.state}
equipmentName={props.name}
style={{
margin: '0px 0px 0px 0px',
margin: 0,
width: 'inherit',
borderBottomLeftRadius: '0%',
borderBottomRightRadius: '0%',
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Equipment/GenericEquipmentControl.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default function GenericEquipmentControl(props) {
state={props.equipment.state}
equipmentName={props.equipment.name}
style={{
margin: '0px 0px 0px 0px',
margin: 0,
width: 'inherit',
borderBottomLeftRadius: '0%',
borderBottomRightRadius: '0%',
Expand Down
4 changes: 1 addition & 3 deletions ui/src/components/Equipment/PlateManipulator.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -702,9 +702,7 @@ export default function PlateManipulator(props) {
<Popover.Header>
{global_state.plate_info.plate_label}
</Popover.Header>
<Popover.Body style={{ padding: '0px' }}>
{renderPlate()}
</Popover.Body>
<Popover.Body style={{ padding: 0 }}>{renderPlate()}</Popover.Body>
</Popover>
}
>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Equipment/equipment.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
.treeNodeLabel {
font-weight: normal;
cursor: pointer;
margin: 0px;
margin: 0;
}

.treeNodeLabel:hover {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

.command-panel {
border: 0px;
border: 0;
}

.generic_equipment_arrow_p {
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/LabeledValue/LabeledValue.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ export default class LabeledValue extends React.Component {
backgroundColor: 'transparent',
display: 'block-inline',
fontSize: '100%',
borderRadius: '0px',
borderRadius: 0,
color: '#000',
padding: '0px',
padding: 0,
marginBottom: 0,
whiteSpace: 'nowrap',
};

if (this.props.look === 'vertical') {
labelStyle = { display: 'block', marginBottom: '3px' };
valueStyle = { display: 'block', fontSize: '100%', borderRadius: '0px' };
valueStyle = { display: 'block', fontSize: '100%', borderRadius: 0 };
}

let value = this.props.value.toFixed(
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/LoginForm/LoginForm.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
margin: -10vh auto 0; /* centred with slight vertical offset to feel more centred */
padding: 50px 60px;
background-color: #f7f7f7;
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
}

.title {
Expand Down
34 changes: 17 additions & 17 deletions ui/src/components/MotorInput/motor.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.motor-input-container {
padding-right: 0px;
padding-right: 0;
margin-bottom: 1em;
font-size: 16px !important;
}

.motor-name {
font-size: 1em;
margin-bottom: 0px;
margin-bottom: 0;
font-weight: bold;
display: block;
}
Expand All @@ -26,8 +26,8 @@
.motor-group {
padding-top: 20px;
padding-left: 20px;
padding-right: 0px;
padding-bottom: 0px;
padding-right: 0;
padding-bottom: 0;
}

.motor-button {
Expand All @@ -54,8 +54,8 @@
}

.rw-widget input {
border-bottom-right-radius: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}

input[type='number']::-webkit-inner-spin-button,
Expand All @@ -81,15 +81,15 @@ input::-webkit-inner-spin-button {
}

.rw-widget-no-right-border {
border-right: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-right: 0;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}

.rw-widget-no-left-border {
border-left: 0px;
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
border-left: 0;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

.rw-widget-right-border {
Expand Down Expand Up @@ -133,8 +133,8 @@ input::-webkit-inner-spin-button {
}

.rw-widget input {
border-bottom-right-radius: 0px;
border-top-right-radius: 0px;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}

.rw-input {
Expand Down Expand Up @@ -222,7 +222,7 @@ input::-webkit-inner-spin-button {
.arrow-control .arrow-small {
width: 2em;
height: 2em;
padding: 0px;
padding: 0;
}

.arrow-control .arrow-up {
Expand All @@ -246,13 +246,13 @@ input::-webkit-inner-spin-button {
.arrow-control .arrow i {
font-size: 25px;
font-weight: bold;
margin-left: 0px;
margin-left: 0;
}

.arrow-control .arrow-small i {
font-size: 21px;
font-weight: bold;
margin-left: 0px;
margin-left: 0;
}

.arrow-control .arrow-settings i {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/Notify/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
border-radius: 5px;
border-color: #333;
opacity: 0;
height: 0px;
height: 0;
}

.closebtn {
Expand All @@ -67,6 +67,6 @@

.messageContainerInner {
position: absolute;
bottom: 0px;
bottom: 0;
overflow: hidden;
}
22 changes: 11 additions & 11 deletions ui/src/components/SampleGrid/SampleGridTable.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.samples-grid-table-card {
border: 0px !important;
border: 0 !important;
}

.samples-grid-table-card-header {
Expand All @@ -33,7 +33,7 @@
.sample-items-collapsible-header {
display: flex;
border: 1px solid #d1d6da !important;
border-radius: 3px 3px 0px 0px !important;
border-radius: 3px 3px 0 0 !important;
padding: 4px;
}

Expand All @@ -53,7 +53,7 @@

.sample-items-table {
align-items: center;
margin-bottom: 0px;
margin-bottom: 0;
background: #e5e8eb6b;
width: 100%;
}
Expand All @@ -67,13 +67,13 @@
}

.sample-items-table-row-header-th {
padding: 0px !important;
padding: 0 !important;
text-align: right;
width: 330px !important;
}

.sample-items-table > :not(:first-child) {
border-top: 0px;
border-top: 0;
}

.sample-items-table > tbody > tr > td {
Expand All @@ -82,7 +82,7 @@

.samples-grid-table-li {
min-width: 283px;
margin: auto auto 6px 0px;
margin: auto auto 6px 0;
z-index: 2 !important;
list-style-type: none;
height: 70px;
Expand All @@ -97,7 +97,7 @@

.samples-grid-table-item {
list-style-type: none !important;
padding: 0px;
padding: 0;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05) !important;
}

Expand Down Expand Up @@ -164,7 +164,7 @@ button[disabled] {
}

.samples-grid-table-item-tasks > .slick-list > .slick-track {
margin-left: 0px !important;
margin-left: 0 !important;
}

.samples-grid-table-item-tasks > .slick-next::before,
Expand All @@ -187,7 +187,7 @@ button[disabled] {
}

.new-sample-grid-task-item {
margin: 0px !important;
margin: 0 !important;
}

.samples-item-controls-container {
Expand Down Expand Up @@ -396,13 +396,13 @@ button[disabled] {
.cell-cicle:hover {
stroke: #6cb0f5;
stroke-width: 9.5;
text-shadow: 0px 0px 30px #fdec6e;
text-shadow: 0 0 30px #fdec6e;
transition: all 0.2s ease-in;
}

.circle-text:hover > .cell-cicle:hover {
stroke: #63adf7;
text-shadow: 0px 0px 30px #fdec6e;
text-shadow: 0 0 30px #fdec6e;
transition: all 0.2s ease-in;
}

Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/SampleGrid/TaskItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export class TaskItem extends React.Component {
render() {
const style = {
display: 'inline-block',
margin: '0px',
margin: 0,
cursor: 'pointer',
fontSize: '0.7em',
};
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/SampleQueue/CharacterisationTaskItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export default class TaskItem extends Component {
<ProgressBar
variant={pbarBsStyle}
striped
style={{ marginBottom: '0px', height: '18px' }}
style={{ marginBottom: 0, height: '18px' }}
min={0}
max={1}
active={this.props.progress < 1}
Expand Down Expand Up @@ -396,7 +396,7 @@ export default class TaskItem extends Component {
}}
>
<i
style={{ marginLeft: '0px' }}
style={{ marginLeft: 0 }}
className="fa fa-copy"
aria-hidden="true"
/>
Expand All @@ -408,7 +408,7 @@ export default class TaskItem extends Component {
bordered
hover
onClick={this.showForm}
style={{ fontSize: 'smaller', marginBottom: '0px' }}
style={{ fontSize: 'smaller', marginBottom: 0 }}
className="task-parameters-table"
>
<thead>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/SampleQueue/EnergyScanTaskItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export default class EnergyScanTaskItem extends Component {
<ProgressBar
variant={pbarBsStyle}
striped
style={{ marginBottom: '0px', height: '18px' }}
style={{ marginBottom: 0, height: '18px' }}
min={0}
max={1}
active={this.props.progress < 1}
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/SampleQueue/TaskItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export default class TaskItem extends Component {
<ProgressBar
variant={pbarBsStyle}
striped
style={{ marginBottom: '0px', height: '18px' }}
style={{ marginBottom: 0, height: '18px' }}
min={0}
max={1}
active={this.props.progress < 1}
Expand Down Expand Up @@ -354,7 +354,7 @@ export default class TaskItem extends Component {
}}
>
<i
style={{ marginLeft: '0px' }}
style={{ marginLeft: 0 }}
className="fa fa-copy"
aria-hidden="true"
/>
Expand All @@ -366,7 +366,7 @@ export default class TaskItem extends Component {
bordered
hover
onClick={this.showForm}
style={{ fontSize: 'smaller', marginBottom: '0px' }}
style={{ fontSize: 'smaller', marginBottom: 0 }}
className="task-parameters-table"
>
<thead>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SampleQueue/WorkflowTaskItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export default class WorkflowTaskItem extends Component {
<ProgressBar
variant={pbarBsStyle}
striped
style={{ marginBottom: '0px', height: '18px' }}
style={{ marginBottom: 0, height: '18px' }}
min={0}
max={1}
active={this.props.progress < 1}
Expand Down Expand Up @@ -264,7 +264,7 @@ export default class WorkflowTaskItem extends Component {
}}
>
<i
style={{ marginLeft: '0px' }}
style={{ marginLeft: 0 }}
className="fa fa-copy"
aria-hidden="true"
/>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/SampleQueue/XRFTaskItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export default class XRFTaskItem extends Component {
<ProgressBar
variant={pbarBsStyle}
striped
style={{ marginBottom: '0px', height: '18px' }}
style={{ marginBottom: 0, height: '18px' }}
min={0}
max={1}
active={this.props.progress < 1}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SampleQueue/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
}
.list-head {
padding: 1rem 1rem;
border: 0px;
border: 0;
}
.list-body {
padding: 0.5rem 1rem;
Expand All @@ -156,7 +156,7 @@
.queue-messages {
height: 25%;
width: 100%;
bottom: 0px;
bottom: 0;
position: absolute;
overflow-y: auto;
overflow-x: hidden;
Expand Down
Loading

0 comments on commit e97c62f

Please sign in to comment.