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

Fix some minors thing on Fab and Nav #2754

Merged
merged 2 commits into from
Mar 19, 2025
Merged

Fix some minors thing on Fab and Nav #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c70dc6a
fix(Nav): Text and icon colors wasn't correct on mobile
JF-Cozy Mar 18, 2025
a04d886
fix(Fab): Default size wasn't correct
JF-Cozy Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion react/Fab/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import Stack from 'cozy-ui/transpiled/react/Stack'
import Variants from 'cozy-ui/docs/components/Variants'

const props = [{ color: 'primary' }, { color: 'inherit', default: true }]
const initialVariants = [{ small: false, medium: false, large: true }]
const initialVariants = [{ small: false, medium: true, large: false }]

;

<Variants initialVariants={initialVariants} radio screenshotAllVariants>
{variant => (
<Grid container>
Expand Down
6 changes: 6 additions & 0 deletions react/Fab/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import Fab from '@material-ui/core/Fab'

import { isTwakeTheme } from '../helpers/isTwakeTheme'

Fab.defaultProps = {
size: isTwakeTheme() ? 'medium' : 'large'
}

export default Fab
export { default as ExtendableFab } from './ExtendableFab'
2 changes: 2 additions & 0 deletions stylus/components/nav.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $nav-item-icon
+medium-screen()
display block
margin-right 0
color var(--secondaryTextColor)

svg
margin 4px auto 5px
Expand Down Expand Up @@ -126,6 +127,7 @@ $nav-link
line-height rem(12)
background-position center top
background-size rem(24)
color color var(--secondaryTextColor)

&.is-active
&:hover
Expand Down
Loading