Skip to content
Snippets Groups Projects
Commit d54ff5ba authored by Matthias Feyll's avatar Matthias Feyll
Browse files

(ui): minor css improvements

parent e214ef74
Branches
No related tags found
4 merge requests!1196[renovate] Update module golang.org/x/net to v0.32.0,!1195UI: implement add device functionality,!1167Ui refactor style,!1161Ui refactor style
Pipeline #247816 failed
...@@ -57,5 +57,6 @@ ...@@ -57,5 +57,6 @@
&.active { &.active {
color: map-get($theme-colors, primary); color: map-get($theme-colors, primary);
font-weight: 500; font-weight: 500;
text-decoration: underline;
} }
} }
...@@ -48,7 +48,6 @@ export const DeviceViewTable = (searchRef: MutableRefObject<HTMLInputElement>) = ...@@ -48,7 +48,6 @@ export const DeviceViewTable = (searchRef: MutableRefObject<HTMLInputElement>) =
<td data-copy-value={deviceId} dangerouslySetInnerHTML={{ __html: search ? insertMarkTags(cropedId, search) : DOMPurify.sanitize(cropedId) }}></td> <td data-copy-value={deviceId} dangerouslySetInnerHTML={{ __html: search ? insertMarkTags(cropedId, search) : DOMPurify.sanitize(cropedId) }}></td>
</OverlayTrigger> </OverlayTrigger>
<td data-copy-value={username} dangerouslySetInnerHTML={{ __html: search ? insertMarkTags(username, search) : DOMPurify.sanitize(username) }}></td> <td data-copy-value={username} dangerouslySetInnerHTML={{ __html: search ? insertMarkTags(username, search) : DOMPurify.sanitize(username) }}></td>
<td></td>
</tr> </tr>
) )
}) })
...@@ -61,7 +60,6 @@ export const DeviceViewTable = (searchRef: MutableRefObject<HTMLInputElement>) = ...@@ -61,7 +60,6 @@ export const DeviceViewTable = (searchRef: MutableRefObject<HTMLInputElement>) =
<th>{t('device.table.header.name')}</th> <th>{t('device.table.header.name')}</th>
<th>{t('device.table.header.uuid')}</th> <th>{t('device.table.header.uuid')}</th>
<th>{t('device.table.header.user')}</th> <th>{t('device.table.header.user')}</th>
<th>{t('device.table.header.last_updated')}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -24,8 +24,6 @@ export const DeviceViewTabs = (activeTab: DeviceViewTabValues) => { ...@@ -24,8 +24,6 @@ export const DeviceViewTabs = (activeTab: DeviceViewTabValues) => {
<> <>
{jsonYang && {jsonYang &&
<JsonViewer json={jsonYang} /> <JsonViewer json={jsonYang} />
//<ReactJson src={selectedDevice.json} name={false} collapsed={true} quotesOnKeys={false} />
} }
</> </>
); );
......
...@@ -15,19 +15,19 @@ const DeviceView = () => { ...@@ -15,19 +15,19 @@ const DeviceView = () => {
<div className='m-4 pt-4'> <div className='m-4 pt-4'>
<Container fluid> <Container fluid>
<Row> <Row>
<Col sm={5}> <Col lg={5} sm={12}>
<Container className='bg-white rounded c-box'> <Container className='bg-white rounded c-box'>
<Row> <Row>
<Col sm={12} className='mt-4'><h3 className='text-black-50'>{t('device.title')}</h3></Col> <Col sm={12} className='mt-4'><h3 className='text-black-50'>{t('device.title')}</h3></Col>
</Row> </Row>
<Row className='align-items-center'> <Row className='align-items-center'>
<Col sm={6}> <Col xs={12} sm={6}>
<Form.Group controlId='device.search' className='p-0 mx-1 pt-2'> <Form.Group controlId='device.search' className='p-0 mx-1 pt-2'>
<Form.Control type="text" placeholder={t('device.search.placeholder')} ref={searchRef} /> <Form.Control type="text" placeholder={t('device.search.placeholder')} ref={searchRef} />
</Form.Group> </Form.Group>
</Col> </Col>
<Col sm={{ span: 3, offset: 3 }} className='pt-2'> <Col xs={12} sm={6} className='pt-2'>
<Button variant='primary' className='w-100 my-auto'>{t('device.add_device_button')}</Button> <Button variant='primary' className='w-100 my-auto'>{t('device.add_device_button')}</Button>
</Col> </Col>
</Row> </Row>
...@@ -39,10 +39,10 @@ const DeviceView = () => { ...@@ -39,10 +39,10 @@ const DeviceView = () => {
</Row> </Row>
</Container> </Container>
</Col> </Col>
<Col sm={7}> <Col xs={12} lg={7} className='mt-5 mt-lg-0'>
<Container className='bg-white rounded c-box'> <Container className='bg-white rounded c-box'>
<Row> <Row>
<Col sm={12} className='mt-4'> <Col xs={12} className='mt-4'>
<Nav className='justify-content-around'> <Nav className='justify-content-around'>
<NavLink className={handleActiveTabLink(DeviceViewTabValues.METADATA) + " tab-links"} onClick={() => setActiveTab(DeviceViewTabValues.METADATA)}>{t('device.tabs.metadata.title')}</NavLink> <NavLink className={handleActiveTabLink(DeviceViewTabValues.METADATA) + " tab-links"} onClick={() => setActiveTab(DeviceViewTabValues.METADATA)}>{t('device.tabs.metadata.title')}</NavLink>
<NavLink className={handleActiveTabLink(DeviceViewTabValues.YANGMODEL) + " tab-links"} onClick={() => setActiveTab(DeviceViewTabValues.YANGMODEL)}>{t('device.tabs.yang_model.title')}</NavLink> <NavLink className={handleActiveTabLink(DeviceViewTabValues.YANGMODEL) + " tab-links"} onClick={() => setActiveTab(DeviceViewTabValues.YANGMODEL)}>{t('device.tabs.yang_model.title')}</NavLink>
...@@ -51,7 +51,7 @@ const DeviceView = () => { ...@@ -51,7 +51,7 @@ const DeviceView = () => {
</Row> </Row>
<Row className='align-items-start'> <Row className='align-items-start'>
<Col sm={12} className='pt-2'> <Col xs={12}>
{DeviceViewTabs(activeTab)} {DeviceViewTabs(activeTab)}
</Col> </Col>
</Row> </Row>
......
import react from '@vitejs/plugin-react'; import react from '@vitejs/plugin-react';
import { defineConfig } from 'vite'; import { defineConfig } from 'vite';
export default defineConfig({ export default defineConfig({
plugins: [react()], plugins: [react()],
build: { build: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment