Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
157a7a7b
Unverified
Commit
157a7a7b
authored
Jan 30, 2020
by
Tim Neutkens
Committed by
GitHub
Jan 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade with-carbon-components to built-in SCSS (#10321)
Co-authored-by:
Joe Haddad
<
timer150@gmail.com
>
parent
81fd7046
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
47 deletions
+14
-47
next.config.js
examples/with-carbon-components/next.config.js
+5
-23
package.json
examples/with-carbon-components/package.json
+0
-2
_app.js
examples/with-carbon-components/pages/_app.js
+7
-0
_document.js
examples/with-carbon-components/pages/_document.js
+0
-17
index.js
examples/with-carbon-components/pages/index.js
+0
-2
myCustomTheme.scss
examples/with-carbon-components/static/myCustomTheme.scss
+0
-3
custom-theme.scss
examples/with-carbon-components/styles/custom-theme.scss
+2
-0
export.scss
examples/with-carbon-components/styles/export.scss
+0
-0
No files found.
examples/with-carbon-components/next.config.js
View file @
157a7a7b
const
withSass
=
require
(
'@zeit/next-sass'
)
module
.
exports
=
{
const
withImages
=
require
(
'next-images'
)
experimental
:
{
scss
:
true
,
module
.
exports
=
withImages
(
},
withSass
({
}
webpack
(
config
)
{
config
.
module
.
rules
.
push
({
test
:
/
\.(
png|svg|eot|otf|ttf|woff|woff2
)
$/
,
use
:
{
loader
:
'url-loader'
,
options
:
{
limit
:
100000
,
publicPath
:
'./'
,
outputPath
:
'static/'
,
name
:
'[name].[ext]'
,
},
},
})
return
config
},
})
)
examples/with-carbon-components/package.json
View file @
157a7a7b
...
@@ -10,12 +10,10 @@
...
@@ -10,12 +10,10 @@
},
},
"license"
:
"ISC"
,
"license"
:
"ISC"
,
"dependencies"
:
{
"dependencies"
:
{
"@zeit/next-sass"
:
"^1.0.1"
,
"carbon-components"
:
"^9.6.4"
,
"carbon-components"
:
"^9.6.4"
,
"carbon-components-react"
:
"^6.19.1"
,
"carbon-components-react"
:
"^6.19.1"
,
"carbon-icons"
:
"^7.0.7"
,
"carbon-icons"
:
"^7.0.7"
,
"next"
:
"latest"
,
"next"
:
"latest"
,
"next-images"
:
"^0.10.6"
,
"react"
:
"^16.7.0"
,
"react"
:
"^16.7.0"
,
"react-dom"
:
"^16.7.0"
"react-dom"
:
"^16.7.0"
}
}
...
...
examples/with-carbon-components/pages/_app.js
0 → 100644
View file @
157a7a7b
import
'../styles/custom-theme.scss'
function
MyApp
({
Component
,
pageProps
})
{
return
<
Component
{...
pageProps
}
/
>
}
export
default
MyApp
examples/with-carbon-components/pages/_document.js
deleted
100644 → 0
View file @
81fd7046
import
Document
,
{
Head
,
Main
,
NextScript
}
from
'next/document'
export
default
class
MyDocument
extends
Document
{
render
()
{
return
(
<
html
>
<
Head
>
<
link
rel
=
"stylesheet"
href
=
"/_next/static/style.css"
/>
<
/Head
>
<
body
>
<
Main
/>
<
NextScript
/>
<
/body
>
<
/html
>
)
}
}
examples/with-carbon-components/pages/index.js
View file @
157a7a7b
import
React
,
{
Component
,
Fragment
}
from
'react'
import
React
,
{
Component
,
Fragment
}
from
'react'
import
{
Button
}
from
'carbon-components-react'
import
{
Button
}
from
'carbon-components-react'
import
'../static/myCustomTheme.scss'
export
default
class
DemoApp
extends
Component
{
export
default
class
DemoApp
extends
Component
{
render
()
{
render
()
{
return
(
return
(
...
...
examples/with-carbon-components/static/myCustomTheme.scss
deleted
100644 → 0
View file @
81fd7046
@import
'./export.scss'
;
@import
'../node_modules/carbon-components/scss/globals/scss/styles.scss'
;
examples/with-carbon-components/styles/custom-theme.scss
0 → 100644
View file @
157a7a7b
@import
'./export.scss'
;
@import
'~carbon-components/scss/globals/scss/styles.scss'
;
examples/with-carbon-components/st
atic
/export.scss
→
examples/with-carbon-components/st
yles
/export.scss
View file @
157a7a7b
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment