Merge branch 'staging' into l10n_staging

altair-graphql · Jan 9, 2020 · 063c519 · 063c519
2 parents 501401a + 6b0e4fa
commit 063c519
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 
 [![Backers on Open Collective](https://opencollective.com/altair/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/altair/sponsors/badge.svg)](#sponsors)
 
-![Maintenance](https://img.shields.io/maintenance/yes/2019.svg)
+![Maintenance](https://img.shields.io/maintenance/yes/2020.svg)
 [![Greenkeeper badge](https://badges.greenkeeper.io/imolorhe/altair.svg)](https://greenkeeper.io/)
 [![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)

diff --git a/src/app/services/gql/gql.service.ts b/src/app/services/gql/gql.service.ts
@@ -204,7 +204,7 @@ export class GqlService {
       query: opts.query,
       variables: opts.variables,
       selectedOperation: opts.selectedOperation,
-      files: opts.files,
+      files,
       withCredentials: opts.withCredentials,
     });
   }

diff --git a/src/scss/_codemirror.scss b/src/scss/_codemirror.scss
@@ -25,6 +25,10 @@
   border: 0;
 }
 
+.CodeMirror-linenumber {
+  user-select: none;
+}
+
 .CodeMirror-foldmarker {
   color: var(--theme-font-color);
   text-shadow: none;

diff --git a/src/scss/components/_editor.scss b/src/scss/components/_editor.scss
@@ -33,6 +33,7 @@ app-query-editor {
   padding: 3px 5px;
   border-radius: 4px;
   transition: all .3s ease;
+  user-select: none;
 
   &:hover {
     background: var(--theme-border-color);