Skip to content

Commit

Permalink
ADAPT-283: Move files and use stanford basic approach
Browse files Browse the repository at this point in the history
  • Loading branch information
katrialesser committed May 8, 2020
1 parent 9ec9d8b commit 6a5823d
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 31 deletions.
4 changes: 0 additions & 4 deletions css/base/base.css

This file was deleted.

2 changes: 0 additions & 2 deletions css/components/components.css

This file was deleted.

2 changes: 0 additions & 2 deletions css/layout/layout.css

This file was deleted.

2 changes: 0 additions & 2 deletions css/print/print.css

This file was deleted.

2 changes: 0 additions & 2 deletions css/states/states.css

This file was deleted.

Empty file removed css/theme/print.css
Empty file.
2 changes: 0 additions & 2 deletions css/theme/theme.css

This file was deleted.

1 change: 1 addition & 0 deletions dist/css/base.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.stanford-starter:after{content:"Stanford Starter"}
1 change: 1 addition & 0 deletions dist/css/print.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.node.stanford-page{background:#add8e6}
1 change: 1 addition & 0 deletions dist/css/theme.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.node.stanford-page{background:pink}
4 changes: 2 additions & 2 deletions dist/js/base.js → dist/js/scripts.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
5 changes: 5 additions & 0 deletions src/scss/print/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@

// First import decanter as no markup.
@import 'decanter/core/src/scss/decanter-no-markup';

// test katria
.node.stanford-page {
background: lightblue;
}
File renamed without changes.
5 changes: 5 additions & 0 deletions src/scss/theme/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@

// First import decanter as no markup.
@import 'decanter/core/src/scss/decanter-no-markup';

// test katria
.node.stanford-page {
background: pink;
}
12 changes: 6 additions & 6 deletions stanford_starter.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ allpages:
version: VERSION
css:
base:
css/base/base.css: { weight: 100 }
dist/css/base.css: { weight: 100 }
layout:
css/layout/layout.css: {}
dist/css/layout.css: {}
component:
css/components/components.css: {}
dist/css/components.css: {}
state:
css/states/states.css: {}
dist/css/state.css: {}
theme:
css/theme/theme.css: {}
css/theme/print.css: { media: print }
dist/css/theme.css: {}
dist/css/print.css: { media: print }
15 changes: 6 additions & 9 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,23 @@ const distAssets = path.resolve(__dirname, process.env.npm_package_config_distAs
// Start configuring webpack.
var webpackConfig = {
// What am i?
name: 'stanford_basic',
name: 'stanford_starter',
// Allows for map files.
devtool: 'source-map',
// What build?
entry: {
"base": path.resolve(__dirname, srcSass, "base/index.scss"),
"base": path.resolve(__dirname, srcJS, "scripts.js"),
// "behaviors": path.resolve(__dirname, srcJS, "behaviors.js"),
// "ckeditor": path.resolve(__dirname, srcSass, "ckeditor.scss"),
"base": path.resolve(__dirname, srcSass, "base/index.scss"),
"scripts": path.resolve(__dirname, srcJS, "scripts.js"),
"components": path.resolve(__dirname, srcSass, "components/index.scss"),
"layout": path.resolve(__dirname, srcSass, "layout/index.scss"),
"print": path.resolve(__dirname, srcSass, "print/index.scss"),
// "search-page": path.resolve(__dirname, srcSass, "pages/search/index.scss"),
"state": path.resolve(__dirname, srcSass, "states/index.scss"),
"state": path.resolve(__dirname, srcSass, "state/index.scss"),
"theme": path.resolve(__dirname, srcSass, "theme/index.scss"),
// "user_login": path.resolve(__dirname, srcSass, "admin/user_login.scss"),
},
// Where put build?
output: {
filename: "[name].js",
// path: path.resolve(__dirname)
path: path.resolve(__dirname, distJS)
},
// Relative output paths for css assets.
Expand All @@ -79,7 +76,7 @@ var webpackConfig = {
// Drupal behaviors need special handling with webpack.
// https://www.npmjs.com/package/drupal-behaviors-loader
{
test: /\.behavior.js$/,
// test: /\.behavior.js$/,
exclude: /node_modules/,
options: {
enableHmr: false
Expand Down

0 comments on commit 6a5823d

Please sign in to comment.