Skip to content
Snippets Groups Projects
Commit e23fef46 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'dev-nico' into 'master'

Dev nico

See merge request astron-sdc/esap-gui!13
parents d2952e17 a2742b07
No related branches found
No related tags found
2 merge requests!17Master,!13Dev nico
Pipeline #13593 passed
public/assets/images/rucio.png

89.3 KiB

...@@ -27,10 +27,15 @@ ...@@ -27,10 +27,15 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
<title>Astron ESAP</title> <title>ESAP-GUI</title>
<script type="text/javascript" src="https://sdc-dev.astron.nl/esap-gui/assets/js/samp.js"></script>
<script type="text/javascript" src="https://sdc-dev.astron.nl/esap-gui/assets/js/votable.js"></script>
<script type="text/javascript" src="%PUBLIC_URL%assets/js/samp.js"></script>
<script type="text/javascript" src="%PUBLIC_URL%assets/js/votable.js"></script>
<script type="text/javascript" src="%PUBLIC_URL%/assets/js/samp.js"></script>
<script type="text/javascript" src="%PUBLIC_URL%/assets/js/votable.js"></script>
</head> </head>
......
...@@ -56,7 +56,7 @@ export default function Routes() { ...@@ -56,7 +56,7 @@ export default function Routes() {
</BasketContextProvider> </BasketContextProvider>
</Route> </Route>
</Switch> </Switch>
<footer><small>esap-gui version 1 jun 2021</small></footer> <footer><small>esap-gui version 3 jun 2021 - 11:30</small></footer>
</Router> </Router>
); );
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment