Merging from upstream.

README.md

@@ -54,6 +54,3 @@ Links like this are created in the SPARQL query results, when your query returns
 For instance, try [one of the GXA examples][GXA-EX-1], and then click links under the 'gene' or 'study' column.
 
 [GXA-EX-1]: http://localhost:8080/sparql?query=PREFIX+bk%3A+%3Chttp%3A%2F%2Fknetminer.org%2Fdata%2Frdf%2Fterms%2Fbiokno%2F%3E%09PREFIX+bkr%3A+%3Chttp%3A%2F%2Fknetminer.org%2Fdata%2Frdf%2Fresources%2F%3E%0D%0APREFIX+bka%3A+%3Chttp%3A%2F%2Fknetminer.org%2Fdata%2Frdf%2Fterms%2Fbiokno%2Fattributes%2F%3E%09PREFIX+bkg%3A+%3Chttp%3A%2F%2Fknetminer.org%2Fdata%2Frdf%2Fresources%2Fgraphs%2F%3E%0D%0APREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E%09PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0D%0APREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E%09PREFIX+dc%3A+%3Chttp%3A%2F%2Fpurl.org%2Fdc%2Felements%2F1.1%2F%3E%0D%0APREFIX+dcterms%3A+%3Chttp%3A%2F%2Fpurl.org%2Fdc%2Fterms%2F%3E%09PREFIX+agri%3A+%3Chttp%3A%2F%2Fagrischemas.org%2F%3E%0D%0APREFIX+bioschema%3A+%3Chttp%3A%2F%2Fbioschemas.org%2F%3E%09PREFIX+schema%3A+%3Chttp%3A%2F%2Fschema.org%2F%3E%0D%0A%0D%0A%0D%0ASELECT+%3Fgene+%3FgeneAcc+%3FcondLabel+%3FstudyTitle+%3Fstudy+%3Fpub+%3FpubTitle+%3FpubYear+%3FcondTerm+%0D%0A%7B%0D%0A%09%3Fgene+a+bk%3AGene%3B%0D%0A%09%09dcterms%3Aidentifier+%3FgeneAcc.%0D%0A%09%09%0D%0A%09%3Fgene+bioschema%3AexpressedIn+%3Fcondition.%0D%0A%09%09%0D%0A%09%3FexpStatement+a+rdfs%3AStatement%3B%0D%0A%09%09rdf%3Asubject+%3Fgene%3B%0D%0A%09%09rdf%3Apredicate+bioschema%3AexpressedIn%3B%0D%0A%09%09rdf%3Aobject+%3Fcondition%3B%0D%0A%09%09agri%3Aevidence+%3Fstudy.%0D%0A%0D%0A%09%3Fgene+bk%3Aocc_in+%3Fpub.%0D%0A%09%09%0D%0A%09%3Fpub+a+bk%3APublication%3B%0D%0A%09%09bka%3AAbstractHeader+%3FpubTitle.%0D%0A%09OPTIONAL+%7B+%3Fpub+bka%3AYEAR+%3FpubYear+%7D%0D%0A%09%09%09%0D%0A%09%3Fcondition+schema%3Aname+%3FcondLabel.%0D%0A%09OPTIONAL+%7B+%3Fcondition+dc%3Atype+%3FcondTerm.+%7D%0D%0A%09%09%0D%0A%09%3Fstudy+%0D%0A%09%09dc%3Atitle+%3FstudyTitle%3B%0D%0A%7D%0D%0AORDER+BY+%3Fstudy+%3Fgene%0D%0A&render=HTML&limit=25&offset=0#loadstar-results-section
-
-
-

web-ui/src/main/webapp/codemirror/codemirror.css

@@ -2,9 +2,9 @@
 
 .CodeMirror {
   /* height of the sparql query container */
-  font-family: 'Nexa';
   height: 350px;
   color: black;
+  font-family: 'Consolas', 'Monaco', 'Lucida Console', 'Courier New', monospace;
 }
 
 /* PADDING */