Commit 0c80dd16 authored by Laura Schlimmer's avatar Laura Schlimmer
Browse files

Merge commit 'a4a051a2' 

Conflicts:
	3rdparty/libfnord/fnord-webcomponents/3rdparty/codemirror-sql.js
	3rdparty/libfnord/fnord-webcomponents/3rdparty/codemirror.css
	3rdparty/libfnord/fnord-webcomponents/3rdparty/codemirror.js
	3rdparty/libfnord/fnord-webcomponents/3rdparty/fontawesome.css
	3rdparty/libfnord/fnord-webcomponents/3rdparty/fontawesome.woff
	3rdparty/libfnord/fnord-webcomponents/3rdparty/reset.css
	3rdparty/libfnord/fnord-webcomponents/TODO
	3rdparty/libfnord/fnord-webcomponents/bundle.cc
	3rdparty/libfnord/fnord-webcomponents/bundle.h
	3rdparty/libfnord/fnord-webcomponents/components/]
	3rdparty/libfnord/fnord-webcomponents/components/fn-appbar.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-blink.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-button.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-codeeditor-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-codeeditor.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-datepicker.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-daterangepicker.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-dropdown-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-dropdown.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-icon.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-loader-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-loader.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-menu-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-menu.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-popup.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-progressbar-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-progressbar.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-search-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-search.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-splitpane-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-splitpane.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-tabbar.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-table-demo.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-table.css
	3rdparty/libfnord/fnord-webcomponents/components/fn-table.html
	3rdparty/libfnord/fnord-webcomponents/components/fn-timeinput.html
	3rdparty/libfnord/fnord-webcomponents/demo.html
	3rdparty/libfnord/fnord-webcomponents/examples/BUILD
	3rdparty/libfnord/fnord-webcomponents/examples/webchat.cc
	3rdparty/libfnord/fnord-webcomponents/fnord.css
	3rdparty/libfnord/fnord-webcomponents/fnord.js
	3rdparty/libfnord/fnord-webcomponents/httpmount.cc
	3rdparty/libfnord/fnord-webcomponents/httpmount.h
	3rdparty/libfnord/fnord-webcomponents/themes/midnight-blue.css
	3rdparty/libfnord/fnord-webcomponents/view.h
	3rdparty/libfnord/fnord-webcomponents/webui.h
	3rdparty/libfnord/fnord/webui/3rdparty/codemirror-sql.js
	3rdparty/libfnord/fnord/webui/3rdparty/codemirror.css
	3rdparty/libfnord/fnord/webui/3rdparty/codemirror.js
	3rdparty/libfnord/fnord/webui/3rdparty/fontawesome.css
	3rdparty/libfnord/fnord/webui/3rdparty/fontawesome.woff
	3rdparty/libfnord/fnord/webui/3rdparty/reset.css
	3rdparty/libfnord/fnord/webui/TODO
	3rdparty/libfnord/fnord/webui/bundle.cc
	3rdparty/libfnord/fnord/webui/bundle.h
	3rdparty/libfnord/fnord/webui/components/]
	3rdparty/libfnord/fnord/webui/components/fn-appbar.html
	3rdparty/libfnord/fnord/webui/components/fn-blink.html
	3rdparty/libfnord/fnord/webui/components/fn-button.html
	3rdparty/libfnord/fnord/webui/components/fn-codeeditor-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-codeeditor.html
	3rdparty/libfnord/fnord/webui/components/fn-datepicker.html
	3rdparty/libfnord/fnord/webui/components/fn-daterangepicker.html
	3rdparty/libfnord/fnord/webui/components/fn-dropdown-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-dropdown.html
	3rdparty/libfnord/fnord/webui/components/fn-icon.html
	3rdparty/libfnord/fnord/webui/components/fn-loader-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-loader.html
	3rdparty/libfnord/fnord/webui/components/fn-menu-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-menu.html
	3rdparty/libfnord/fnord/webui/components/fn-popup.html
	3rdparty/libfnord/fnord/webui/components/fn-progressbar-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-progressbar.html
	3rdparty/libfnord/fnord/webui/components/fn-search-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-search.html
	3rdparty/libfnord/fnord/webui/components/fn-splitpane-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-splitpane.html
	3rdparty/libfnord/fnord/webui/components/fn-tabbar.html
	3rdparty/libfnord/fnord/webui/components/fn-table-demo.html
	3rdparty/libfnord/fnord/webui/components/fn-table.css
	3rdparty/libfnord/fnord/webui/components/fn-table.html
	3rdparty/libfnord/fnord/webui/components/fn-timeinput.html
	3rdparty/libfnord/fnord/webui/demo.html
	3rdparty/libfnord/fnord/webui/examples/BUILD
	3rdparty/libfnord/fnord/webui/examples/webchat.cc
	3rdparty/libfnord/fnord/webui/fnord.css
	3rdparty/libfnord/fnord/webui/fnord.js
	3rdparty/libfnord/fnord/webui/httpmount.cc
	3rdparty/libfnord/fnord/webui/httpmount.h
	3rdparty/libfnord/fnord/webui/themes/midnight-blue.css
	3rdparty/libfnord/fnord/webui/view.h
	3rdparty/libfnord/fnord/webui/webui.h
	3rdparty/libfnord/libfnord/webui/3rdparty/codemirror-sql.js
	3rdparty/libfnord/libfnord/webui/3rdparty/codemirror.css
	3rdparty/libfnord/libfnord/webui/3rdparty/codemirror.js
	3rdparty/libfnord/libfnord/webui/3rdparty/fontawesome.css
	3rdparty/libfnord/libfnord/webui/3rdparty/fontawesome.woff
	3rdparty/libfnord/libfnord/webui/3rdparty/reset.css
	3rdparty/libfnord/libfnord/webui/TODO
	3rdparty/libfnord/libfnord/webui/bundle.cc
	3rdparty/libfnord/libfnord/webui/bundle.h
	3rdparty/libfnord/libfnord/webui/components/]
	3rdparty/libfnord/libfnord/webui/components/fn-appbar.html
	3rdparty/libfnord/libfnord/webui/components/fn-blink.html
	3rdparty/libfnord/libfnord/webui/components/fn-button.html
	3rdparty/libfnord/libfnord/webui/components/fn-codeeditor-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-codeeditor.html
	3rdparty/libfnord/libfnord/webui/components/fn-datepicker.html
	3rdparty/libfnord/libfnord/webui/components/fn-daterangepicker.html
	3rdparty/libfnord/libfnord/webui/components/fn-dropdown-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-dropdown.html
	3rdparty/libfnord/libfnord/webui/components/fn-icon.html
	3rdparty/libfnord/libfnord/webui/components/fn-loader-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-loader.html
	3rdparty/libfnord/libfnord/webui/components/fn-menu-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-menu.html
	3rdparty/libfnord/libfnord/webui/components/fn-popup.html
	3rdparty/libfnord/libfnord/webui/components/fn-progressbar-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-progressbar.html
	3rdparty/libfnord/libfnord/webui/components/fn-search-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-search.html
	3rdparty/libfnord/libfnord/webui/components/fn-splitpane-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-splitpane.html
	3rdparty/libfnord/libfnord/webui/components/fn-tabbar.html
	3rdparty/libfnord/libfnord/webui/components/fn-table-demo.html
	3rdparty/libfnord/libfnord/webui/components/fn-table.css
	3rdparty/libfnord/libfnord/webui/components/fn-table.html
	3rdparty/libfnord/libfnord/webui/components/fn-timeinput.html
	3rdparty/libfnord/libfnord/webui/demo.html
	3rdparty/libfnord/libfnord/webui/examples/BUILD
	3rdparty/libfnord/libfnord/webui/examples/webchat.cc
	3rdparty/libfnord/libfnord/webui/fnord.css
	3rdparty/libfnord/libfnord/webui/fnord.js
	3rdparty/libfnord/libfnord/webui/httpmount.cc
	3rdparty/libfnord/libfnord/webui/httpmount.h
	3rdparty/libfnord/libfnord/webui/themes/midnight-blue.css
	3rdparty/libfnord/libfnord/webui/view.h
	3rdparty/libfnord/libfnord/webui/webui.h
parents 2c903fa1 a4a051a2

fnord/webui/3rdparty/codemirror-sql.js

0 → 100644
+403 −0

File added.

Preview size limit exceeded, changes collapsed.

fnord/webui/3rdparty/codemirror.css

0 → 100644
+313 −0
Original line number Diff line number Diff line 
/* BASICS */



.CodeMirror {

  /* Set height, width, borders, and global font properties here */

  font: 14px monospace;

  height: 100%;

}

.CodeMirror-scroll {

  /* Set scrolling behaviour here */

  overflow: auto;

}



/* PADDING */



.CodeMirror-lines {

  padding: 4px 4px; /* Vertical padding around content */

}

.CodeMirror pre {

  padding: 2px 4px; /* Horizontal padding of content */

}



.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {

  background-color: white; /* The little square between H and V scrollbars */

}







/* GUTTER */



.CodeMirror-gutters {

  border-right: 1px solid #dbdedf;

  background-color: #edf0f2;

  white-space: nowrap;

}

.CodeMirror-linenumbers {}

.CodeMirror-linenumber {

  padding: 0 25px 0 6px;

  min-width: 20px;

  text-align: right;

  color: #a6a5ab;

  -moz-box-sizing: content-box;

  box-sizing: content-box;

}



.CodeMirror-guttermarker { color: black; }

.CodeMirror-guttermarker-subtle { color: #999; }



/* CURSOR */



.CodeMirror div.CodeMirror-cursor {

  border-left: 1px solid black;

}

/* Shown when moving in bi-directional text */

.CodeMirror div.CodeMirror-secondarycursor {

  border-left: 1px solid silver;

}

.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {

  width: auto;

  border: 0;

  background: #7e7;

}

.cm-animate-fat-cursor {

  width: auto;

  border: 0;

  -webkit-animation: blink 1.06s steps(1) infinite;

  -moz-animation: blink 1.06s steps(1) infinite;

  animation: blink 1.06s steps(1) infinite;

}

@-moz-keyframes blink {

  0% { background: #7e7; }

  50% { background: none; }

  100% { background: #7e7; }

}

@-webkit-keyframes blink {

  0% { background: #7e7; }

  50% { background: none; }

  100% { background: #7e7; }

}

@keyframes blink {

  0% { background: #7e7; }

  50% { background: none; }

  100% { background: #7e7; }

}



/* Can style cursor different in overwrite (non-insert) mode */

div.CodeMirror-overwrite div.CodeMirror-cursor {}



.cm-tab { display: inline-block; }



.CodeMirror-ruler {

  border-left: 1px solid #ccc;

  position: absolute;

}



/* DEFAULT THEME */



.cm-s-default .cm-keyword {color: #708;}

.cm-s-default .cm-atom {color: #219;}

.cm-s-default .cm-number {color: #164;}

.cm-s-default .cm-def {color: #00f;}

.cm-s-default .cm-variable,

.cm-s-default .cm-punctuation,

.cm-s-default .cm-property,

.cm-s-default .cm-operator {}

.cm-s-default .cm-variable-2 {color: #05a;}

.cm-s-default .cm-variable-3 {color: #085;}

.cm-s-default .cm-comment {color: #a50;}

.cm-s-default .cm-string {color: #a11;}

.cm-s-default .cm-string-2 {color: #f50;}

.cm-s-default .cm-meta {color: #555;}

.cm-s-default .cm-qualifier {color: #555;}

.cm-s-default .cm-builtin {color: #30a;}

.cm-s-default .cm-bracket {color: #997;}

.cm-s-default .cm-tag {color: #170;}

.cm-s-default .cm-attribute {color: #00c;}

.cm-s-default .cm-header {color: blue;}

.cm-s-default .cm-quote {color: #090;}

.cm-s-default .cm-hr {color: #999;}

.cm-s-default .cm-link {color: #00c;}



.cm-negative {color: #d44;}

.cm-positive {color: #292;}

.cm-header, .cm-strong {font-weight: bold;}

.cm-em {font-style: italic;}

.cm-link {text-decoration: underline;}



.cm-s-default .cm-error {color: #f00;}

.cm-invalidchar {color: #f00;}



/* Default styles for common addons */



div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}

div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }

.CodeMirror-activeline-background {background: #e8f2ff;}



/* STOP */



/* The rest of this file contains styles related to the mechanics of

   the editor. You probably shouldn't touch them. */



.CodeMirror {

  line-height: 1;

  position: relative;

  overflow: hidden;

  background: white;

  color: black;

}



.CodeMirror-scroll {

  /* 30px is the magic margin used to hide the element's real scrollbars */

  /* See overflow: hidden in .CodeMirror */

  margin-bottom: -30px; margin-right: -30px;

  padding-bottom: 30px;

  height: 100%;

  outline: none; /* Prevent dragging from highlighting the element */

  position: relative;

  -moz-box-sizing: content-box;

  box-sizing: content-box;

}



.CodeMirror-sizer {

  position: relative;

  border-right: 30px solid transparent;

  -moz-box-sizing: content-box;

  box-sizing: content-box;

}



/* The fake, visible scrollbars. Used to force redraw during scrolling

   before actuall scrolling happens, thus preventing shaking and

   flickering artifacts. */

.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {

  position: absolute;

  z-index: 6;

  display: none;

}

.CodeMirror-vscrollbar {

  right: 0; top: 0;

  overflow-x: hidden;

  overflow-y: scroll;

}

.CodeMirror-hscrollbar {

  bottom: 0; left: 0;

  overflow-y: hidden;

  overflow-x: scroll;

}

.CodeMirror-scrollbar-filler {

  right: 0; bottom: 0;

}

.CodeMirror-gutter-filler {

  left: 0; bottom: 0;

}



.CodeMirror-gutters {

  position: absolute; left: 0; top: 0;

  padding-bottom: 30px;

  z-index: 3;

}

.CodeMirror-gutter {

  white-space: normal;

  height: 100%;

  -moz-box-sizing: content-box;

  box-sizing: content-box;

  padding-bottom: 30px;

  margin-bottom: -32px;

  display: inline-block;

  /* Hack to make IE7 behave */

  *zoom:1;

  *display:inline;

}

.CodeMirror-gutter-elt {

  position: absolute;

  cursor: default;

  z-index: 4;

}



.CodeMirror-lines {

  padding: 10px 10px;

  cursor: text;

  min-height: 1px; /* prevents collapsing before first draw */

}

.CodeMirror pre {

  /* Reset some styles that the rest of the page might have set */

  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;

  border-width: 0;

  background: transparent;

  font-family: inherit;

  font-size: inherit;

  margin: 0;

  white-space: pre;

  word-wrap: normal;

  line-height: inherit;

  color: inherit;

  z-index: 2;

  position: relative;

  overflow: visible;

}

.CodeMirror-wrap pre {

  word-wrap: break-word;

  white-space: pre-wrap;

  word-break: normal;

}



.CodeMirror-linebackground {

  position: absolute;

  left: 0; right: 0; top: 0; bottom: 0;

  z-index: 0;

}



.CodeMirror-linewidget {

  position: relative;

  z-index: 2;

  overflow: auto;

}



.CodeMirror-widget {}



.CodeMirror-wrap .CodeMirror-scroll {

  overflow-x: hidden;

}



.CodeMirror-measure {

  position: absolute;

  width: 100%;

  height: 0;

  overflow: hidden;

  visibility: hidden;

}

.CodeMirror-measure pre { position: static; }



.CodeMirror div.CodeMirror-cursor {

  position: absolute;

  border-right: none;

  width: 0;

}



div.CodeMirror-cursors {

  visibility: hidden;

  position: relative;

  z-index: 1;

}

.CodeMirror-focused div.CodeMirror-cursors {

  visibility: visible;

}



.CodeMirror-selected { background: #d9d9d9; }

.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }

.CodeMirror-crosshair { cursor: crosshair; }



.cm-searching {

  background: #ffa;

  background: rgba(255, 255, 0, .4);

}



/* IE7 hack to prevent it from returning funny offsetTops on the spans */

.CodeMirror span { *vertical-align: text-bottom; }



/* Used to force a border model for a node */

.cm-force-border { padding-right: .1px; }



@media print {

  /* Hide the cursor when printing */

  .CodeMirror div.CodeMirror-cursors {

    visibility: hidden;

  }

}



code {

  display: block;

  padding: 20px;

  word-break: break-all;

}

fnord/webui/3rdparty/codemirror.js

0 → 100644
+12 −0

File added.

Preview size limit exceeded, changes collapsed.

fnord/webui/3rdparty/fontawesome.css

0 → 100644
+1530 −0

File added.

Preview size limit exceeded, changes collapsed.

fnord/webui/3rdparty/fontawesome.woff

0 → 100644
+63.9 KiB

File added.

No diff preview for this file type.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE