fix(ui-toolkit): fix tooltip font-size and padding

fixes #971
This commit is contained in:
Sérgio Ramos 2018-01-26 13:48:02 +00:00 committed by Sérgio Ramos
parent b8b64bfa17
commit 955b5e12e2
5 changed files with 29 additions and 36 deletions

View File

@ -1,11 +1,10 @@
import React from 'react'; import React from 'react';
import styled, { ThemeProvider } from 'styled-components'; import styled, { ThemeProvider } from 'styled-components';
import { Grid, Row, Col } from '../grid';
import remcalc from 'remcalc'; import remcalc from 'remcalc';
import theme from '../theme';
import is from 'styled-is'; import is from 'styled-is';
import Header, { HeaderBrand } from '../header';
import { Triton } from '../icons'; import { Grid, Row, Col } from '../grid';
import theme from '../theme';
const Main = styled(Row)` const Main = styled(Row)`
padding-top: ${remcalc(40)}; padding-top: ${remcalc(40)};
@ -49,14 +48,6 @@ const StyleGuideRenderer = ({
hasSidebar hasSidebar
}) => ( }) => (
<ThemeProvider theme={fullTheme}> <ThemeProvider theme={fullTheme}>
<div>
<Sticky>
<Header fluid>
<HeaderBrand beta center>
<Triton light />
</HeaderBrand>
</Header>
</Sticky>
<Grid> <Grid>
<Main> <Main>
{hasSidebar && ( {hasSidebar && (
@ -69,7 +60,6 @@ const StyleGuideRenderer = ({
</Col> </Col>
</Main> </Main>
</Grid> </Grid>
</div>
</ThemeProvider> </ThemeProvider>
); );

View File

@ -1,14 +1,15 @@
```jsx ```jsx
const React = require('react'); const React = require('react');
const { default: Tooltip, Container, Target } = require('./');
const { Row, Col } = require('react-styled-flexboxgrid'); const { Row, Col } = require('react-styled-flexboxgrid');
const { default: Tooltip, Container, Target } = require('./');
const { P } = require('../text');
<Row center="xs" between="xs" style={{ marginTop: 60 }}> <Row center="xs" between="xs" style={{ marginTop: 60 }}>
<Col xs={2}> <Col xs={2}>
<Container> <Container>
<Target>Hello</Target> <Target>Hello</Target>
<Tooltip placement="top"> <Tooltip placement="top">
<code>top</code> <P white>top</P>
</Tooltip> </Tooltip>
</Container> </Container>
</Col> </Col>
@ -16,7 +17,7 @@ const { Row, Col } = require('react-styled-flexboxgrid');
<Container> <Container>
<Target>Hello</Target> <Target>Hello</Target>
<Tooltip placement="right"> <Tooltip placement="right">
<code>right</code> <P white>right</P>
</Tooltip> </Tooltip>
</Container> </Container>
</Col> </Col>
@ -24,7 +25,7 @@ const { Row, Col } = require('react-styled-flexboxgrid');
<Container> <Container>
<Target>Hello</Target> <Target>Hello</Target>
<Tooltip placement="bottom"> <Tooltip placement="bottom">
<code>bottom</code> <P white>bottom</P>
</Tooltip> </Tooltip>
</Container> </Container>
</Col> </Col>
@ -32,7 +33,7 @@ const { Row, Col } = require('react-styled-flexboxgrid');
<Container> <Container>
<Target>Hello</Target> <Target>Hello</Target>
<Tooltip placement="left"> <Tooltip placement="left">
<code>left</code> <P white>left</P>
</Tooltip> </Tooltip>
</Container> </Container>
</Col> </Col>
@ -43,15 +44,16 @@ const { Row, Col } = require('react-styled-flexboxgrid');
```jsx ```jsx
const React = require('react'); const React = require('react');
const { default: Tooltip, Container, Target } = require('./');
const { Row, Col } = require('react-styled-flexboxgrid'); const { Row, Col } = require('react-styled-flexboxgrid');
const { default: Tooltip, Container, Target } = require('./');
const { P } = require('../text');
<Row center="xs" between="xs"> <Row center="xs" between="xs">
<Col xs={3}> <Col xs={3}>
<Container hoverable> <Container hoverable>
<Target>Hover here</Target> <Target>Hover here</Target>
<Tooltip placement="top"> <Tooltip placement="top">
<code>top</code> <P white>top</P>
</Tooltip> </Tooltip>
</Container> </Container>
</Col> </Col>
@ -62,15 +64,16 @@ const { Row, Col } = require('react-styled-flexboxgrid');
```jsx ```jsx
const React = require('react'); const React = require('react');
const { default: Tooltip, Container, Target } = require('./');
const { Row, Col } = require('react-styled-flexboxgrid'); const { Row, Col } = require('react-styled-flexboxgrid');
const { default: Tooltip, Container, Target } = require('./');
const { P } = require('../text');
<Row center="xs" between="xs"> <Row center="xs" between="xs">
<Col xs={2}> <Col xs={2}>
<Container clickable> <Container clickable>
<Target>Click here</Target> <Target>Click here</Target>
<Tooltip placement="top"> <Tooltip placement="top">
<code>top</code> <P white>top</P>
</Tooltip> </Tooltip>
</Container> </Container>
</Col> </Col>

View File

@ -11,7 +11,7 @@ Array [
Hello Hello
</div>, </div>,
.c0 { .c0 {
padding: 0.8125rem 1.125rem; padding: 0.75rem 1.125rem;
font-weight: normal; font-weight: normal;
background: rgba(73,73,73,1); background: rgba(73,73,73,1);
color: rgb(255,255,255); color: rgb(255,255,255);

View File

@ -11,8 +11,9 @@ import style from './style';
const arrowClassName = rndId(); const arrowClassName = rndId();
const Popper = styled(BasePopper)` const Popper = styled(BasePopper)`
padding: ${remcalc(13)} ${remcalc(18)}; padding: ${remcalc(12)} ${remcalc(18)};
font-weight: normal; font-weight: normal;
${style({ ${style({
background: 'text', background: 'text',
color: 'white', color: 'white',

View File

@ -65,7 +65,6 @@ module.exports = {
name: 'Compound Components', name: 'Compound Components',
components: () => [ components: () => [
'src/table/index.js', 'src/table/index.js',
'src/header/index.js',
'src/message/index.js', 'src/message/index.js',
'src/section-list/index.js', 'src/section-list/index.js',
'src/breadcrumb/index.js' 'src/breadcrumb/index.js'