diff --git a/Python/app/ChameleonVisionApp.py b/Python/app/ChameleonVisionApp.py index 0663ac4ce..d7f0181ed 100644 --- a/Python/app/ChameleonVisionApp.py +++ b/Python/app/ChameleonVisionApp.py @@ -14,8 +14,9 @@ class ChameleonApplication(tornado.web.Application): handlers = [(r"/", MainHandler), (r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}), (r"/websocket", ChameleonWebSocket), - (r"/CSS/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/CSS")}), - (r"/JS/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/JS")}), + (r"/css/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/css")}), + (r"/js/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/js")}), + (r"/templates/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/templates")}), (r"/assets/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/assets")})] settings = dict( diff --git a/Site/CSS/Main.css b/Site/CSS/Main.css index 5b2537f78..14a622a36 100644 --- a/Site/CSS/Main.css +++ b/Site/CSS/Main.css @@ -8,18 +8,18 @@ body { padding: 5px; } -.nav > a { - font-size: 1.8em; - margin-left: 15px +.nav a { + font-size: 1.5em; + margin-left: 5px; } -.nav > a, .sidenav > a { +.nav a, .sidenav a { color: whitesmoke; font-family:Verdana; font-weight: 500; } -.nav > a:hover, .sidenav > a:hover { +.nav a:hover, .sidenav a:hover { color: #17a2b8; } @@ -43,16 +43,6 @@ body { margin-top: 20px; } -.main { +#main { margin-left: 60px; -} - -.main > div { - margin: 50px; - width: 30%; -} - -#logo { - width: 100%; - height: 80px; } \ No newline at end of file diff --git a/Site/Index.html b/Site/Index.html index 94e2c17af..89b8e52a7 100644 --- a/Site/Index.html +++ b/Site/Index.html @@ -4,28 +4,24 @@