Merge 5fbd113 into 4d04b04

AgileVentures · Jan 9, 2019 · cfcdfd5 · cfcdfd5
2 parents 4d04b04 + 5fbd113
commit cfcdfd5
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 /coverage
 /dist
+/semantic
diff --git a/README.MD b/README.MD
@@ -1 +1,18 @@
-[![Coverage Status](https://coveralls.io/repos/github/AgileVentures/WebsiteOne-FE/badge.svg?branch=develop)](https://coveralls.io/github/AgileVentures/WebsiteOne-FE?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/github/AgileVentures/WebsiteOne-FE/badge.svg?branch=develop)](https://coveralls.io/github/AgileVentures/WebsiteOne-FE?branch=develop)
+
+# Semantic ui - customize
+## This needs to be run with npm - yarn does not support menu
+`# npm install semantic-ui`
+
+This will create a new semantic folder
+and copy our defaut file:
+
+`cp site.variables semantic/src/site/globals/` 
+
+Then you can build semantic-ui
+`gulp build` or `./../node_modules/gulp/bin/gulp.js build`
+use the default values
+
+and copy the folder to our src folder
+
+`cp -R dist/* ../src/assets/`
diff --git a/semantic.json b/semantic.json
@@ -0,0 +1,22 @@
+{
+  "base": "semantic/",
+  "paths": {
+    "source": {
+      "config": "src/theme.config",
+      "definitions": "src/definitions/",
+      "site": "src/site/",
+      "themes": "src/themes/"
+    },
+    "output": {
+      "packaged": "dist/",
+      "uncompressed": "dist/components/",
+      "compressed": "dist/components/",
+      "themes": "dist/themes/"
+    },
+    "clean": "dist/"
+  },
+  "permission": false,
+  "autoInstall": false,
+  "rtl": false,
+  "version": "2.4.2"
+}
diff --git a/site.variables b/site.variables
@@ -0,0 +1,45 @@
+/*******************************
+     User Global Variables
+*******************************/
+
+@fontName          : 'Ubuntu';
+@googleFontSizes   : '400,500,400i,500i';
+@bold              : 500;
+@emSize   : 16px;
+@fontSize : 16px;
+@primaryColor        : @orange;
+@secondaryColor      : @teal;
+@lightPrimaryColor   : @lightOrange;
+@lightSecondaryColor : @lightTeal;
+@headerLineHeight : unit((20 / 14), em);
+@h1 : unit((35 / 14), rem);
+@h2 : unit((30 / 14), rem);
+@h3 : unit((26 / 14), rem);
+@h4 : unit((21 / 14), rem);
+@h5 : unit((18 / 14), rem);
+@lineHeight          : 1.4127em;
+@textColor           : rgba(0, 0, 1, 0.72);
+@linkColor           : @orange;
+@blue             : #337AB7;
+@green            : #5Cb85C;
+@olive            : #9CA780;
+@orange           : #EE7335;
+@pink             : #D9499A;
+@purple           : #A24096;
+@red              : #E7603B;
+@teal             : #6BABA1;
+@yellow           : #E0A32E;
+@darkBlue         : #34495E;
+@brown            : #A5673F;
+@white            : #FFFFFF;
+@lightBlue        : lighten( @blue, 5);
+@lightGreen       : lighten( @green, 5);
+@lightOrange      : lighten( @orange, 5);
+@lightPink        : #FF8EDF;
+@lightPurple      : #CDC6FF;
+@lightRed         : lighten( @red, 5);
+@lightTeal        : lighten( @teal, 5);
+@lightYellow      : lighten( @yellow, 5);
+@lightOlive       : lighten( @olive, 5);
+@primaryColor     : @orange;
+@secondaryColor   : @darkBlue;
diff --git a/src/Wink.js b/src/Wink.js
diff --git a/src/index.html b/src/index.html
@@ -6,7 +6,6 @@
     <title>Books By Povic</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-
 </head>
 <body>
     <div id="root"></div>

diff --git a/src/index.js b/src/index.js
@@ -3,6 +3,8 @@ import { render } from "react-dom";
 import { UsersList } from "./containers/UsersList";
 import { BrowserRouter, Route, Switch } from "react-router-dom";
 
+import "./assets/semantic.css"
+
 render(
   <BrowserRouter>
     <Switch>

diff --git a/src/tests/wink.spec.js b/src/tests/wink.spec.js
diff --git a/src/wink.css b/src/wink.css