From fa23bfe4bb6e67b572cf50c25918f29756f3a296 Mon Sep 17 00:00:00 2001 From: Gabriel Rodriguez Alsina Date: Mon, 17 Dec 2018 23:10:54 -0300 Subject: [PATCH] (Add) mobile menu background styles - header styles - general layout - refactored some elements --- src/App.js | 16 +- src/assets/images/logos/logo_loader.svg | 1 - src/assets/images/socials/git-sokol.png | Bin 339 -> 0 bytes src/assets/images/socials/git-sokol@2x.png | Bin 637 -> 0 bytes src/assets/images/socials/git.png | Bin 340 -> 0 bytes src/assets/images/socials/git@2x.png | Bin 632 -> 0 bytes src/assets/images/socials/poa-sokol.png | Bin 214 -> 0 bytes src/assets/images/socials/poa-sokol@2x.png | Bin 341 -> 0 bytes src/assets/images/socials/poa.png | Bin 214 -> 0 bytes src/assets/images/socials/poa@2x.png | Bin 341 -> 0 bytes src/assets/images/socials/telegram-sokol.png | Bin 277 -> 0 bytes .../images/socials/telegram-sokol@2x.png | Bin 505 -> 0 bytes src/assets/images/socials/telegram.png | Bin 277 -> 0 bytes src/assets/images/socials/telegram@2x.png | Bin 505 -> 0 bytes src/assets/images/socials/tw-sokol.png | Bin 241 -> 0 bytes src/assets/images/socials/tw-sokol@2x.png | Bin 424 -> 0 bytes src/assets/images/socials/tw.png | Bin 240 -> 0 bytes src/assets/images/socials/tw@2x.png | Bin 426 -> 0 bytes .../stylesheets/application/_footer.scss | 62 ------ .../stylesheets/application/_header.scss | 193 ------------------ .../stylesheets/application/_layout.scss | 52 ----- .../stylesheets/application/_loading.scss | 78 ------- .../stylesheets/application/_search.scss | 1 + .../stylesheets/application/_socials.scss | 104 ---------- src/assets/stylesheets/components/_App.scss | 71 +++++++ .../stylesheets/components/_Footer.scss | 1 + .../stylesheets/components/_Header.scss | 140 +++++++++++++ .../components/_MobileMenuLinks.scss | 56 +++++ src/assets/stylesheets/components/_index.scss | 15 +- .../stylesheets/components/_link-icons.scss | 31 +++ .../stylesheets/helpers/_variables.scss | 2 +- src/assets/stylesheets/index.css | 2 +- src/assets/stylesheets/index.scss | 11 - src/assets/stylesheets/layout/_base.scss | 25 +-- src/assets/stylesheets/vendors/_index.scss | 1 + .../select/_components.scss | 0 .../select/_control.scss | 0 .../select/_default.scss | 0 .../stylesheets/vendors/select/_index.scss | 5 + .../select/_menu.scss | 0 .../select/_mixins.scss | 0 .../select/_multi.scss | 0 .../select/_select.scss | 0 .../select/_spinner.scss | 0 src/components/Header.jsx | 44 ---- src/components/Header/index.js | 42 ++++ src/components/MobileMenuLinks.jsx | 17 -- src/components/MobileMenuLinks/index.js | 22 ++ src/components/Settings.jsx | 30 --- src/components/index.js | 9 +- 50 files changed, 403 insertions(+), 628 deletions(-) delete mode 100644 src/assets/images/logos/logo_loader.svg delete mode 100644 src/assets/images/socials/git-sokol.png delete mode 100644 src/assets/images/socials/git-sokol@2x.png delete mode 100644 src/assets/images/socials/git.png delete mode 100644 src/assets/images/socials/git@2x.png delete mode 100644 src/assets/images/socials/poa-sokol.png delete mode 100644 src/assets/images/socials/poa-sokol@2x.png delete mode 100644 src/assets/images/socials/poa.png delete mode 100644 src/assets/images/socials/poa@2x.png delete mode 100644 src/assets/images/socials/telegram-sokol.png delete mode 100644 src/assets/images/socials/telegram-sokol@2x.png delete mode 100644 src/assets/images/socials/telegram.png delete mode 100644 src/assets/images/socials/telegram@2x.png delete mode 100644 src/assets/images/socials/tw-sokol.png delete mode 100644 src/assets/images/socials/tw-sokol@2x.png delete mode 100644 src/assets/images/socials/tw.png delete mode 100644 src/assets/images/socials/tw@2x.png delete mode 100644 src/assets/stylesheets/application/_footer.scss delete mode 100644 src/assets/stylesheets/application/_header.scss delete mode 100644 src/assets/stylesheets/application/_layout.scss delete mode 100644 src/assets/stylesheets/application/_loading.scss delete mode 100644 src/assets/stylesheets/application/_socials.scss create mode 100644 src/assets/stylesheets/components/_App.scss create mode 100644 src/assets/stylesheets/components/_Header.scss create mode 100644 src/assets/stylesheets/components/_MobileMenuLinks.scss create mode 100644 src/assets/stylesheets/components/_link-icons.scss rename src/assets/stylesheets/{application => vendors}/select/_components.scss (100%) rename src/assets/stylesheets/{application => vendors}/select/_control.scss (100%) rename src/assets/stylesheets/{application => vendors}/select/_default.scss (100%) create mode 100644 src/assets/stylesheets/vendors/select/_index.scss rename src/assets/stylesheets/{application => vendors}/select/_menu.scss (100%) rename src/assets/stylesheets/{application => vendors}/select/_mixins.scss (100%) rename src/assets/stylesheets/{application => vendors}/select/_multi.scss (100%) rename src/assets/stylesheets/{application => vendors}/select/_select.scss (100%) rename src/assets/stylesheets/{application => vendors}/select/_spinner.scss (100%) delete mode 100644 src/components/Header.jsx create mode 100644 src/components/Header/index.js delete mode 100644 src/components/MobileMenuLinks.jsx create mode 100644 src/components/MobileMenuLinks/index.js delete mode 100644 src/components/Settings.jsx diff --git a/src/App.js b/src/App.js index e5c8757..f80dee4 100644 --- a/src/App.js +++ b/src/App.js @@ -140,22 +140,21 @@ class App extends Component { ) : null - const isTestnet = contractsStore.netId in constants.NETWORKS && constants.NETWORKS[contractsStore.netId].TESTNET - return networkBranch ? ( -
+
{commonStore.loading ? : null}
{search} -
@@ -168,10 +167,9 @@ class App extends Component { - {/**/} -
+