mirror of
https://gitlab.com/Anson-Projects/projects.git
synced 2025-06-15 14:36:47 +00:00
fix merge issues
This commit is contained in:
parent
3f42a7f8ff
commit
1fd535002f
@ -56,7 +56,7 @@ pre > code.sourceCode > span > a:first-child::before { text-decoration: underlin
|
||||
}
|
||||
code span.al { color: #ad0000; } /* Alert */
|
||||
code span.an { color: #5e5e5e; } /* Annotation */
|
||||
code span.at { color: #20794d; } /* Attribute */
|
||||
code span.at { } /* Attribute */
|
||||
code span.bn { color: #ad0000; } /* BaseN */
|
||||
code span.bu { } /* BuiltIn */
|
||||
code span.cf { color: #007ba5; } /* ControlFlow */
|
||||
@ -77,7 +77,7 @@ code span.kw { color: #007ba5; } /* Keyword */
|
||||
code span.op { color: #5e5e5e; } /* Operator */
|
||||
code span.ot { color: #007ba5; } /* Other */
|
||||
code span.pp { color: #ad0000; } /* Preprocessor */
|
||||
code span.sc { color: #20794d; } /* SpecialChar */
|
||||
code span.sc { color: #5e5e5e; } /* SpecialChar */
|
||||
code span.ss { color: #20794d; } /* SpecialString */
|
||||
code span.st { color: #20794d; } /* String */
|
||||
code span.va { color: #111111; } /* Variable */
|
||||
@ -85,6 +85,7 @@ code span.vs { color: #20794d; } /* VerbatimString */
|
||||
code span.wa { color: #5e5e5e; font-style: italic; } /* Warning */
|
||||
</style>
|
||||
|
||||
|
||||
<!--radix_placeholder_meta_tags-->
|
||||
<title>Machine Learning Directed Study: Report 1</title>
|
||||
|
||||
@ -116,7 +117,7 @@ code span.wa { color: #5e5e5e; font-style: italic; } /* Warning */
|
||||
<!--/radix_placeholder_rmarkdown_metadata-->
|
||||
|
||||
<script type="text/json" id="radix-resource-manifest">
|
||||
{"type":"character","attributes":{},"value":["assembly.jpg","clusters.svg","machine-learning-methods-for-orbital-debris-characterization_files/anchor-4.2.2/anchor.min.js","machine-learning-methods-for-orbital-debris-characterization_files/bowser-1.9.3/bowser.min.js","machine-learning-methods-for-orbital-debris-characterization_files/distill-2.2.21/template.v2.js","machine-learning-methods-for-orbital-debris-characterization_files/header-attrs-2.11/header-attrs.js","machine-learning-methods-for-orbital-debris-characterization_files/header-attrs-2.7/header-attrs.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-1.11.3/jquery.min.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-3.6.0/jquery-3.6.0.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-3.6.0/jquery-3.6.0.min.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-3.6.0/jquery-3.6.0.min.map","machine-learning-methods-for-orbital-debris-characterization_files/popper-2.6.0/popper.min.js","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy-bundle.umd.min.js","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy-light-border.css","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy.css","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy.umd.min.js","machine-learning-methods-for-orbital-debris-characterization_files/webcomponents-2.0.0/webcomponents.js","prepped.html","prepped.svg","prepped_clustered.html","prepped_clustered.svg"]}
|
||||
{"type":"character","attributes":{},"value":["assembly.jpg","clusters.svg","machine-learning-methods-for-orbital-debris-characterization_files/anchor-4.2.2/anchor.min.js","machine-learning-methods-for-orbital-debris-characterization_files/bowser-1.9.3/bowser.min.js","machine-learning-methods-for-orbital-debris-characterization_files/distill-2.2.21/template.v2.js","machine-learning-methods-for-orbital-debris-characterization_files/header-attrs-2.11/header-attrs.js","machine-learning-methods-for-orbital-debris-characterization_files/header-attrs-2.13/header-attrs.js","machine-learning-methods-for-orbital-debris-characterization_files/header-attrs-2.7/header-attrs.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-1.11.3/jquery.min.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-3.6.0/jquery-3.6.0.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-3.6.0/jquery-3.6.0.min.js","machine-learning-methods-for-orbital-debris-characterization_files/jquery-3.6.0/jquery-3.6.0.min.map","machine-learning-methods-for-orbital-debris-characterization_files/popper-2.6.0/popper.min.js","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy-bundle.umd.min.js","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy-light-border.css","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy.css","machine-learning-methods-for-orbital-debris-characterization_files/tippy-6.2.7/tippy.umd.min.js","machine-learning-methods-for-orbital-debris-characterization_files/webcomponents-2.0.0/webcomponents.js","prepped.html","prepped.svg","prepped_clustered.html","prepped_clustered.svg"]}
|
||||
</script>
|
||||
<!--radix_placeholder_navigation_in_header-->
|
||||
<!--/radix_placeholder_navigation_in_header-->
|
||||
@ -1263,7 +1264,10 @@ code span.wa { color: #5e5e5e; font-style: italic; } /* Warning */
|
||||
|
||||
// hoverable references
|
||||
$('span.citation[data-cites]').each(function() {
|
||||
var refHtml = $('#ref-' + $(this).attr('data-cites')).html();
|
||||
var refs = $(this).attr('data-cites').split(" ");
|
||||
var refHtml = refs.map(function(ref) {
|
||||
return "<p>" + $('#ref-' + ref).html() + "</p>";
|
||||
}).join("\n");
|
||||
window.tippy(this, {
|
||||
allowHTML: true,
|
||||
content: refHtml,
|
||||
|
Loading…
x
Reference in New Issue
Block a user