Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Roboto Font with Qanelas Soft Font #8901

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Replace Roboto Font with Qanelas Soft Font #8901

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9ca2cc
Use mui core component
senali-d Sep 24, 2023
8c1ec63
Compornent import from material-ui/core
senali-d Sep 24, 2023
d4a8dab
Merge remote-tracking branch upstream/master into senali-d/connection…
senali-d Sep 26, 2023
e1995f8
Merge remote-tracking branch upstream/master into senali-d/connection…
senali-d Sep 28, 2023
f6c79df
Merge remote-tracking branch upstream/master into senali-d/connection…
senali-d Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/components/configuratorComponents/MeshModel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import AppBarComponent from './styledComponents/AppBar';

import DeleteIcon from '@material-ui/icons/Delete';
import SaveIcon from '@material-ui/icons/Save';
import { AvatarGroup } from '@mui/material';
import { AvatarGroup } from '@material-ui/core';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ideal to use core elements from mui. Since we need to move to mui V5 then again we have to revert these changes

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this changes fixed theme defined fonts was not in using MUI components when we import it from MUI v5.

import { iconMedium } from '../../../css/icons.styles';
import { useMeshModelComponents } from '../../../utils/hooks/useMeshModelComponents';
import { getWebAdress } from '../../../utils/webApis';
Expand Down
2 changes: 1 addition & 1 deletion ui/components/connections/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
ListItem,
ListItemText,
TableRow,
Chip,
} from '@material-ui/core';
import { withStyles } from '@material-ui/core/styles';
// import EditIcon from "@material-ui/icons/Edit";
Expand All @@ -22,7 +23,6 @@ import Moment from 'react-moment';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { updateProgress } from '../../lib/store';
import { /* Avatar, */ Chip /* FormControl, */ } from '@mui/material';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedIn';
import ExploreIcon from '@mui/icons-material/Explore';
Expand Down
2 changes: 1 addition & 1 deletion ui/components/reusable-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Tooltip } from '@mui/material';
import { Tooltip } from '@material-ui/core';

const ReusableTooltip = ({ title, children, onClick, placement }) => {
return (
Expand Down
4 changes: 1 addition & 3 deletions ui/components/searchcommon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from 'react';
import TextField from '@mui/material/TextField';
import Box from '@mui/material/Box';
import { InputAdornment } from '@mui/material';
import { TextField, Box, InputAdornment } from '@material-ui/core';
import SearchIcon from '@mui/icons-material/Search';
import { withStyles } from '@material-ui/core/styles';

Expand Down
20 changes: 11 additions & 9 deletions ui/utils/custom-column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import React, { useState, useRef } from 'react';
import IconButton from '@mui/material/IconButton';
import Checkbox from '@mui/material/Checkbox';
import FormControlLabel from '@mui/material/FormControlLabel';
import Tooltip from '@mui/material/Tooltip';
import Popper from '@mui/material/Popper';
import ClickAwayListener from '@mui/material/ClickAwayListener';
import { withStyles } from '@material-ui/core/styles';
import ColumnIcon from '../assets/icons/coulmn';
import Slide from '@mui/material/Slide';
import Box from '@mui/material/Box';
import { Card } from '@material-ui/core';
import {
Card,
Box,
Slide,
ClickAwayListener,
Popper,
Tooltip,
FormControlLabel,
Checkbox,
IconButton,
} from '@material-ui/core';

const styles = (theme) => ({
epaper: {
Expand Down
5 changes: 1 addition & 4 deletions ui/utils/custom-search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import React, { useState, useRef } from 'react';
import TextField from '@mui/material/TextField';
import { Tooltip } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import SearchIcon from '@mui/icons-material/Search';
import CloseIcon from '@mui/icons-material/Close';
import { makeStyles } from '@material-ui/core/styles';
import ClickAwayListener from '@mui/material/ClickAwayListener';
import { ClickAwayListener, IconButton, Tooltip, TextField } from '@material-ui/core';
import debounce from './debounce';

const useStyles = makeStyles((theme) => ({
Expand Down
2 changes: 1 addition & 1 deletion ui/utils/hooks/useNotification.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-unused-vars */
//NOTE: This file is being refactored to use the new notification center
import { IconButton } from '@material-ui/core';
import { ToggleButtonGroup } from '@mui/material';
import { ToggleButtonGroup } from '@material-ui/core';
import { useSnackbar } from 'notistack';
import { iconMedium } from '../../css/icons.styles';
import CloseIcon from '@material-ui/icons/Close';
Expand Down