diff --git a/content/about-us/jobs.md b/content/about-us/jobs.md index a8b8270..a9202c0 100644 --- a/content/about-us/jobs.md +++ b/content/about-us/jobs.md @@ -16,7 +16,30 @@ If you want to be at the intersection of physics and engineering, collaborate wi {% end %} -{{ layout_photo_style_1(src1="images/IMG_20170818_175543_HDR@2x.png", src2="images/IMG_0027-side@2x.png") }} +{{ layout_photo_style_1(src1="images/IMG_20170818_175543_HDR@2x.png", src2="images/IMG_0027-side@2x.png", onlydesktop=true) }} + + +{% layout_gallery(slideName='mySlides1', dotName='dot1', onlymobile=true) %} +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+{% end %} {% layout_centered_content(min_width=true) %} @@ -24,7 +47,30 @@ If you want to be at the intersection of physics and engineering, collaborate wi {% end %} -{{ layout_photo_style_1(src1="images/IMG_0591-side@2x.png", src2="images/IMG_0591@2x.png") }} +{{ layout_photo_style_1(src1="images/IMG_0591-side@2x.png", src2="images/IMG_0591@2x.png", onlydesktop=true) }} + + +{% layout_gallery(slideName='mySlides2', dotName='dot2', onlymobile=true) %} +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+{% end %} {% layout_centered_content(min_width=true) %} @@ -39,5 +85,6 @@ We also accept remote positions, and you may also choose to work at our sister c {% layout_centered_content() %} -##### Contact us at jobs@m-****.hk! +##### Contact us at +##### jobs@m-****.hk! {% end %} diff --git a/sass/css/_layout.scss b/sass/css/_layout.scss index e4214b0..bb4e76e 100644 --- a/sass/css/_layout.scss +++ b/sass/css/_layout.scss @@ -29,6 +29,15 @@ background-size: cover; } +.hero3 { + height: 230px; + background: url("../images/hero3-phone@2x.png") repeat-x top center; + -webkit-background-size: contain; + -moz-background-size: contain; + -o-background-size: contain; + background-size: contain; +} + .hero5 { height: 230px; background: url("../images/hero3-phone@2x.png") no-repeat top center; diff --git a/sass/css/_slideshow.scss b/sass/css/_slideshow.scss new file mode 100644 index 0000000..e6ec2cf --- /dev/null +++ b/sass/css/_slideshow.scss @@ -0,0 +1,72 @@ +.slideshow-container { + max-width: 100%; + position: relative; + margin: auto; + padding: 0 2em; +} + +.mySlides { + display: none; +} + +.prev, .next { + cursor: pointer; + position: absolute; + top: 50%; + width: auto; + margin-top: -22px; + padding: 3px 8px; + color: #715ec7 !important; + font-weight: bold; + transition: 0.6s ease; + user-select: none; + border: 1px solid #715ec7; + border-radius: 20px; + font-size: .7em; +} + +.next { + right: 0; +} +.prev { + left: 0; +} + +.dot { + cursor: pointer; + height: 10px; + width: 10px; + margin: 0 2px; + background-color: #fff; + border: 1px solid #715ec7; + border-radius: 50%; + display: inline-block; + transition: background-color 0.6s ease; +} + +.dot.active, .dot:hover { + background-color: #715ec7; +} + +.fadeGallery { + -webkit-animation-name: fadeGallery; + -webkit-animation-duration: 1.5s; + animation-name: fadeGallery; + animation-duration: 1.5s; + margin: 0 auto; + text-align: center; +} + +@-webkit-keyframes fadeGallery { + from {opacity: .4} + to {opacity: 1} +} + +@keyframes fadeGallery { + from {opacity: .4} + to {opacity: 1} +} + +.slideshow-dots { + padding: .5em; +} \ No newline at end of file diff --git a/sass/css/styles.scss b/sass/css/styles.scss index 598c80a..425c42e 100644 --- a/sass/css/styles.scss +++ b/sass/css/styles.scss @@ -27,5 +27,6 @@ $color-hover: #eae7f7 !default; @import "_base", "_layout", - "_shop" + "_shop", + "slideshow" ; diff --git a/static/images/IMG_0026@2x.jpg b/static/images/IMG_0026@2x.jpg new file mode 100644 index 0000000..e715943 Binary files /dev/null and b/static/images/IMG_0026@2x.jpg differ diff --git a/static/images/IMG_0037@2x.jpg b/static/images/IMG_0037@2x.jpg new file mode 100644 index 0000000..c101d92 Binary files /dev/null and b/static/images/IMG_0037@2x.jpg differ diff --git a/static/images/IMG_0060@2x.jpg b/static/images/IMG_0060@2x.jpg new file mode 100644 index 0000000..a34cafc Binary files /dev/null and b/static/images/IMG_0060@2x.jpg differ diff --git a/static/images/IMG_05912@2x.png b/static/images/IMG_05912@2x.png new file mode 100644 index 0000000..c65467b Binary files /dev/null and b/static/images/IMG_05912@2x.png differ diff --git a/static/images/IMG_0865@2x.jpg b/static/images/IMG_0865@2x.jpg new file mode 100644 index 0000000..e046acb Binary files /dev/null and b/static/images/IMG_0865@2x.jpg differ diff --git a/static/images/IMG_0866@2x.jpg b/static/images/IMG_0866@2x.jpg new file mode 100644 index 0000000..1be6901 Binary files /dev/null and b/static/images/IMG_0866@2x.jpg differ diff --git a/static/images/IMG_0869@2x.jpg b/static/images/IMG_0869@2x.jpg new file mode 100644 index 0000000..2874e2b Binary files /dev/null and b/static/images/IMG_0869@2x.jpg differ diff --git a/static/images/IMG_0890@2x.jpg b/static/images/IMG_0890@2x.jpg new file mode 100644 index 0000000..02e9774 Binary files /dev/null and b/static/images/IMG_0890@2x.jpg differ diff --git a/static/images/IMG_0895@2x.jpg b/static/images/IMG_0895@2x.jpg new file mode 100644 index 0000000..647abe1 Binary files /dev/null and b/static/images/IMG_0895@2x.jpg differ diff --git a/static/images/IMG_20170818_175543_HDR2@2x.jpg b/static/images/IMG_20170818_175543_HDR2@2x.jpg new file mode 100644 index 0000000..35b2922 Binary files /dev/null and b/static/images/IMG_20170818_175543_HDR2@2x.jpg differ diff --git a/templates/page-custom-footer-design.html b/templates/page-custom-footer-design.html index 2cb34ac..70e21ed 100644 --- a/templates/page-custom-footer-design.html +++ b/templates/page-custom-footer-design.html @@ -6,4 +6,39 @@
+{% endblock %} + + +{% block js %} + {% endblock %} \ No newline at end of file diff --git a/templates/shortcodes/layout_gallery.html b/templates/shortcodes/layout_gallery.html new file mode 100644 index 0000000..d108dd0 --- /dev/null +++ b/templates/shortcodes/layout_gallery.html @@ -0,0 +1,23 @@ +
+ +
+ +
+ + {{ body | markdown | safe }} + + + +
+ +
+ + + + + +
+ +
+ +
\ No newline at end of file diff --git a/templates/shortcodes/layout_photo_style_1.html b/templates/shortcodes/layout_photo_style_1.html index b32717f..4c14824 100644 --- a/templates/shortcodes/layout_photo_style_1.html +++ b/templates/shortcodes/layout_photo_style_1.html @@ -1,4 +1,4 @@ -
+