Commit Graph

328 Commits

Author SHA1 Message Date
JUDIT GRESKOVITS
390adddd30 Resolving conflict 2017-01-23 15:14:06 +00:00
JUDIT GRESKOVITS
1b42954bf2 Add metric display 2017-01-23 15:05:51 +00:00
Alex Windett
3b6817640f editing story to pull in react component instead of string 2017-01-20 14:47:29 +00:00
Alex Windett
e7905322a5 updating readme 2017-01-20 14:39:00 +00:00
Alex Windett
569b3182dd adding padding to td`s 2017-01-20 14:37:19 +00:00
Alex Windett
a315a9cff2 starting to style data table 2017-01-20 14:23:19 +00:00
Alex Windett
18b724390a renaming directories. Table >> Simple Table and Table New >> Data Table 2017-01-20 14:21:26 +00:00
Alex Windett
d80933c9dc removing old storybook story 2017-01-20 14:21:26 +00:00
Alex Windett
186353111b refactoring, removing comments and unused files for new table 2017-01-20 14:21:26 +00:00
Alex Windett
fb579ac378 adding table head to new table 2017-01-20 14:21:26 +00:00
Alex Windett
5dd5bc9498 fixing unassigned object and changing forEach to map, plus fixing lintingst 2017-01-20 14:21:26 +00:00
Alex Windett
c43832c2d0 working on table by passing in js object 2017-01-20 14:21:26 +00:00
Alex Windett
2b25582af0 implimenting simple table component 2017-01-20 14:21:26 +00:00
Alex Windett
27fccb364d Merge branch 'master' into seperating-normalize-css 2017-01-20 13:27:14 +00:00
Alex Windett
c2e15dabd7 regenerating yarn.lock file 2017-01-20 13:24:58 +00:00
Tom Gallacher
f780988291 Fixing font colours and colours of list items 2017-01-19 15:49:01 +00:00
Tom Gallacher
230d4c0354 Adding mini metric back into storybook 2017-01-19 15:08:55 +00:00
Tom Gallacher
b735cd2ee2 Adding 5 o'clock shadow to org navigation 2017-01-19 15:08:44 +00:00
JUDIT GRESKOVITS
9156526ce0 Add yarn lock 2017-01-19 12:11:51 +01:00
JUDIT GRESKOVITS
bf635b3596 Merge branch 'master' of https://github.com/yldio/joyent-portal 2017-01-18 17:52:37 +00:00
JUDIT GRESKOVITS
2c7d751204 Add functional metric chart with customisable time scale 2017-01-18 17:52:20 +00:00
Alex Windett
2b1a94fbfa starting work on impliment people/members module 2017-01-18 17:01:16 +00:00
Tom Gallacher
caef3ca57e Fix asset copy on npm publish in ui 2017-01-18 14:58:54 +00:00
Alex Windett
f7adaa1cfe updating normalize with our css 2017-01-18 14:32:17 +00:00
Alex Windett
625b6c8922 removing unused variables 2017-01-18 14:32:17 +00:00
Alex Windett
acbf130c2c Seperating Normalization and Bootstrap Reboot
- Moving normalizae styles out of <Base> component.
- Creating CSS file for normalize css in vendor
- Moving assets directory
- Updating npm storybook script to include new normalize css
- Adding normalize css to <head> of storybook
- Adding css-loader to frontend webpack
- Including normalize.css in root of frontend
2017-01-18 14:32:17 +00:00
Tom Gallacher
081c379d0b Adding a files directory to package 2017-01-18 13:56:55 +00:00
Tom Gallacher
8a8da6b4be Make directory on compile 2017-01-18 12:46:44 +00:00
Tom Gallacher
abd113d009 Fixing UI and frontend compilation 2017-01-18 12:39:28 +00:00
Tom Gallacher
0c0b2dd145 Adding licence checker 2017-01-17 16:50:48 +00:00
Tom Gallacher
40613c8535 Adding Organisation Tabs 2017-01-17 16:50:48 +00:00
Sérgio Ramos
baa00dfc27 turn create-monitor into a form 2017-01-17 11:31:18 +00:00
Alex Windett
0fbe168764 correcting font style for H1 2017-01-17 11:18:49 +00:00
Sérgio Ramos
7592648abc update dependencies 2017-01-16 19:53:05 +00:00
Sérgio Ramos
7e157a15a1 remove Close dependency from Modal 2017-01-16 19:45:56 +00:00
Sérgio Ramos
8ac2a7c60f refactor Input and Select 2017-01-16 19:45:35 +00:00
Sérgio Ramos
bd1ff8171a detach transfer-props from List 2017-01-16 19:45:35 +00:00
Sérgio Ramos
224f13998e add forms colors 2017-01-16 19:45:35 +00:00
Alex Windett
bc5d974594 removing uppercasing of element, now have to make object name the name thats is to be used as component 2017-01-16 18:00:16 +00:00
Alex Windett
dbe3289bb6 creating base elements component loop 2017-01-16 17:38:21 +00:00
Tom Gallacher
355e5bb587 Fixing incorrect fonts. 2017-01-16 14:02:31 +00:00
JUDIT GRESKOVITS
97fced5728 Resolving another conflict 2017-01-13 18:20:13 +00:00
JUDIT GRESKOVITS
55be4bbaa8 Resolving ocnflict 2017-01-13 18:17:27 +00:00
Tom Gallacher
348b24a31d Adding test hook to allow requiring of fonts 2017-01-13 18:14:25 +00:00
Tom Gallacher
4953ae36ea Fixing fonts 2017-01-13 18:14:25 +00:00
JUDIT GRESKOVITS
54524d23df Add Metric header and add svg inlining to webpack with new loader to style svgs with css 2017-01-13 18:08:43 +00:00
Alex Windett
1af66477d3 adding in explenation for file 2017-01-13 16:12:41 +00:00
Alex Windett
3ecedf94d6 adding baseunit objects to constants 2017-01-13 15:38:57 +00:00
Tom Gallacher
8513d8c904 Fixing the build 2017-01-13 12:43:47 +00:00
Tom Gallacher
2754d8d3dd Move box plot to use "prerelease" tag in npm
yarn add chartjs-chart-box-plot@prerelease
2017-01-13 12:36:43 +00:00