Merge branch 'develop' of https://github.com/deskpro/portal-components …

…into develop
deskpro · Jun 18, 2019 · 3220875 · 3220875
2 parents 2d1f65b + 4a61534
commit 3220875
Show file tree

Hide file tree

Showing 4 changed files with 308 additions and 4 deletions.
diff --git a/bin/travis-prep-website.sh b/bin/travis-prep-website.sh
@@ -23,15 +23,15 @@ mv ./packages/components-demo/storybook-static ./target/gh-pages/demo
 cat << EOF > ./target/gh-pages/index.html
 <html>
 <head>
-  <title>Deskpro Agent Interface</title>
+  <title>Deskpro Portal Components</title>
   <link rel="stylesheet" href="style/css/main.css" />
 </head>
 <body>
   <div class="homeContainer">
     <div class="homeSplashFade">
       <div class="wrapper homeWrapper">
         <div class="inner">
-          <h2 class="projectTitle">Agent Interface</h2>
+          <h2 class="projectTitle">Portal Components</h2>
 
           <div class="section promoSection">
             <div class="promoRow">
@@ -44,7 +44,7 @@ cat << EOF > ./target/gh-pages/index.html
                 </div>
 
                 <div class="pluginWrapper buttonWrapper">
-                  <a class="button" href="https://github.com/deskpro/agent-interface">GitHub</a>
+                  <a class="button" href="https://github.com/deskpro/portal-components">GitHub</a>
                 </div>
               </div>
             </div>

diff --git a/packages/components-demo/.storybook/webpack.config.js b/packages/components-demo/.storybook/webpack.config.js
@@ -1,7 +1,27 @@
 const cssnext = require('postcss-preset-env');
+const path = require('path');
 
 module.exports = async ({ config }) => {
 
+  config.module.rules = config.module.rules.filter(rule => !rule.test.exec('.css'));
+  config.module.rules.push({
+    test: /\.css$/,
+      use: [
+        'style-loader',
+        { loader: 'css-loader', options: { /*modules: true, importLoaders: 1 */ } },
+        {
+          loader: 'postcss-loader',
+          options: {
+            ident: 'postcss',
+            plugins: () => [
+              cssnext(),
+            ],
+            sourceMap: true,
+          },
+        },
+      ],
+    include: path.resolve(__dirname, '../../')
+  });
   config.module.rules.push({
     test: /\.(ttf|eot|woff|woff2)$/,
     loader: 'file-loader',

diff --git a/packages/style/website/pages/en/index.js b/packages/style/website/pages/en/index.js
@@ -66,7 +66,7 @@ class HomeSplash extends React.Component {
           <PromoSection>
             <Button href={docUrl('intro.html', language)}>Docs</Button>
             <Button href={pageUrl('demo.html', language)}>Demo</Button>
-            <Button href="https://github.com/deskpro/agent-interface">GitHub</Button>
+            <Button href="https://github.com/deskpro/portal-components">GitHub</Button>
           </PromoSection>
         </div>
       </SplashContainer>

diff --git a/packages/style/website/static/css/style.css b/packages/style/website/static/css/style.css