Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Feature/width styles#51

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.

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

Already on GitHub?Sign in to your account

Merged
ShMcK merged 2 commits intomasterfromfeature/width-styles
Nov 10, 2019
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
14 changes: 13 additions & 1 deletionweb-app/src/components/Card/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
import * as React from 'react'
import { Card as AlifdCard } from '@alifd/next'

const styles = {
card: {
display: 'flex',
width: '100%',
},
}

interface Props {
children: React.ReactNode
onClick?: () => void
style?: React.CSSProperties
}

const Card = (props: Props) => (
<AlifdCard showTitleBullet={false} contentHeight="auto" onClick={props.onClick} style={props.style}>
<AlifdCard
showTitleBullet={false}
contentHeight="auto"
onClick={props.onClick}
style={{ ...styles.card, ...props.style }}
>
{props.children}
</AlifdCard>
)
Expand Down
6 changes: 3 additions & 3 deletionsweb-app/src/components/Workspace/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@ interface Props {
}

const resize = () => ({
width: window.innerWidth - 20,
height: window.innerHeight - 20,
minWidth: window.innerWidth - 20,
minHeight: window.innerHeight - 20,
})

const Workspace = ({ children }: Props) => {
Expand All@@ -19,7 +19,7 @@ const Workspace = ({ children }: Props) => {

const styles = {
page: {
display: 'flex' as 'flex',
display: 'flex' as 'flex',
margin: 0,
backgroundColor: 'white',
},
Expand Down
8 changes: 7 additions & 1 deletionweb-app/src/containers/Continue/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,14 +4,20 @@ import Card from '../../components/Card'
import * as CR from 'typings'
import * as G from 'typings/graphql'

const styles = {
page: {
width: '100%',
},
}

interface Props {
tutorial: G.Tutorial
onContinue(): void
onNew(): void
}

export const ContinuePage = (props: Props) => (
<div>
<div style={styles.page}>
<h3>Continue</h3>
<Card>
<div>
Expand Down
3 changes: 1 addition & 2 deletionsweb-app/src/containers/LoadingPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,8 +10,7 @@ const styles = {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
width: window.innerWidth - 20,
height: window.innerHeight - 20,
width: '100%',
},
}

Expand Down
5 changes: 4 additions & 1 deletionweb-app/src/containers/New/NewPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,9 @@ import * as G from 'typings/graphql'
import TutorialList from './TutorialList'

const styles = {
page: {
width: '100%',
},
header: {
height: '36px',
backgroundColor: '#EBEBEB',
Expand All@@ -22,7 +25,7 @@ interface Props {
}

const NewPage = (props: Props) => (
<div>
<div style={styles.page}>
<div style={styles.header}>
<span>CodeRoad</span>
</div>
Expand Down
23 changes: 0 additions & 23 deletionsweb-app/src/containers/New/TutorialItem.tsx
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletionweb-app/src/containers/Overview/OverviewPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@ import * as G from 'typings/graphql'
import Markdown from '../../components/Markdown'

const styles = {
page: {
width: '100%',
},
summary: {
padding: '0rem 1rem 1rem 1rem',
},
Expand DownExpand Up@@ -47,7 +50,7 @@ interface Props {
}

const Summary = ({ title, description, levels, onNext }: Props) => (
<div>
<div style={styles.page}>
<div style={styles.header}>
<span>CodeRoad</span>
</div>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import Markdown from '../../../../components/Markdown'
const styles = {
card: {
padding: 0,
width: '100%',
},
header: {
height: '36px',
Expand Down
3 changes: 1 addition & 2 deletionsweb-app/stories/utils/SideBarDecorator.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,8 @@ const styles = {
container: {
position: 'relative' as 'relative',
boxSizing: 'border-box' as 'border-box',
maxWidth: '20rem',
borderRight: '2px solid black',
width: '20rem',
width: '100%',
height: window.innerHeight,
},
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp