Skip to content
GitLab
Commit 1cd45c9c authored by Bo-Chun Chen's avatar Bo-Chun Chen Committed by Mitchell Moore
Browse files

Fixed CSS styling changes in font file. Updated URL to static files 

- Update url for font file in css
- Font path in css is relative to css file itself, since we put them in the same folder, should be able to use just filename
- Remove duplicate line
- Update URL to static files
- Instead of hard-coded it,
   use `url_for`, function provided by flask, to generate the url
parent 39dbcc97
Hide whitespace changes
Inline Side-by-side
app/static/style/application.css
View file @ 1cd45c9c
This source diff could not be displayed because it is too large. You can view the blob instead.
app/templates/auth/SignUp.html
View file @ 1cd45c9c
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
<head> <head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
<script src="static/scripts/function.js"></script> <script src="{{ url_for('static', filename='scripts/function.js') }}"></script>
<script src="static/scripts/function.js"></script>
<script> <script>
console.info('Room ID: {{ room_id }}'); console.info('Room ID: {{ room_id }}');
...@@ -37,8 +36,8 @@ ...@@ -37,8 +36,8 @@
.important { color: #336699; } .important { color: #336699; }
</style> </style>
<link rel="shortcut icon" type="image/x-icon" href="/public/favicon.ico"> <link rel="shortcut icon" type="image/x-icon" href="/public/favicon.ico">
<link rel="stylesheet" media="all" href="/static/style/application.css"> <link rel="stylesheet" media="all" href="{{ url_for('static', filename='style/application.css') }}">
<link rel="stylesheet" media="all" href="/static/style/app2.css"> <link rel="stylesheet" media="all" href="{{ url_for('static', filename='style/app2.css') }}">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<style> <style>
...@@ -78,7 +77,7 @@ ...@@ -78,7 +77,7 @@
<div class="container content" role="main" style="width: 625px"> <div class="container content" role="main" style="width: 625px">
<div style="position:relative;"> <div style="position:relative;">
<img alt="logo" height="auto" width="100%" style="margin-bottom: 20px" src="/static/img/cheaha-logo-a605de0aecd3006b82a5ee30a6d0cb8cd9bf8b7e836296cc293eac746a4c2b11.png"> <img alt="logo" height="auto" width="100%" style="margin-bottom: 20px" src="{{ url_for('static', filename='img/cheaha-logo-a605de0aecd3006b82a5ee30a6d0cb8cd9bf8b7e836296cc293eac746a4c2b11.png') }}">
<a href="https://tinyurl.com/cheahaAL" target="_blank"> <a href="https://tinyurl.com/cheahaAL" target="_blank">
<div style="float:left;position:absolute;display:block;left:310px;top:-6px;padding:10px 20px;"> </div> <div style="float:left;position:absolute;display:block;left:310px;top:-6px;padding:10px 20px;"> </div>
</a> </a>
...@@ -118,7 +117,7 @@ ...@@ -118,7 +117,7 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-sm-6"> <div class="col-md-6 col-sm-6">
<a href="https://osc.github.io/Open-OnDemand/"> <a href="https://osc.github.io/Open-OnDemand/">
<img class="footer-logo" alt="Powered by Open OnDemand" height="40" style="margin-bottom: 20px" src="/static/img/OpenOnDemand_powered_by_RGB-cb3aad5ff5350c7994f250fb334ddcc72e343233ce99eb71fda93beddd76a847.svg"> <img class="footer-logo" alt="Powered by Open OnDemand" height="40" style="margin-bottom: 20px" src="{{ url_for('static', filename='img/OpenOnDemand_powered_by_RGB-cb3aad5ff5350c7994f250fb334ddcc72e343233ce99eb71fda93beddd76a847.svg') }}">
</a> </a>
</div> </div>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment