btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge branch 'main' into feat/short-code

Browse Source
This commit is contained in:
liyasthomas
2021-11-22 11:35:16 +05:30
parent 6ed4211004 1e08e7f73d
commit 56cdb79773
103 changed files with 2125 additions and 2203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/hoppscotch-app/assets/scss/styles.scss
View File

@@ -35,13 +35,8 @@
@apply bg-divider;
}
.cm-focused {
@apply !outline-none;
}
input::placeholder,
textarea::placeholder,
.CodeMirror-empty {
textarea::placeholder {
@apply text-secondary;
@apply opacity-25;
}
@@ -318,7 +313,7 @@ pre.ace_editor {
&.toasted-primary {
@apply bg-tooltip;
@apply text-primary;
@apply justify-start;
@apply justify-between;
@apply shadow;
@apply font-medium;
@apply transition;
@@ -391,7 +386,7 @@ pre.ace_editor {
.smart-splitter .splitpanes__splitter::before {
@apply absolute;
@apply inset-0;
@apply bg-dividerLight;
@apply bg-accentLight;
@apply opacity-0;
@apply z-20;
@apply transition;
@@ -435,29 +430,16 @@ pre.ace_editor {
@apply w-full;
}
.CodeMirror {
@apply !h-auto;
.cm-focused {
@apply select-auto;
@apply !outline-none;
font-size: var(--body-font-size);
&:not(.CodeMirror-focused) .CodeMirror-activeline-background {
background: transparent !important;
}
.CodeMirror-dialog-top {
.cm-activeLine {
@apply bg-primaryLight;
@apply border-dividerLight;
@apply px-4;
@apply py-2;
@apply z-5;
}
.CodeMirror-scroll {
@apply min-h-64;
}
* {
font-family: "Roboto Mono", monospace;
.cm-activeLineGutter {
@apply bg-primaryDark;
}
}

28
packages/hoppscotch-app/assets/scss/themes.scss
View File

@@ -53,17 +53,17 @@
}
@mixin dark-editor-theme {
--editor-type-color: theme("colors.purple.500");
--editor-name-color: theme("colors.blue.500");
--editor-operator-color: theme("colors.indigo.500");
--editor-invalid-color: theme("colors.red.500");
--editor-separator-color: theme("colors.gray.500");
--editor-meta-color: theme("colors.gray.500");
--editor-variable-color: theme("colors.green.500");
--editor-link-color: theme("colors.cyan.500");
--editor-process-color: theme("colors.gray.400");
--editor-constant-color: theme("colors.fuchsia.500");
--editor-keyword-color: theme("colors.pink.500");
--editor-type-color: theme("colors.purple.400");
--editor-name-color: theme("colors.blue.400");
--editor-operator-color: theme("colors.indigo.400");
--editor-invalid-color: theme("colors.red.400");
--editor-separator-color: theme("colors.gray.400");
--editor-meta-color: theme("colors.gray.400");
--editor-variable-color: theme("colors.green.400");
--editor-link-color: theme("colors.cyan.400");
--editor-process-color: theme("colors.fuchsia.400");
--editor-constant-color: theme("colors.violet.400");
--editor-keyword-color: theme("colors.pink.400");
}
@mixin light-editor-theme {
@@ -82,15 +82,15 @@
@mixin black-editor-theme {
--editor-type-color: theme("colors.purple.400");
--editor-name-color: theme("colors.gray.400");
--editor-name-color: theme("colors.fuchsia.400");
--editor-operator-color: theme("colors.indigo.400");
--editor-invalid-color: theme("colors.red.400");
--editor-separator-color: theme("colors.gray.400");
--editor-meta-color: theme("colors.gray.400");
--editor-variable-color: theme("colors.green.400");
--editor-link-color: theme("colors.cyan.400");
--editor-process-color: theme("colors.blue.400");
--editor-constant-color: theme("colors.fuchsia.400");
--editor-process-color: theme("colors.violet.400");
--editor-constant-color: theme("colors.blue.400");
--editor-keyword-color: theme("colors.pink.400");
}