Commit Graph

174 Commits

Author SHA1 Message Date
Wisani 122ef68de9
Merge pull request #25 from Nona-Creative/fix/favicon-urls
Fix favicon urls
2018-07-19 17:26:47 +02:00
Wisani bbc249663a
Merge branch 'develop' into fix/favicon-urls 2018-07-19 17:26:08 +02:00
sharynt 39c4a4162d
Merge pull request #24 from Nona-Creative/feat/change-wordcloud-hover-colours
Updating wordcloud hover colours
2018-07-19 17:23:19 +02:00
Sharyn 7dc8a87dea Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/change-wordcloud-hover-colours 2018-07-19 17:21:54 +02:00
sharynt dc5a44ba45
Merge pull request #23 from Nona-Creative/feat/page-header-styling
Page header styling
2018-07-19 17:21:36 +02:00
Sharyn 3e8c148238 triggering tests 2018-07-19 17:19:11 +02:00
Wisani Shilumani 4ac211eb73 Fix favicon urls 2018-07-19 17:11:55 +02:00
Sharyn 1c0dd3147b Updated package-lock.json 2018-07-19 17:06:37 +02:00
Sharyn 3397e2a652 adding comment 2018-07-19 17:02:32 +02:00
Sharyn 7fb06aee76 Updating wordcloud hover colours 2018-07-19 16:58:01 +02:00
Sharyn c2c12bd333 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/page-header-styling 2018-07-19 16:46:44 +02:00
sharynt c2b1d00339
Merge pull request #22 from Nona-Creative/feat/adding-title-meta-and-icons
Adding <title> <meta description> and favicon.ico
2018-07-19 16:46:13 +02:00
Sharyn 0985456b37 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/adding-title-meta-and-icons 2018-07-19 16:44:04 +02:00
Sharyn b3e6a6af99 cleanup 2018-07-19 16:43:44 +02:00
Wisani d4a994ec09
Merge pull request #20 from Nona-Creative/fix/string-move
fix string trim
2018-07-19 16:43:15 +02:00
Sharyn 8830c097e0 removing unnecessary css 2018-07-19 16:38:12 +02:00
Sharyn c02fa46f00 cleanup 2018-07-19 16:10:52 +02:00
Sharyn fa09d889be page header styling 2018-07-19 16:08:33 +02:00
Ed O'Reilly 542f841397 Adding <title> <meta description> and favicon.ico 2018-07-19 15:22:51 +02:00
Wisani Shilumani 92a86a9e6a Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into fix/string-move 2018-07-19 15:01:45 +02:00
Wisani Shilumani 3933d94bad Remove all html tags 2018-07-19 14:57:53 +02:00
sharynt a66b66ed42
Merge pull request #21 from Nona-Creative/feat/styling-tweaks
Styling tweaks
2018-07-19 12:42:04 +02:00
Sharyn a56bee9929 extra lines cleanup 2018-07-19 12:21:25 +02:00
Sharyn 43dfa2a999 bigger wordcloud blocks with more spacing 2018-07-19 12:13:23 +02:00
Sharyn aaaee28f63 updating wordcloud hover color 2018-07-19 11:56:00 +02:00
Sharyn 3f66059f00 Who is Nona? 2018-07-19 11:47:11 +02:00
Sharyn ed6227fc88 lint fixes 2018-07-19 11:26:23 +02:00
Sharyn f8512a1d7b Better alignment and space distribution on wordclouds
- also removes "Common" from the "Frustrations and Problems" and "Best" from "Educational Resources" to make things align better?
2018-07-19 11:23:25 +02:00
Sharyn 0b1c145f53 Making page header nav font size bigger 2018-07-19 11:22:29 +02:00
Sharyn 4987b6532a Updating footer text 2018-07-19 11:22:14 +02:00
Wisani Shilumani 72eaa9b25e Comments 2018-07-19 10:50:11 +02:00
Wisani Shilumani 68c3d32618 Comments 2018-07-19 10:48:21 +02:00
Wisani Shilumani efdb5aeca2 fix string trim 2018-07-19 09:57:16 +02:00
sharynt 4fccc3a174
Merge pull request #19 from Nona-Creative/fix/multiple-answers-styling
Adding margin bottom for multiple answers results
2018-07-18 13:15:05 +02:00
Sharyn 97d13a3281 Adding margin bottom for multiple answers results 2018-07-18 13:10:58 +02:00
Wisani fb7cc5610e
Merge pull request #18 from Nona-Creative/feat/upgrade-node
Upgrade node
2018-07-18 13:00:00 +02:00
Wisani Shilumani 23e3f6f48d Upgrade node 2018-07-18 12:59:37 +02:00
Wisani b784297a85
Merge pull request #16 from Nona-Creative/feat/multiple-search-answers
Feat/multiple search answers
2018-07-18 12:49:35 +02:00
Wisani Shilumani 87b9579942 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/multiple-search-answers 2018-07-18 12:48:49 +02:00
sharynt 082bafdffc
Merge pull request #17 from Nona-Creative/feat/resources-styling
Resources styling
2018-07-18 12:47:02 +02:00
Sharyn 0ffc7bef2c styling search count 2018-07-18 12:44:44 +02:00
Wisani 03d18388ee
Update style.scss
Extra line
2018-07-18 12:38:38 +02:00
Sharyn 8ee52bb427 more spacing in wordcloud 2018-07-18 12:34:39 +02:00
Wisani Shilumani dd62595f90 Total match count 2018-07-18 12:34:35 +02:00
Sharyn b507628678 Updating font sizes 2018-07-18 12:27:38 +02:00
Sharyn c2556d0e0f lint fix 2018-07-18 12:23:43 +02:00
Wisani Shilumani a1d3fb96c6 Add count 2018-07-18 12:16:40 +02:00
Wisani Shilumani f1d7754ab2 Add count 2018-07-18 12:13:04 +02:00
Sharyn d3525939e1 extracting content into data object 2018-07-18 12:10:04 +02:00
Sharyn d2059c5fbc Updating word clouds and removing slider modal 2018-07-18 12:02:11 +02:00