Skip to content

Commit

Permalink
Merge branch 'main' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
maximvl committed Oct 5, 2024
2 parents bf4cd54 + 2f38e81 commit 21ff803
Show file tree
Hide file tree
Showing 4 changed files with 766 additions and 6 deletions.
5 changes: 5 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ div.MuiAutocomplete-inputRoot > input {
padding-bottom: 10px !important;
padding-left: 14px !important;
font-size: 16px !important;
font-weight: 500 !important;
}

span.MuiRating-root {
Expand All @@ -109,6 +110,10 @@ div.MuiAutocomplete-root {
border: none !important;
}

ul.MuiAutocomplete-listbox {
font-weight: 500;
}

div.Mui-focused {
border: 2px solid #007aff;
}
Expand Down
6 changes: 4 additions & 2 deletions src/pages/map/components/TurnModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default function TurnModal({ open, onClose, onConfirm, player }: Props) {
onChange={handleMoveTypeChange}
value={moveType ? moveType : ''}
IconComponent={KeyboardArrowDownSharp}
sx={{ fontSize: '16px' }}
sx={{ fontSize: '16px', fontWeight: 500 }}
MenuProps={{
sx: {
'&& .Mui-selected': { backgroundColor: selectedItemColor },
Expand Down Expand Up @@ -360,7 +360,7 @@ export default function TurnModal({ open, onClose, onConfirm, player }: Props) {
Оценка: {displayRating}
</span>
<NumRating
precision={0.1}
precision={0.2}
max={10}
sx={{ marginLeft: '0px' }}
onChange={handleRatingChange}
Expand All @@ -379,6 +379,7 @@ export default function TurnModal({ open, onClose, onConfirm, player }: Props) {
paddingBottom: '10px',
lineHeight: '1.2',
fontSize: '16px',
fontWeight: 500,
},
}}
multiline
Expand Down Expand Up @@ -456,6 +457,7 @@ function getDiceType({

const MenuItemStyled = styled(MenuItem)(({ color }) => ({
fontSize: '16px',
fontWeight: 500,
':hover': {
backgroundColor: `${color} !important`,
},
Expand Down
Loading

0 comments on commit 21ff803

Please sign in to comment.