#13 DONE

TimeoutZero · Sep 10, 2016 · 1a0689c · 1a0689c
1 parent 4436d80
commit 1a0689c
Show file tree

Hide file tree

Showing 13 changed files with 1,232 additions and 346 deletions.
diff --git a/chromeExtension/assets/fontawesome-webfont.eot b/chromeExtension/assets/fontawesome-webfont.eot
diff --git a/chromeExtension/assets/fontawesome-webfont.svg b/chromeExtension/assets/fontawesome-webfont.svg
diff --git a/chromeExtension/assets/fontawesome-webfont.ttf b/chromeExtension/assets/fontawesome-webfont.ttf
diff --git a/chromeExtension/assets/fontawesome-webfont.woff b/chromeExtension/assets/fontawesome-webfont.woff
diff --git a/chromeExtension/assets/fontawesome-webfont.woff2 b/chromeExtension/assets/fontawesome-webfont.woff2
diff --git a/chromeExtension/features/content/CategoryBrowse.component.js b/chromeExtension/features/content/CategoryBrowse.component.js
diff --git a/chromeExtension/manifest.json b/chromeExtension/manifest.json
@@ -30,5 +30,10 @@
     "activeTab",
     "declarativeContent",
     "https://ajax.googleapis.com/"
+  ],
+
+  "web_accessible_resources" : [
+    "assets/*"
   ]
+
 }
diff --git a/reactComponent/cfg/defaults.js b/reactComponent/cfg/defaults.js
@@ -31,13 +31,17 @@ function getDefaultModules() {
         loader: 'style-loader!css-loader!postcss-loader!stylus-loader'
       },
       {
-        test: /\.(png|jpg|gif|woff|woff2|ttf|eot|otf)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        test: /\.(png|jpg|gif)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: 'url-loader?limit=8192'
       },
       {
-        test: /\.(mp4|ogg|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        test: /\.(mp4|ogg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: 'file-loader'
       },
+      {
+        test: /\.(woff|woff2|ttf|eot|otf|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+        loader: 'file-loader?name=[name].[ext]'
+      },
       { test: /\.rt$/, loader: "react-templates-loader" }
     ]
   };

diff --git a/reactComponent/cfg/dist.js b/reactComponent/cfg/dist.js
@@ -29,7 +29,8 @@ let config = Object.assign({}, baseConfig, {
   module: defaultSettings.getDefaultModules()
 });
 
-config.output.filename = 'CategoryBrowse.component.js';
+config.output.filename   = 'CategoryBrowse.component.js';
+config.output.publicPath = null;
 
 // Add needed loaders to the defaults here
 config.module.loaders.push({

diff --git a/reactComponent/src/component.entry.prod.js b/reactComponent/src/component.entry.prod.js
@@ -1,7 +1,10 @@
+
+
+import App from './components/Main.prod';
 import 'core-js/fn/object/assign';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './components/Main.prod';
+
 
 /**
  * Variables

diff --git a/reactComponent/src/components/CategoryBrowse/categoryBrowse.scss b/reactComponent/src/components/CategoryBrowse/categoryBrowse.scss
@@ -113,9 +113,10 @@ $fa-font-path: '../fontAwesome';
       .clear-trigger{
         position: absolute;
         line-height: 50px;
+        font-size: 20px;
         right: 10px;
         opacity: 0.5;
-        transition: opacity 0.3s ease-in-out;
+        transition: opacity 0.2s ease-in-out;
         cursor: pointer;
 
         &:hover {
@@ -172,7 +173,7 @@ $fa-font-path: '../fontAwesome';
 
         .ff-toolbar-item {
           opacity: 0.5;
-          transition: opacity 0.3s ease-in-out;
+          transition: opacity 0.2s ease-in-out;
           margin: 10px 10px 0 0;
           display: block;
           cursor: pointer;

diff --git a/reactComponent/src/components/Main.prod.js b/reactComponent/src/components/Main.prod.js
@@ -2,6 +2,7 @@
 import React from 'react';
 import {IntlProvider, addLocaleData} from 'react-intl';
 
+import './overridesPublicPath.js';
 import CategoryBrowse from './CategoryBrowse/CategoryBrowse';
 import I18n from './i18n/i18n';
 

diff --git a/reactComponent/src/components/overridesPublicPath.js b/reactComponent/src/components/overridesPublicPath.js
@@ -0,0 +1 @@
+__webpack_public_path__ = window.chrome.extension.getURL("") + 'assets/';