From f5558bff7ace3f977850c92a122aaf76152bad04 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Sat, 31 Oct 2020 15:00:30 +1100 Subject: [PATCH] Update --- Home.css | 193 +++++- Home.html | 18 +- Nathan-Woodburn---Contact.css | 11 - Nathan-Woodburn---Contact.html | 98 --- Nicepage/Site_221126440/Home.html | 601 +++++++++++++++--- .../Nathan-Woodburn---Contact.html | 42 -- Nicepage/Site_221126440/site.json | 2 +- index.html | 18 +- nicepage.css | 184 +++++- nicepage.js | 12 +- 10 files changed, 864 insertions(+), 315 deletions(-) delete mode 100644 Nathan-Woodburn---Contact.css delete mode 100644 Nathan-Woodburn---Contact.html delete mode 100644 Nicepage/Site_221126440/Nathan-Woodburn---Contact.html diff --git a/Home.css b/Home.css index d2ccfc1..3a3e5d1 100644 --- a/Home.css +++ b/Home.css @@ -1,37 +1,164 @@ -.u-section-1 {background-image: url("images/default-image.jpg")} -.u-section-1 .u-sheet-1 {min-height: 520px} -.u-section-1 .u-layout-wrap-1 {margin-top: 120px; margin-bottom: 0} -.u-section-1 .u-layout-cell-1 {min-height: 400px} -.u-section-1 .u-container-layout-1 {padding: 30px} -.u-section-1 .u-icon-1 {height: 64px; width: 64px; margin: 0 auto} -.u-section-1 .u-btn-1 {border-style: none; font-weight: 700; font-size: 0.9375rem; margin: 44px auto 0; padding: 8px 33px} -.u-section-1 .u-layout-cell-2 {min-height: 400px} -.u-section-1 .u-container-layout-2 {padding: 30px} -.u-section-1 .u-icon-2 {height: 59px; width: 64px; margin: 0 auto} -.u-section-1 .u-btn-2 {border-style: none; font-weight: 700; font-size: 0.9375rem; margin: 49px auto 0; padding: 8px 33px} -.u-section-1 .u-layout-cell-3 {min-height: 400px} -.u-section-1 .u-container-layout-3 {padding: 30px} -.u-section-1 .u-icon-3 {height: 64px; width: 64px; margin: 0 auto} -.u-section-1 .u-btn-3 {border-style: none; font-weight: 700; font-size: 0.9375rem; margin: 44px auto 0; padding: 8px 33px} +.u-section-1 { + background-image: url("images/default-image.jpg"); +} -@media (max-width: 1199px){ .u-section-1 .u-sheet-1 {min-height: 430px} -.u-section-1 .u-layout-wrap-1 {margin-top: 60px; position: relative} -.u-section-1 .u-layout-cell-1 {min-height: 330px} -.u-section-1 .u-btn-1 {width: 253px; height: 37px} -.u-section-1 .u-layout-cell-2 {min-height: 330px} -.u-section-1 .u-btn-2 {width: 253px; height: 37px} -.u-section-1 .u-layout-cell-3 {min-height: 330px} } +.u-section-1 .u-sheet-1 { + min-height: 520px; +} -@media (max-width: 991px){ .u-section-1 .u-sheet-1 {min-height: 353px} -.u-section-1 .u-layout-cell-1 {min-height: 100px} -.u-section-1 .u-btn-1 {width: 180px} -.u-section-1 .u-layout-cell-2 {min-height: 100px} -.u-section-1 .u-btn-2 {width: 180px} -.u-section-1 .u-layout-cell-3 {min-height: 100px} } +.u-section-1 .u-layout-wrap-1 { + margin-top: 120px; + margin-bottom: 0; +} -@media (max-width: 767px){ .u-section-1 .u-sheet-1 {min-height: 1238px} -.u-section-1 .u-container-layout-1 {padding-left: 10px; padding-right: 10px} -.u-section-1 .u-container-layout-2 {padding-left: 10px; padding-right: 10px} -.u-section-1 .u-container-layout-3 {padding-left: 10px; padding-right: 10px} } +.u-section-1 .u-layout-cell-1 { + min-height: 400px; +} -@media (max-width: 575px){ .u-section-1 .u-sheet-1 {min-height: 816px} } \ No newline at end of file +.u-section-1 .u-container-layout-1 { + padding: 30px; +} + +.u-section-1 .u-icon-1 { + height: 64px; + width: 64px; + margin: 0 auto; +} + +.u-section-1 .u-btn-1 { + border-style: none; + font-weight: 700; + font-size: 0.9375rem; + margin: 44px auto 0; + padding: 8px 33px; +} + +.u-section-1 .u-layout-cell-2 { + min-height: 400px; +} + +.u-section-1 .u-container-layout-2 { + padding: 30px; +} + +.u-section-1 .u-icon-2 { + height: 59px; + width: 64px; + margin: 0 auto; +} + +.u-section-1 .u-btn-2 { + border-style: none; + font-weight: 700; + font-size: 0.9375rem; + margin: 49px auto 0; + padding: 8px 33px; +} + +.u-section-1 .u-layout-cell-3 { + min-height: 400px; +} + +.u-section-1 .u-container-layout-3 { + padding: 30px; +} + +.u-section-1 .u-icon-3 { + height: 64px; + width: 64px; + margin: 0 auto; +} + +.u-section-1 .u-btn-3 { + border-style: none; + font-weight: 700; + font-size: 0.9375rem; + margin: 44px auto 0; + padding: 8px 33px; +} + +@media (max-width: 1199px) { + .u-section-1 .u-sheet-1 { + min-height: 430px; + } + + .u-section-1 .u-layout-wrap-1 { + margin-top: 60px; + position: relative; + } + + .u-section-1 .u-layout-cell-1 { + min-height: 330px; + } + + .u-section-1 .u-btn-1 { + width: 253px; + height: 37px; + } + + .u-section-1 .u-layout-cell-2 { + min-height: 330px; + } + + .u-section-1 .u-btn-2 { + width: 253px; + height: 37px; + } + + .u-section-1 .u-layout-cell-3 { + min-height: 330px; + } +} + +@media (max-width: 991px) { + .u-section-1 .u-sheet-1 { + min-height: 353px; + } + + .u-section-1 .u-layout-cell-1 { + min-height: 100px; + } + + .u-section-1 .u-btn-1 { + width: 180px; + } + + .u-section-1 .u-layout-cell-2 { + min-height: 100px; + } + + .u-section-1 .u-btn-2 { + width: 180px; + } + + .u-section-1 .u-layout-cell-3 { + min-height: 100px; + } +} + +@media (max-width: 767px) { + .u-section-1 .u-sheet-1 { + min-height: 1238px; + } + + .u-section-1 .u-container-layout-1 { + padding-left: 10px; + padding-right: 10px; + } + + .u-section-1 .u-container-layout-2 { + padding-left: 10px; + padding-right: 10px; + } + + .u-section-1 .u-container-layout-3 { + padding-left: 10px; + padding-right: 10px; + } +} + +@media (max-width: 575px) { + .u-section-1 .u-sheet-1 { + min-height: 816px; + } +} \ No newline at end of file diff --git a/Home.html b/Home.html index e88e17d..c68ae61 100644 --- a/Home.html +++ b/Home.html @@ -12,7 +12,7 @@ - + @@ -22,7 +22,7 @@ "@type": "Organization", "name": "Nathan Woodburn", "url": "index.html", - "logo": "images/NJWIconbig.png" + "logo": "np://user.desktop.nicepage.com/Site_221126440/images/NJWIconbig.png" } @@ -40,22 +40,22 @@
-
-
-

Nathan Woodburn

@@ -81,7 +81,7 @@
- ANU Autonomous Rover + ANU Autonomous Rover
diff --git a/Nathan-Woodburn---Contact.css b/Nathan-Woodburn---Contact.css deleted file mode 100644 index 11c0b02..0000000 --- a/Nathan-Woodburn---Contact.css +++ /dev/null @@ -1,11 +0,0 @@ -.u-section-1 .u-sheet-1 {min-height: 500px} -.u-section-1 .u-form-1 {height: 311px; width: 570px; margin: 57px auto 60px} -.u-section-1 .u-btn-1 {border-style: solid} - -@media (max-width: 767px){ .u-section-1 .u-form-1 {width: 540px} } - -@media (max-width: 575px){ .u-section-1 .u-form-1 {width: 340px} -.u-section-1 .u-form-group-1 {width: 100%} -.u-section-1 .u-form-group-2 {width: 100%} -.u-section-1 .u-form-group-3 {width: 100%} -.u-section-1 .u-form-group-4 {width: 100%} } \ No newline at end of file diff --git a/Nathan-Woodburn---Contact.html b/Nathan-Woodburn---Contact.html deleted file mode 100644 index 40266f5..0000000 --- a/Nathan-Woodburn---Contact.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - Nathan Woodburn - Contact - - - - - - - - - - - - - - - - -
- - -

Nathan Woodburn

-
-
-
-
-
-
- - -
- -
- - -
-
- Submit - -
-
Thank you! I'll get back to you soon.
-
Unable to send your message. Please fix errors then try again.
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/Nicepage/Site_221126440/Home.html b/Nicepage/Site_221126440/Home.html index 187d2db..c21abec 100644 --- a/Nicepage/Site_221126440/Home.html +++ b/Nicepage/Site_221126440/Home.html @@ -8,7 +8,7 @@ - +
Nathan 3D Printing
@@ -29,78 +29,533 @@ -ANU Autonomous Rover
-
+ANU Autonomous Rover + diff --git a/Nicepage/Site_221126440/Nathan-Woodburn---Contact.html b/Nicepage/Site_221126440/Nathan-Woodburn---Contact.html deleted file mode 100644 index 7d8f1d7..0000000 --- a/Nicepage/Site_221126440/Nathan-Woodburn---Contact.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - -
-
- - -
-
-
-
- Submit - -
-
Thank you! I'll get back to you soon.
-
Unable to send your message. Please fix errors then try again.
- -
-
- \ No newline at end of file diff --git a/Nicepage/Site_221126440/site.json b/Nicepage/Site_221126440/site.json index 988caa0..6e675fd 100644 --- a/Nicepage/Site_221126440/site.json +++ b/Nicepage/Site_221126440/site.json @@ -1 +1 @@ -{"id":221126440,"items":[{"id":1940622802,"status":2,"title":"Blog Template","order":1,"templateKey":"blog","pageLinks":[]},{"id":53719995,"status":2,"title":"Post Template","order":2,"templateKey":"post","pageLinks":[]},{"id":42145927,"status":2,"title":"Product List Template","order":3,"templateKey":"products","pageLinks":[]},{"id":72155733,"status":2,"title":"Product Details Template","order":4,"templateKey":"product","pageLinks":[]},{"id":155156827,"status":2,"title":"Home","order":5,"templateKey":null,"pageLinks":[]},{"id":906207128,"status":2,"title":"Nathan Woodburn - Contact","order":6,"templateKey":null,"pageLinks":[]}],"metaTags":null,"order":65536,"headHtml":null,"customCss":null,"headerHtml":"
\n
\n \n \n \n \n

Nathan Woodburn

\n \n \n \n \n \n
","footerHtml":"
\n \n
\n \n

Copyright © 2020 Nathan Woodburn All rights reserved!

nathan@woodburn.tk

","hideBacklink":null,"homePageId":155156827,"dateUpdated":1604028925664,"settings":"{\"title\":\"Nathan Woodburn\",\"homePageId\":\"155156827\",\"description\":\"\",\"keywords\":\"\",\"analytics\":\"\",\"googleTagManager\":\"\",\"googleOptimizeId\":\"\",\"captchaSiteKey\":\"\",\"captchaSecretKey\":\"\",\"metaTags\":\"\",\"headHtml\":\"\",\"customCss\":\"\",\"themeAuthor\":\"\",\"themeAuthorUrl\":\"\",\"themeVersion\":\"1.0\",\"themeUrl\":\"\",\"themeTags\":\"left-sidebar, right-sidebar, custom-background, custom-colors, blog\",\"themeDescription\":\"Nicepage-generated theme\",\"showBrand\":\"false\",\"favicon\":\"favicon.png\",\"whiteLabelTitle\":\"Nicepage\",\"whiteLabelLogoSmall\":\"\",\"whiteLabelLogoBig\":\"\",\"whiteLabelAuthor\":\"Nicepage https://www.nicepage.com\",\"whiteLabelAuthorUrl\":\"https://nicepage.com/\",\"whiteLabelDescription\":\"Design websites with any images and texts in seconds!\",\"themeThumbnail\":\"\",\"cookies\":\"false\",\"cookieConfirmCode\":\"\",\"embedFonts\":\"false\",\"lazyLoading\":\"false\",\"lang\":\"en\",\"country\":\"AU\",\"analyticsCode\":\"\",\"captchaScript\":\"\",\"colorScheme\":{\"bodyColors\":[\"#281c31\",\"#ffffff\"],\"bgColor\":\"#ffffff\",\"colors\":[\"#3a0e63\",\"#7145e0\",\"#c04a87\",\"#7c90b3\",\"#9fc4c9\"],\"shadingContrast\":\"body-alt-color\",\"whiteContrast\":\"body-color\",\"bgContrast\":\"body-color\",\"name\":\"u20\"},\"fontScheme\":{\"name\":\"Ubuntu-Raleway\",\"isDefault\":true,\"fonts\":{\"heading\":\"Ubuntu, sans-serif\",\"text\":\"Raleway, sans-serif\",\"accent\":\"Arial, sans-serif\",\"headingTitle\":\"Ubuntu\",\"textTitle\":\"Raleway\",\"rank\":10}},\"typography\":{\"name\":\"custom-page-typography-17\",\"title\":{\"font-weight\":\"700\",\"line-height\":\"1_1\",\"font-size\":6,\"margin-top\":20,\"margin-bottom\":20},\"subtitle\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":2.25,\"margin-top\":20,\"margin-bottom\":20},\"h1\":{\"font-weight\":\"700\",\"line-height\":\"1_1\",\"font-size\":3.75,\"margin-top\":20,\"margin-bottom\":20},\"h2\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":2.25,\"margin-top\":20,\"margin-bottom\":20},\"h3\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.875,\"margin-top\":20,\"margin-bottom\":20},\"h4\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.5,\"margin-top\":20,\"margin-bottom\":20},\"h5\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.25,\"margin-top\":20,\"margin-bottom\":20},\"h6\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.125,\"margin-top\":20,\"margin-bottom\":20},\"largeText\":{\"bold\":false,\"line-height\":\"1_6\",\"font-size\":1,\"margin-top\":20,\"margin-bottom\":20},\"text\":{\"bold\":false,\"line-height\":\"1_6\",\"font-size\":1,\"margin-top\":20,\"margin-bottom\":20},\"smallText\":{\"bold\":false,\"line-height\":\"1_6\",\"font-size\":0.875,\"margin-top\":20,\"margin-bottom\":20},\"link\":{},\"button\":{\"letter-spacing\":2,\"font-size\":0.875,\"line-height\":\"1_4\",\"color\":false,\"margin-top\":20,\"margin-bottom\":20,\"gradient\":\"none\",\"hover-color\":false,\"active-color\":false,\"border\":2,\"border-style\":\"solid\",\"border-color\":\"grey-dark-1\",\"text-color\":false,\"text-transform\":\"uppercase\",\"font-weight\":\"600\",\"button-shape\":\"round\",\"border-radius\":50},\"blockquote\":{\"font-style\":\"italic\",\"line-height\":\"1_6\",\"font-size\":1.25,\"indent\":20,\"border\":4,\"border-color\":\"palette-1-base\",\"margin-top\":20,\"margin-bottom\":20},\"metadata\":{\"font-size\":0.75,\"line-height\":\"1_4\",\"margin-top\":20,\"margin-bottom\":20},\"list\":{\"margin-top\":20,\"margin-bottom\":20},\"orderedlist\":{\"margin-top\":20,\"margin-bottom\":20},\"postContent\":{\"margin-top\":20,\"margin-bottom\":20},\"theme\":{\"gradient\":\"\",\"image\":\"\"},\"htmlBaseSize\":16,\"hyperlink\":{\"text-color\":\"palette-1-base\"}},\"backToTop\":\"\\n \\n \\n \\n \\n \\n \\n \",\"cookiesSection\":\"
\\n
\\n
\\n
\\n
\\n
\\n
\\n

Cookies & Privacy

\\n

This website uses cookies to ensure you get the best experience on our website.

\\n
\\n
\\n
\\n
\\n Confirm\\n
\\n
\\n
\\n
\\n
\\n
\\n \\n \\n \\n \\n \\n
\",\"id\":221126440,\"formMailTo\":\"nicepage@njwapps.tk\"}","title":"Nathan Woodburn","siteStyleCss":"","appVersion":"2.28.1","isTrial":true} +{"id":221126440,"items":[{"id":1940622802,"status":2,"title":"Blog Template","order":1,"templateKey":"blog","pageLinks":[]},{"id":53719995,"status":2,"title":"Post Template","order":2,"templateKey":"post","pageLinks":[]},{"id":42145927,"status":2,"title":"Product List Template","order":3,"templateKey":"products","pageLinks":[]},{"id":72155733,"status":2,"title":"Product Details Template","order":4,"templateKey":"product","pageLinks":[]},{"id":155156827,"status":2,"title":"Home","order":5,"templateKey":null,"pageLinks":[]}],"metaTags":null,"order":65536,"headHtml":null,"customCss":null,"headerHtml":"
\n
\n \n \n \n \n

Nathan Woodburn

\n \n \n \n \n \n
","footerHtml":"
\n \n
\n \n

Copyright © 2020 Nathan Woodburn All rights reserved!

nathan@woodburn.tk

","hideBacklink":null,"homePageId":155156827,"dateUpdated":1604028925664,"settings":"{\"title\":\"Nathan Woodburn\",\"homePageId\":\"155156827\",\"description\":\"\",\"keywords\":\"\",\"analytics\":\"\",\"googleTagManager\":\"\",\"googleOptimizeId\":\"\",\"captchaSiteKey\":\"\",\"captchaSecretKey\":\"\",\"metaTags\":\"\",\"headHtml\":\"\",\"customCss\":\"\",\"themeAuthor\":\"\",\"themeAuthorUrl\":\"\",\"themeVersion\":\"1.0\",\"themeUrl\":\"\",\"themeTags\":\"left-sidebar, right-sidebar, custom-background, custom-colors, blog\",\"themeDescription\":\"Nicepage-generated theme\",\"showBrand\":\"false\",\"favicon\":\"favicon.png\",\"whiteLabelTitle\":\"Nicepage\",\"whiteLabelLogoSmall\":\"\",\"whiteLabelLogoBig\":\"\",\"whiteLabelAuthor\":\"Nicepage https://www.nicepage.com\",\"whiteLabelAuthorUrl\":\"https://nicepage.com/\",\"whiteLabelDescription\":\"Design websites with any images and texts in seconds!\",\"themeThumbnail\":\"\",\"cookies\":\"false\",\"cookieConfirmCode\":\"\",\"embedFonts\":\"false\",\"lazyLoading\":\"false\",\"lang\":\"en\",\"country\":\"AU\",\"analyticsCode\":\"\",\"captchaScript\":\"\",\"colorScheme\":{\"bodyColors\":[\"#281c31\",\"#ffffff\"],\"bgColor\":\"#ffffff\",\"colors\":[\"#3a0e63\",\"#7145e0\",\"#c04a87\",\"#7c90b3\",\"#9fc4c9\"],\"shadingContrast\":\"body-alt-color\",\"whiteContrast\":\"body-color\",\"bgContrast\":\"body-color\",\"name\":\"u20\"},\"fontScheme\":{\"name\":\"Ubuntu-Raleway\",\"isDefault\":true,\"fonts\":{\"heading\":\"Ubuntu, sans-serif\",\"text\":\"Raleway, sans-serif\",\"accent\":\"Arial, sans-serif\",\"headingTitle\":\"Ubuntu\",\"textTitle\":\"Raleway\",\"rank\":10}},\"typography\":{\"name\":\"custom-page-typography-17\",\"title\":{\"font-weight\":\"700\",\"line-height\":\"1_1\",\"font-size\":6,\"margin-top\":20,\"margin-bottom\":20},\"subtitle\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":2.25,\"margin-top\":20,\"margin-bottom\":20},\"h1\":{\"font-weight\":\"700\",\"line-height\":\"1_1\",\"font-size\":3.75,\"margin-top\":20,\"margin-bottom\":20},\"h2\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":2.25,\"margin-top\":20,\"margin-bottom\":20},\"h3\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.875,\"margin-top\":20,\"margin-bottom\":20},\"h4\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.5,\"margin-top\":20,\"margin-bottom\":20},\"h5\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.25,\"margin-top\":20,\"margin-bottom\":20},\"h6\":{\"font-weight\":\"700\",\"line-height\":\"1_2\",\"font-size\":1.125,\"margin-top\":20,\"margin-bottom\":20},\"largeText\":{\"bold\":false,\"line-height\":\"1_6\",\"font-size\":1,\"margin-top\":20,\"margin-bottom\":20},\"text\":{\"bold\":false,\"line-height\":\"1_6\",\"font-size\":1,\"margin-top\":20,\"margin-bottom\":20},\"smallText\":{\"bold\":false,\"line-height\":\"1_6\",\"font-size\":0.875,\"margin-top\":20,\"margin-bottom\":20},\"link\":{},\"button\":{\"letter-spacing\":2,\"font-size\":0.875,\"line-height\":\"1_4\",\"color\":false,\"margin-top\":20,\"margin-bottom\":20,\"gradient\":\"none\",\"hover-color\":false,\"active-color\":false,\"border\":2,\"border-style\":\"solid\",\"border-color\":\"grey-dark-1\",\"text-color\":false,\"text-transform\":\"uppercase\",\"font-weight\":\"600\",\"button-shape\":\"round\",\"border-radius\":50},\"blockquote\":{\"font-style\":\"italic\",\"line-height\":\"1_6\",\"font-size\":1.25,\"indent\":20,\"border\":4,\"border-color\":\"palette-1-base\",\"margin-top\":20,\"margin-bottom\":20},\"metadata\":{\"font-size\":0.75,\"line-height\":\"1_4\",\"margin-top\":20,\"margin-bottom\":20},\"list\":{\"margin-top\":20,\"margin-bottom\":20},\"orderedlist\":{\"margin-top\":20,\"margin-bottom\":20},\"postContent\":{\"margin-top\":20,\"margin-bottom\":20},\"theme\":{\"gradient\":\"\",\"image\":\"\"},\"htmlBaseSize\":16,\"hyperlink\":{\"text-color\":\"palette-1-base\"}},\"backToTop\":\"\\n \\n \\n \\n \\n \\n \\n \",\"cookiesSection\":\"
\\n
\\n
\\n
\\n
\\n
\\n
\\n

Cookies & Privacy

\\n

This website uses cookies to ensure you get the best experience on our website.

\\n
\\n
\\n
\\n
\\n Confirm\\n
\\n
\\n
\\n
\\n
\\n
\\n \\n \\n \\n \\n \\n
\",\"id\":221126440,\"formMailTo\":\"nicepage@njwapps.tk\"}","title":"Nathan Woodburn","siteStyleCss":"","appVersion":"2.29.0","isTrial":true} diff --git a/index.html b/index.html index b16bf5d..48a7aca 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ - + @@ -22,7 +22,7 @@ "@type": "Organization", "name": "Nathan Woodburn", "url": "index.html", - "logo": "images/NJWIconbig.png" + "logo": "np://user.desktop.nicepage.com/Site_221126440/images/NJWIconbig.png" } @@ -40,22 +40,22 @@
-
-
-

Nathan Woodburn

@@ -81,7 +81,7 @@
- ANU Autonomous Rover + ANU Autonomous Rover
diff --git a/nicepage.css b/nicepage.css index 48550d9..8160a27 100644 --- a/nicepage.css +++ b/nicepage.css @@ -4343,16 +4343,19 @@ a { } .u-block-content > :first-child, .u-product-desc > :first-child, +.u-product-tab-pane > :first-child, .u-post-content > :first-child { margin-top: 0; } .u-block-content > :last-child, .u-product-desc > :last-child, +.u-product-tab-pane > :last-child, .u-post-content > :last-child { margin-bottom: 0; } .u-block-content p, .u-product-desc p, +.u-product-tab-pane p, .u-post-content p { text-decoration: inherit !important; color: inherit !important; @@ -15607,7 +15610,6 @@ div.u-video, } .u-enable-responsive.u-offcanvas .u-sidenav { height: 100vh; - overflow: auto; transition: margin-left 500ms ease; border-top: none; border-bottom: none; @@ -15630,7 +15632,6 @@ div.u-video, } .u-enable-responsive:not(.u-offcanvas) .u-sidenav { display: none; - overflow: auto; } .u-enable-responsive:not(.u-offcanvas).open .u-sidenav { display: block; @@ -15649,6 +15650,14 @@ div.u-video, .u-menu-overlay:not(.u-opacity) { opacity: 0; } +.u-sidenav-overflow { + overflow: auto; + position: absolute !important; + top: 0; + bottom: 0; + right: 0; + left: 0; +} .u-offcanvas-unshifted-left .u-body > *, .u-offcanvas-unshifted-left.u-body > * { animation: menu-unshift-left 500ms normal forwards ease; @@ -17246,6 +17255,7 @@ a.pswp__share--download:hover { .u-tab-link .u-icon > svg + img { position: absolute !important; left: 0 !important; + top: calc(49.5%); display: inline !important; padding: 0.5em !important; margin: 0 !important; @@ -17257,7 +17267,6 @@ a.pswp__share--download:hover { width: 0 !important; height: 0 !important; line-height: 1 !important; - vertical-align: middle !important; } .u-login { display: table; @@ -30673,36 +30682,145 @@ a.u-link.u-text-hover-grey-90:hover { /*end-variables sitestylecss*/ - .u-header {background-image: none} -.u-header .u-sheet-1 {min-height: 105px} -.u-header .u-menu-1 {font-family: size-14; margin: 65px -2px 0 auto} -.u-header .u-nav-2 {font-size: 1.25rem} -.u-header .u-image-1 {margin: -97px auto 0 0} -.u-header .u-logo-image-1 {max-width: 88px; max-height: 88px} -.u-header .u-text-1 {margin: -66px 502px 17px 109px} -@media (max-width: 1199px){ .u-header .u-menu-1 {margin-right: 0} -.u-header .u-image-1 {margin-top: -97px} -.u-header .u-logo-image-1 {max-width: 215px; max-height: 215px} -.u-header .u-text-1 {margin-right: 402px; margin-left: 90px} } -@media (max-width: 991px){ .u-header .u-image-1 {width: auto} -.u-header .u-logo-image-1 {max-width: 212px; max-height: 212px} -.u-header .u-text-1 {margin-right: 191px; margin-left: 69px} } -@media (max-width: 767px){ .u-header .u-logo-image-1 {max-width: 148px; max-height: 148px} -.u-header .u-text-1 {margin-right: 11px; margin-left: 52px} } -@media (max-width: 575px){ .u-header .u-logo-image-1 {max-width: 147px; max-height: 147px} -.u-header .u-text-1 {margin-right: 0; margin-left: 33px} } - .u-footer {min-height: 238px} -.u-footer .u-sheet-1 {min-height: 249px} -.u-footer .u-container-layout-1 {padding-left: 112px; padding-right: 88px} -.u-footer .u-text-1 {margin: 119px 0 0 711px} -.u-footer .u-text-2 {margin: -25px auto 60px 0} -.u-footer .u-btn-1 {padding: 0} -@media (max-width: 1199px){ .u-footer .u-text-1 {margin-left: 511px} } -@media (max-width: 991px){ .u-footer .u-container-layout-1 {padding-left: 30px; padding-right: 30px} -.u-footer .u-text-1 {margin-left: 291px} } -@media (max-width: 767px){ .u-footer .u-container-layout-1 {padding-left: 10px; padding-right: 10px} -.u-footer .u-text-1 {margin-left: 111px} } -@media (max-width: 575px){ .u-footer .u-text-1 {margin-left: 0} } +.u-header { + background-image: none; +} + +.u-header .u-sheet-1 { + min-height: 105px; +} + +.u-header .u-menu-1 { + font-family: size-14; + margin: 65px -2px 0 auto; +} + +.u-header .u-nav-2 { + font-size: 1.25rem; +} + +.u-header .u-image-1 { + margin: -97px auto 0 0; +} + +.u-header .u-logo-image-1 { + max-width: 88px; + max-height: 88px; +} + +.u-header .u-text-1 { + margin: -66px 502px 17px 109px; +} +@media (max-width: 1199px) { + .u-header .u-menu-1 { + margin-right: 0; + } + + .u-header .u-image-1 { + margin-top: -97px; + } + + .u-header .u-logo-image-1 { + max-width: 215px; + max-height: 215px; + } + + .u-header .u-text-1 { + margin-right: 402px; + margin-left: 90px; + } +} +@media (max-width: 991px) { + .u-header .u-image-1 { + width: auto; + } + + .u-header .u-logo-image-1 { + max-width: 212px; + max-height: 212px; + } + + .u-header .u-text-1 { + margin-right: 191px; + margin-left: 69px; + } +} +@media (max-width: 767px) { + .u-header .u-logo-image-1 { + max-width: 148px; + max-height: 148px; + } + + .u-header .u-text-1 { + margin-right: 11px; + margin-left: 52px; + } +} +@media (max-width: 575px) { + .u-header .u-logo-image-1 { + max-width: 147px; + max-height: 147px; + } + + .u-header .u-text-1 { + margin-right: 0; + margin-left: 33px; + } +} +.u-footer { + min-height: 238px; +} + +.u-footer .u-sheet-1 { + min-height: 249px; +} + +.u-footer .u-container-layout-1 { + padding-left: 112px; + padding-right: 88px; +} + +.u-footer .u-text-1 { + margin: 119px 0 0 711px; +} + +.u-footer .u-text-2 { + margin: -25px auto 60px 0; +} + +.u-footer .u-btn-1 { + padding: 0; +} +@media (max-width: 1199px) { + .u-footer .u-text-1 { + margin-left: 511px; + } +} +@media (max-width: 991px) { + .u-footer .u-container-layout-1 { + padding-left: 30px; + padding-right: 30px; + } + + .u-footer .u-text-1 { + margin-left: 291px; + } +} +@media (max-width: 767px) { + .u-footer .u-container-layout-1 { + padding-left: 10px; + padding-right: 10px; + } + + .u-footer .u-text-1 { + margin-left: 111px; + } +} +@media (max-width: 575px) { + .u-footer .u-text-1 { + margin-left: 0; + } +} /*begin-variables base-font-size*/ html { font-size: 16px; } diff --git a/nicepage.js b/nicepage.js index 5d49c48..5a34d0c 100644 --- a/nicepage.js +++ b/nicepage.js @@ -1,27 +1,27 @@ -!function(e){function t(n){if(i[n])return i[n].exports;var o=i[n]={i:n,l:false,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=true,o.exports}var i={};return t.m=e,t.c=i,t.d=function(e,i,n){if(!t.o(e,i))Object.defineProperty(e,i,{configurable:false,enumerable:true,get:n})},t.n=function(e){var i=e&&e.__esModule?function t(){return e.default}:function t(){return e};return t.d(i,"a",i),i},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="/Content/BundledScripts/",t(t.s=4396)}({100:function(e,t,i){"use strict";function n(e){if(e&&"counter"===e.name)return new o(e);else return new a(e)}var o=i(101),a=i(104),s={};s.createAnimation=function e(t){var animation=n(t);return animation.hint=s.hint,animation},s.setHint=function e(t){s.hint=t},e.exports=s,window.AnimationFactory=e.exports},101:function(e,t,i){"use strict";function n(e,t){this.info=e,this.hint=t,this.timeoutId=null}var o=i(102);n.prototype.init=function e(){var t=this.info.element;if(!this.countUp&&t){var i=/(\D*)(\d+(?:([.,])(\d+))?)(.*)/.exec(t.innerText),n=2,a=3,s=4;if(null!==i&&i[n]&&!(i[n].length>15)){var l=i[n];if(","===i[a])l=l.replace(",",".");if(l=Number(l),l&&!isNaN(l)&&isFinite(l)){if(this.hint)this.hint.hintBrowser(this.info);var u=0;if(i[s])u=i[s].length;var f={element:t,prefix:i[1],decimal:i[a],decimals:u,suffix:i[5],startVal:0,endVal:l,duration:this.info.durationRaw,cycle:this.info.animationCycle,separator:""};this.countUp=new o(f)}}}},n.prototype.start=function e(){if(this.countUp){if(this.countUp.reset(),this._timeoutId)clearTimeout(this._timeoutId);var t=function(){this._timeoutId=null,this.countUp.start()}.bind(this),i=this.info.delay;if(isNaN(i))i=0;if(!i)return t(),void 0;this._timeoutId=setTimeout(t,i)}},n.prototype.startOut=function e(){if(this._timeoutId)clearTimeout(this._timeoutId),this._timeoutId=null},n.prototype.reset=function e(){if(this.countUp)this.countUp.reset()},n.prototype.isInOutAnimation=function e(){return true},n.prototype.needOutAnimation=function e(){return false},n.prototype.clear=function e(){if(this.hint)this.hint.removeHint(this.info)},n.prototype.getTime=function e(){if(!this.info)return 0;var t=this.info.duration,i=this.info.delay;if(isNaN(i))i=0;return i+t},n.prototype.getOutTime=function e(){return 0},e.exports=n,window.CounterAnimation=e.exports},102:function(e,t,i){"use strict";function n(e){this.initialize(e)}function o(countUp,e,t){if(countUp){if(e=Number(e),isNaN(e)||!isFinite(e)||0===e)e=1;var i=0,n=function(){if(++i1?f.options.decimal+t[1]:"",f.options.useGrouping){for(o="",a=0,s=i.length;af.endVal,f.frameVal=f.startVal,f.initialized=true,true;else return f.error="[CountUp] startVal ("+t+") or endVal ("+i+") is not a number",false},f.printValue=function(e){var t=f.options.formattingFn(e);if("INPUT"===f.d.tagName)this.d.value=t;else if("text"===f.d.tagName||"tspan"===f.d.tagName)this.d.textContent=t;else this.d.innerHTML=t},f.count=function(e){if(!f.startTime)f.startTime=e;f.timestamp=e;var t=e-f.startTime;if(f.remaining=f.duration-t,f.options.useEasing)if(f.countDown)f.frameVal=f.startVal-f.options.easingFn(t,0,f.startVal-f.endVal,f.duration);else f.frameVal=f.options.easingFn(t,f.startVal,f.endVal-f.startVal,f.duration);else if(f.countDown)f.frameVal=f.startVal-(f.startVal-f.endVal)*(t/f.duration);else f.frameVal=f.startVal+(f.endVal-f.startVal)*(t/f.duration);if(f.countDown)f.frameVal=f.frameValf.endVal?f.endVal:f.frameVal;if(f.frameVal=Math.round(f.frameVal*f.dec)/f.dec,f.printValue(f.frameVal),tf.endVal,f.rAF=requestAnimationFrame(f.count)}},f.initialize())f.printValue(f.startVal)}})}).call(window)},104:function(e,t,i){"use strict";function n(e,t){if(!e)throw new Error("animationInfo is null or undefined");if(this.info=e,this.hint=t,this.animatedClass="animated",this.backstageClass="backstage",this.animationInClass=this.getAnimationClass(),this.isInOutAnimation())this.animationOutClass=this.getAnimationOutClass();this._reqestId=null,this._timeoutId=null,this._animationInTimeoutId=null,this._handleAnimationEnd=this._handleAnimationEnd.bind(this),this._playing=null,this._playNext=null,this._playNextDuration=null}function o(e){if(!e)return null;if(e0?selector:null}catch(e){return null}},reflow:function e(t){return t.offsetHeight},triggerTransitionEnd:function e(i){t(i).trigger(s.end)},supportsTransitionEnd:function e(){return Boolean(s)},isElement:function e(t){return(t[0]||t).nodeType},typeCheckConfig:function t(i,n,o){for(var a in o)if(Object.prototype.hasOwnProperty.call(o,a)){var s=o[a],l=n[a],u=l&&f.isElement(l)?"element":e(l);if(!new RegExp(s).test(u))throw new Error(i.toUpperCase()+": "+'Option "'+a+'" provided type "'+u+'" '+'but expected type "'+s+'".')}}};return a(),f}(t),a=n,Carousel=function(){var e="u-carousel",i="4.0.0-beta",n="bs.u-carousel",s="."+n,l=".data-u-api",u=t.fn[e],f=600,c=37,p=39,h=500,Default={interval:5e3,keyboard:true,slide:false,pause:"hover",wrap:true},m={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean"},v={NEXT:"next",PREV:"prev",LEFT:"left",RIGHT:"right"},g={SLIDE:"u-slide"+s,SLID:"slid"+s,KEYDOWN:"keydown"+s,MOUSEENTER:"mouseenter"+s,MOUSELEAVE:"mouseleave"+s,TOUCHEND:"touchend"+s,LOAD_DATA_API:"load"+s+l,CLICK_DATA_API:"click"+s+l},y={CAROUSEL:"u-carousel",ACTIVE:"u-active",SLIDE:"u-slide",RIGHT:"u-carousel-item-right",LEFT:"u-carousel-item-left",NEXT:"u-carousel-item-next",PREV:"u-carousel-item-prev",ITEM:"u-carousel-item"},Selector={ACTIVE:".u-active",ACTIVE_ITEM:".u-active.u-carousel-item",ITEM:".u-carousel-item",NEXT_PREV:".u-carousel-item-next, .u-carousel-item-prev",INDICATORS:".u-carousel-indicators, .u-carousel-thumbnails",DATA_SLIDE:"[data-u-slide], [data-u-slide-to]",DATA_RIDE:'[data-u-ride="carousel"]'},Carousel=function(){function Carousel(e,i){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=false,this._isSliding=false,this.touchTimeout=null,this._config=this._getConfig(i),this._element=t(e)[0],this._indicatorsElement=t(this._element).find(Selector.INDICATORS)[0],this._addEventListeners()}var l=Carousel.prototype;return l.next=function e(){if(!this._isSliding)this._slide(v.NEXT)},l.nextWhenVisible=function e(){if(!document.hidden&&t(this._element).is(":visible")&&"hidden"!==t(this._element).css("visibility"))this.next()},l.prev=function e(){if(!this._isSliding)this._slide(v.PREV)},l.pause=function e(i){if(!i)this._isPaused=true;if(t(this._element).find(Selector.NEXT_PREV)[0]&&o.supportsTransitionEnd())o.triggerTransitionEnd(this._element),this.cycle(true);clearInterval(this._interval),this._interval=null},l.cycle=function e(t){if(!t)this._isPaused=false;if(this._interval)clearInterval(this._interval),this._interval=null;if(this._config.interval&&!this._isPaused)this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval)},l.to=function e(index){var i=this;this._activeElement=t(this._element).find(Selector.ACTIVE_ITEM)[0];var n=this._getItemIndex(this._activeElement);if(!(index>this._items.length-1||index<0)){if(this._isSliding)return t(this._element).one(g.SLID,function(){return i.to(index)}),void 0;if(n===index)return this.pause(),this.cycle(),void 0;var o=index>n?v.NEXT:v.PREV;this._slide(o,this._items[index])}},l.dispose=function e(){t(this._element).off(s),t.removeData(this._element,n),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},l._getConfig=function i(n){return n=t.extend({},Default,n),o.typeCheckConfig(e,n,m),n},l._addEventListeners=function e(){var i=this;if(this._config.keyboard)t(this._element).on(g.KEYDOWN,function(e){return i._keydown(e)});if("hover"===this._config.pause)if(t(this._element).on(g.MOUSEENTER,function(e){return i.pause(e)}).on(g.MOUSELEAVE,function(e){return i.cycle(e)}),"ontouchstart"in document.documentElement)t(this._element).on(g.TOUCHEND,function(){if(i.pause(),i.touchTimeout)clearTimeout(i.touchTimeout);i.touchTimeout=setTimeout(function(e){return i.cycle(e)},h+i._config.interval)})},l._keydown=function e(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case c:t.preventDefault(),this.prev();break;case p:t.preventDefault(),this.next();break;default:return}},l._getItemIndex=function e(i){return this._items=t.makeArray(t(i).parent().find(Selector.ITEM)),this._items.indexOf(i)},l._getItemByDirection=function e(t,i){var n=t===v.NEXT,o=t===v.PREV,a=this._getItemIndex(i),s=this._items.length-1;if((o&&0===a||n&&a===s)&&!this._config.wrap)return i;var l=t===v.PREV?-1:1,u=(a+l)%this._items.length;return-1===u?this._items[this._items.length-1]:this._items[u]},l._triggerSlideEvent=function e(i,n){var o=this._getItemIndex(i),a=this._getItemIndex(t(this._element).find(Selector.ACTIVE_ITEM)[0]),s=t.Event(g.SLIDE,{relatedTarget:i,direction:n,from:a,to:o});return t(this._element).trigger(s),s},l._setActiveIndicatorElement=function e(i){if(this._indicatorsElement){t(this._indicatorsElement).find(Selector.ACTIVE).removeClass(y.ACTIVE);var n=this._indicatorsElement.children[this._getItemIndex(i)];if(n)t(n).addClass(y.ACTIVE)}},l._slide=function e(i,n){var a=this,s=t(this._element).find(Selector.ACTIVE_ITEM)[0],l=this._getItemIndex(s),u=n||s&&this._getItemByDirection(i,s),c=this._getItemIndex(u),p=Boolean(this._interval),h,m,w;if(i===v.NEXT)h=y.LEFT,m=y.NEXT,w=v.LEFT;else h=y.RIGHT,m=y.PREV,w=v.RIGHT;if(u&&t(u).hasClass(y.ACTIVE))return this._isSliding=false,void 0;if(!this._triggerSlideEvent(u,w).isDefaultPrevented())if(s&&u){if(this._isSliding=true,p)this.pause();this._setActiveIndicatorElement(u);var b=t.Event(g.SLID,{relatedTarget:u,direction:w,from:l,to:c}),x=null;if(o.supportsTransitionEnd()&&t(this._element).hasClass(y.CAROUSEL)){var _=f,C=this._element.className,T=/u-carousel-duration-(\d+)/.exec(C);if(T&&2===T.length)_=parseInt(T[1]);if(p){var E=+t(this._element).attr("data-interval")+_;if(!isNaN(E)&&E>0)x=this._config.interval,this._config.interval=E}t(u).addClass(m),o.reflow(u),t(s).addClass(h),t(u).addClass(h),t(s).one(o.TRANSITION_END,function(){t(u).removeClass(h+" "+m).addClass(y.ACTIVE),t(s).removeClass(y.ACTIVE+" "+m+" "+h),a._isSliding=false,setTimeout(function(){return t(a._element).trigger(b)},0)}).emulateTransitionEnd(_)}else t(s).removeClass(y.ACTIVE),t(u).addClass(y.ACTIVE),this._isSliding=false,t(this._element).trigger(b);if(p)this.cycle();if(x)this._config.interval=x}},Carousel._jQueryInterface=function e(i){return this.each(function(){var e=t(this).data(n),o=t.extend({},Default,t(this).data());if("object"==typeof i)t.extend(o,i);var a="string"==typeof i?i:o.uSlide;if(!e)e=new Carousel(this,o),t(this).data(n,e);if("number"==typeof i)e.to(i);else if("string"==typeof a){if(void 0===e[a])throw new Error('No method named "'+a+'"');e[a]()}else if(o.interval)e.pause(),e.cycle()})},Carousel._dataApiClickHandler=function e(i){var selector=o.getSelectorFromElement(this);if(selector){var a=t(selector)[0];if(a&&t(a).hasClass(y.CAROUSEL)){var s=t.extend({},t(a).data(),t(this).data()),l=this.getAttribute("data-u-slide-to");if(l)s.interval=false;if(Carousel._jQueryInterface.call(t(a),s),l)t(a).data(n).to(l);i.preventDefault()}}},a(Carousel,null,[{key:"VERSION",get:function e(){return i}},{key:"Default",get:function e(){return Default}}]),Carousel}();return t(document).on(g.CLICK_DATA_API,Selector.DATA_SLIDE,Carousel._dataApiClickHandler),t(window).on(g.LOAD_DATA_API,function(){t(Selector.DATA_RIDE).each(function(){var e=t(this);Carousel._jQueryInterface.call(e,e.data())})}),t.fn[e]=Carousel._jQueryInterface,t.fn[e].Constructor=Carousel,t.fn[e].noConflict=function(){return t.fn[e]=u,Carousel._jQueryInterface},Carousel}(t);return e.Util=o,e.Carousel=Carousel,e}({},$);window.bootstrap=bootstrap},141:function(e,t,i){"use strict";function n(e){var t=e.attr("data-map");if(t){t=Utility.decodeJsonAttribute(t);var i=e.contents()[0],n=i.createElement("script");n.type="text/javascript",n.innerHTML="var data = "+JSON.stringify(t)+";\n;"+"var mapIframeApiReady = function () {\n"+' parent.mapIframeApiReady(google, document.getElementById("map"), data);\n'+"}";var o=i.createElement("script");if(o.type="text/javascript",o.src="//maps.google.com/maps/api/js?key="+t.apiKey+"&callback=mapIframeApiReady",t.lang)o.src+="&language="+t.lang;i.head.appendChild(n),i.head.appendChild(o),$(i.body).append(""+'
')}}function o(e){var t="";if(e.title)t+=""+e.title+"";if(e.description)t+="
"+e.description.replace(/\n/g,"
")+"
";if(e.linkUrl){t+=''+(e.linkCaption||e.linkUrl)+""}if(t)t='
'+t+"
";return t}var MapsLoader={};window.loadMapsContent=function(){$("iframe.map-content").each(function(){var e=$(this);if(0===e.contents().find("#map").length)n(e)})},window.mapIframeApiReady=function(e,t,i){i.markers=i.markers||[];var n=i.zoom;if(!n&&1===i.markers.length)n=i.markers[0].zoom;if(!n)n=14;if(n=parseInt(n,10),i.map=i.map||{},i.map.zoom=n,i.map.mapTypeId="satellite"===i.typeId?e.maps.MapTypeId.HYBRID:e.maps.MapTypeId.ROADMAP,i.markers.length)i.map.center=i.markers[0].position;var map=new e.maps.Map(t,i.map||{}),a=new e.maps.LatLngBounds;if(i.markers.forEach(function(t){t.map=map;var i=new e.maps.Marker(t);a.extend(new e.maps.LatLng(t.position.lat,t.position.lng));var n=o(t);if(n){var s=new e.maps.InfoWindow({content:$("