Commit Graph

206 Commits

Author SHA1 Message Date
Sharyn 958c0c021c Adding orange underline to wordcloud links on mobile only 2018-07-20 14:25:25 +02:00
Sharyn 0727d288ce Removing usability from topics list 2018-07-20 14:25:04 +02:00
sharynt 23b8d1a8e8
Merge pull request #30 from Nona-Creative/feat/node-transform-json
Automatically transform JSON
2018-07-20 12:25:07 +02:00
Sharyn 211ce269b6 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/node-transform-json 2018-07-20 12:24:20 +02:00
sharynt 8f6f7975a3
Merge pull request #31 from Nona-Creative/fix/update-topics-and-projects-list
Updating topics and projects lists
2018-07-20 12:23:54 +02:00
Sharyn a216ed9f77 last css tweaks! 2018-07-20 12:23:10 +02:00
Sharyn b4ea6e4f65 Making css mixin 2018-07-20 12:10:25 +02:00
Sharyn e3cf0f78a3 Updating topics and projects
based on latest content provided
2018-07-20 11:55:56 +02:00
Wisani Shilumani a303705a79 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/node-transform-json 2018-07-20 11:43:16 +02:00
sharynt ae11f90351
Merge pull request #29 from Nona-Creative/fix/sticky-header-max-width
Larger sticky-header max width
2018-07-20 11:25:08 +02:00
Wisani Shilumani bad161405c Automatically transform JSON 2018-07-20 11:16:50 +02:00
Sharyn 3519e0177e Larger sticky-header max width
So no overlap on bigger screens
2018-07-20 11:15:01 +02:00
sharynt 8461f3fc15
Merge pull request #27 from Nona-Creative/feat/headroom-scroll
Adding react-headroom
2018-07-20 11:06:09 +02:00
Sharyn 36d8415484 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/headroom-scroll 2018-07-20 10:56:22 +02:00
Wisani 6a8ede1cee
Merge pull request #28 from Nona-Creative/feat/new-json-structure
New JSON structure transform
2018-07-20 10:55:10 +02:00
Sharyn 6bc94c6c35 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/headroom-scroll 2018-07-20 10:54:03 +02:00
Wisani Shilumani b35348dfd6 remove extra line 2018-07-20 10:49:20 +02:00
Wisani Shilumani 6f7dfa9f84 Merge branch 'develop' of github.com:Nona-Creative/ETHPrize into feat/new-json-structure 2018-07-20 10:48:22 +02:00
Sharyn 8cfb0b479c removing uptolerance 2018-07-20 10:48:17 +02:00
Wisani Shilumani e096341d65 Add comment 2018-07-20 10:35:00 +02:00
Wisani Shilumani 85c1641475 Remove comment 2018-07-20 10:29:46 +02:00
Wisani Shilumani adde5e0a0e New JSON structure transform 2018-07-20 10:27:44 +02:00
Sharyn 06b341a533 tweaking headroom settings 2018-07-20 10:18:55 +02:00
sharynt 0bba081be9
Merge pull request #26 from Nona-Creative/fix/various-mobile-fixes
Various mobile fixes
2018-07-20 09:50:34 +02:00
Sharyn 530c8873b7 Adding react-headroom 2018-07-20 09:42:17 +02:00
Sharyn f84b5bfeb2 lint fix 2018-07-20 09:26:20 +02:00
Sharyn ba9a5b2b48 single inetrview spacing for readability 2018-07-20 09:18:54 +02:00
Sharyn 000b149e55 search bar bottom spacing 2018-07-20 09:18:37 +02:00
Sharyn d636080bc0 desktop browse order fix 2018-07-20 09:18:25 +02:00
Sharyn 3ab5138979 search bar no rounded corners on webkit 2018-07-20 09:18:10 +02:00
Sharyn c42480b364 modal styling 2018-07-20 09:17:10 +02:00
Sharyn 14035aa6ff search bar bottom spacing 2018-07-20 09:17:00 +02:00
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