public / olly_site.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0cde996)
background colour, added font style to trapezium calculation page
authorNick Downing <nick@ndcode.org>
Sat, 19 Jan 2019 02:01:30 +0000 (13:01 +1100)
committerNick Downing <nick@ndcode.org>
Sat, 19 Jan 2019 02:01:30 +0000 (13:01 +1100)
calculate_button_trapezium.html.jst patch | blob | history
calculatebutton.html.jst patch | blob | history
olly.css patch | blob | history
trapezium.html patch | blob | history

diff --git a/calculate_button_trapezium.html.jst b/calculate_button_trapezium.html.jst
index 7850ea7..1182d22 100644 (file)
--- a/calculate_button_trapezium.html.jst
+++ b/calculate_button_trapezium.html.jst
@@ -18,15 +18,16 @@ return async env => {
     let height = parseFloat(query.height)
     let area = (a_length + b_length) / 2 * height
    
-    _site.serve(
+    env.site.serve(
       env,
       200,
       `<!DOCTYPE html>
 <html>
 <head>
+<link rel="stylesheet" type="text/css" href="olly.css">
 <title>Calculation</title>
 </head>
-<body>
+<body class="olly">
 <h1>The Height is: ${height} units</h1>
 <h1>The A length is: ${a_length} units</h1>
 <h1>The B length is: ${b_length} units</h1>
@@ -38,15 +39,16 @@ return async env => {
     )
   }
   else {
-    _site.serve(
+    env.site.serve(
       env,
       200,
       `<!DOCTYPE html>
 <html>
 <head>
+<link rel="stylesheet" type="text/css" href="olly.css">
 <title>Calculation</title>
 </head>
-<body>
+<body class="olly">
 <h1>Error - Unable to Calculate</h1>
 </body>
 </html>
diff --git a/calculatebutton.html.jst b/calculatebutton.html.jst
index 0ef18cd..f8e9672 100644 (file)
--- a/calculatebutton.html.jst
+++ b/calculatebutton.html.jst
@@ -21,7 +21,7 @@ return async env => {
     let circumference = Math.PI * radius * 2
     let diameter = radius * 2
     if (radius < 0) {
-      _site.serve(
+      env.site.serve(
         env,
         200,
         `<!DOCTYPE html>
@@ -39,7 +39,7 @@ return async env => {
       )
     }
     else {
-      _site.serve(
+      env.site.serve(
         env,
         200,
       `<!DOCTYPE html>
@@ -61,7 +61,7 @@ return async env => {
     }
   }
   else {
-    _site.serve(
+    env.site.serve(
       env,
       200,
       `<!DOCTYPE html>
diff --git a/olly.css b/olly.css
index 6713d0c..164c34b 100644 (file)
--- a/olly.css
+++ b/olly.css
@@ -1,3 +1,4 @@
 .olly {
   font-family: sans-serif;
+  background-color: AliceBlue;
 }
diff --git a/trapezium.html b/trapezium.html
index 6274c24..9db6d4b 100644 (file)
--- a/trapezium.html
+++ b/trapezium.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+<link rel="stylesheet" type="text/css" href="olly.css">
 <title>Trapezium Area Calculator</title>
 <style>
 form div + div {
@@ -52,7 +53,7 @@ button {
 }
 </style>
 </head>
-<body>
+<body class="olly">
 <h1>Trapezium Area Calculator</h1>
 <img src="drawing.svg">
 <form action="/calculate_button_trapezium.html" method="post">
Olly's website