From 203b45f4d58200bc9b3a91c668ab24d36e7ad467 Mon Sep 17 00:00:00 2001 From: liyasthomas Date: Fri, 30 Jul 2021 13:52:43 +0530 Subject: [PATCH] refactor: cleanup --- assets/icons/graphql.svg | 1 + assets/scss/styles.scss | 12 ++- components/app/Announcement.vue | 9 +-- components/app/Footer.vue | 4 +- components/app/Header.vue | 7 -- components/app/Sidenav.vue | 19 +++-- components/button/Primary.vue | 14 +++- components/button/Secondary.vue | 14 +++- components/http/CodegenModal.vue | 2 +- components/http/Request.vue | 4 +- components/smart/Modal.vue | 6 +- components/teams/Edit.vue | 135 ++++++++++++++++++------------- components/teams/Team.vue | 2 +- components/teams/index.vue | 2 +- pages/profile.vue | 38 --------- pages/settings.vue | 8 ++ static/icons/github.svg | 62 -------------- static/icons/graphql.svg | 74 ----------------- 18 files changed, 139 insertions(+), 274 deletions(-) create mode 100644 assets/icons/graphql.svg delete mode 100644 pages/profile.vue delete mode 100644 static/icons/github.svg delete mode 100644 static/icons/graphql.svg diff --git a/assets/icons/graphql.svg b/assets/icons/graphql.svg new file mode 100644 index 000000000..bebb5a7a0 --- /dev/null +++ b/assets/icons/graphql.svg @@ -0,0 +1 @@ + diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss index cf0c7c1f3..f799307ec 100644 --- a/assets/scss/styles.scss +++ b/assets/scss/styles.scss @@ -46,6 +46,7 @@ body { @apply select-none; @apply overflow-x-hidden; + overflow: overlay; -webkit-tap-highlight-color: transparent; -webkit-touch-callout: none; } @@ -146,6 +147,10 @@ a { @apply max-h-48; @apply items-stretch; @apply overflow-y-auto; + + &::-webkit-scrollbar { + @apply hidden; + } } hr { @@ -305,8 +310,9 @@ input[type="checkbox"] { &.toasted-primary { @apply bg-tooltip; @apply text-primary text-xs; - @apply !font-semibold; @apply justify-start; + @apply shadow; + @apply font-semibold; .action { @apply ml-auto; @@ -321,12 +327,12 @@ input[type="checkbox"] { } &.error { - @apply !bg-red-400; + @apply !bg-red-200; @apply !text-red-800; } &.success { - @apply !bg-green-400; + @apply !bg-green-200; @apply !text-green-800; } } diff --git a/components/app/Announcement.vue b/components/app/Announcement.vue index 8fb46d5f0..2f2f179a9 100644 --- a/components/app/Announcement.vue +++ b/components/app/Announcement.vue @@ -1,12 +1,5 @@ - - {{ navigation.icon }} + + {{ navigation.icon }} + +
+ +
{{ navigation.title }} @@ -19,13 +24,11 @@ export default { data() { return { primaryNavigation: [ - { target: "index", icon: "apps", title: "App" }, + { target: "index", icon: "settings_ethernet", title: "REST" }, + { target: "graphql", svg: "graphql", title: "GraphQL" }, { target: "realtime", icon: "language", title: "Realtime" }, - { target: "graphql", icon: "code", title: "GraphQL" }, { target: "documentation", icon: "book", title: "Doc" }, - { target: "profile", icon: "person", title: "Profile" }, { target: "settings", icon: "settings", title: "Settings" }, - { target: "home", icon: "home", title: "Home" }, ], } }, @@ -42,7 +45,8 @@ export default { @apply hover:bg-primaryDark; @apply hover:text-secondaryDark; - .material-icons { + .material-icons, + .svg-icons { @apply opacity-75; } @@ -55,7 +59,8 @@ export default { @apply text-accent; @apply hover:text-accent; - .material-icons { + .material-icons, + .svg-icons { @apply opacity-100; } } diff --git a/components/button/Primary.vue b/components/button/Primary.vue index 5c69a6f93..7f141fab4 100644 --- a/components/button/Primary.vue +++ b/components/button/Primary.vue @@ -41,16 +41,22 @@ > {{ icon }} {{ label }}
diff --git a/components/button/Secondary.vue b/components/button/Secondary.vue index 037ec80d1..1b29e5d1d 100644 --- a/components/button/Secondary.vue +++ b/components/button/Secondary.vue @@ -31,16 +31,22 @@ > {{ icon }} {{ label }}
diff --git a/components/http/CodegenModal.vue b/components/http/CodegenModal.vue index 76a8bca81..c29935135 100644 --- a/components/http/CodegenModal.vue +++ b/components/http/CodegenModal.vue @@ -79,7 +79,7 @@ :icon="copyIcon" @click.native="copyRequestCode" /> - + diff --git a/components/http/Request.vue b/components/http/Request.vue index fac3e6677..229597a9a 100644 --- a/components/http/Request.vue +++ b/components/http/Request.vue @@ -22,10 +22,10 @@ font-semibold font-mono h-8 text-secondaryDark + min-w-28 py-1 px-4 transition - w-28 truncate focus:outline-none focus:border-accent " @@ -72,7 +72,7 @@