diff --git a/src/client/app.js b/src/client/app.js index 7683352a..804be8ab 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -4,6 +4,7 @@ import Document from './components/Document'; import Award from './components/Award'; +import GalleryItem from './components/GalleryItem'; import api from './api/api'; var deps = [ @@ -101,6 +102,7 @@ app.run(function ($location, $rootScope, $http) { require("./controllers/CopyrightController"), Document, Award, + GalleryItem, function (app) { app.controller("SchedulePageController", function ($scope) { $scope.pageClass = "page-schedule"; diff --git a/src/client/components/GalleryItem.js b/src/client/components/GalleryItem.js new file mode 100644 index 00000000..7e7b5fbe --- /dev/null +++ b/src/client/components/GalleryItem.js @@ -0,0 +1,10 @@ +import template from '../../templates/components/gallery-item.html'; + +export default function (app) { + app.component('galleryItem', { + bindings: { + record: '=' + }, + template: template + }); +}; \ No newline at end of file diff --git a/src/style/album.scss b/src/style/album.scss new file mode 100644 index 00000000..e1c543f5 --- /dev/null +++ b/src/style/album.scss @@ -0,0 +1,147 @@ +@import "variables"; + +.album-block { + width: 100%; + margin: 1em auto 2em; + + h3 { + text-align: center; + margin: 1.5em 0 1em; + } + + .fotorama__nav-wrap { + margin: 6em 0 0; + } + + .fotorama__stage{ + overflow: inherit; + } + + .fotorama__stage__frame{ + overflow: inherit; + } + + .album { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + } + + .album-info { + width: 80%; + margin: 0 0 3em; + } + + .album-info p { + margin: 0 0 .5em; + } + + .album-item { + width: 80%; + box-sizing: border-box; + margin: 0 0 4em; + position: relative; + background-color: white; + padding: 6em; + box-shadow: 0 4px 14px -10px rgba(0,0,0, .85); + + &.vertical { + width: 47%; + min-width: 30em; + max-width: 35em; + } + + img{ + width: 100%; + box-sizing: border-box; + border: .25em solid #eee; + border-top-color: #bbb; + border-left-color: #ddd; + } + } + + .product-info{ + text-align: center; + position: absolute; + width: 100%; + left: 0; + bottom: 1em; + + & > div { + display: inline-block; + padding: .5em 1em; + background-color: white; + border: 1px solid #f5f5f5; + border-radius: .25em; + box-shadow: 0 5p/x 4px -4px rgba(0,0,0, .5); + } + + p { + font-size: 0.75em; + } + + .title { + font-weight: bold; + } + } +} + +@media screen and (max-width: $mobile-width) { + .album-block { + width: 100%; + margin: 1em auto 2em; + + h3 { + text-align: left; + margin: 1em 0 0.5em; + } + + .album-info{ + width: 100%; + margin: 0 0 2em; + } + + .album-item { + width: 100%; + padding: 1em 1em 5em; + margin: 0 0 2em; + + img{ + border: .1em solid #eee; + border-top-color: #bbb; + border-left-color: #ddd; + } + } + + .product-info { + bottom: .5em; + } + } +} + +@media screen and (min-width: $mobile-width) and (max-width: $desktop-width){ + .album-block { + .album-info{ + width: 100%; + margin: 0 0 2em; + font-size: 0.75em; + } + + .album-item { + width: 100%; + padding: 2em 2em 5em; + margin: 0 0 2em; + + img{ + border: .15em solid #eee; + border-top-color: #bbb; + border-left-color: #ddd; + } + } + + .product-info { + bottom: .5em; + } + } +} \ No newline at end of file diff --git a/src/style/gallery-item.scss b/src/style/gallery-item.scss new file mode 100644 index 00000000..c38d37f0 --- /dev/null +++ b/src/style/gallery-item.scss @@ -0,0 +1,19 @@ +@import "variables"; + +$img-max-width: 500px; + +.gallery-item { + width: calc(33% - #{$single-margin}); + margin-bottom: $single-margin; + + img { + width: 100%; + max-width: $img-max-width; + } +} + +@media screen and (max-width: $mobile-width) { + .gallery-item { + margin: 0 0 1em; + } +} diff --git a/src/style/gallery.scss b/src/style/gallery.scss index 4f1d1283..e478c2c8 100644 --- a/src/style/gallery.scss +++ b/src/style/gallery.scss @@ -1,10 +1,5 @@ @import "variables"; -//.gallery-block { -// margin: 2em 0 0; -// display: block; -//} - .album-collection{ } @@ -21,163 +16,3 @@ .album-collection__title{ } - -.gallery-album { - width: calc(33% - #{$single-margin}); - margin-bottom: $single-margin; - - img { - width: 100%; - max-width: 500px; - } -} - -.album-block { - width: 100%; - margin: 1em auto 2em; - - h3 { - text-align: center; - margin: 1.5em 0 1em; - } - - .fotorama__nav-wrap { - margin: 6em 0 0; - } - - .fotorama__stage{ - overflow: inherit; - } - - .fotorama__stage__frame{ - overflow: inherit; - } - - .album { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - } - - .album-info { - width: 80%; - margin: 0 0 3em; - } - - .album-info p { - margin: 0 0 .5em; - } - - .album-item { - width: 80%; - box-sizing: border-box; - margin: 0 0 4em; - position: relative; - background-color: white; - padding: 6em; - box-shadow: 0 4px 14px -10px rgba(0,0,0, .85); - - &.vertical { - width: 47%; - min-width: 30em; - max-width: 35em; - } - - img{ - width: 100%; - box-sizing: border-box; - border: .25em solid #eee; - border-top-color: #bbb; - border-left-color: #ddd; - } - } - - .product-info{ - text-align: center; - position: absolute; - width: 100%; - left: 0; - bottom: 1em; - - & > div { - display: inline-block; - padding: .5em 1em; - background-color: white; - border: 1px solid #f5f5f5; - border-radius: .25em; - box-shadow: 0 5p/x 4px -4px rgba(0,0,0, .5); - } - - p { - font-size: 0.75em; - } - - .title { - font-weight: bold; - } - } -} - -@media screen and (max-width: $mobile-width) { - .album-block { - width: 100%; - margin: 1em auto 2em; - - h3 { - text-align: left; - margin: 1em 0 0.5em; - } - - .album-info{ - width: 100%; - margin: 0 0 2em; - } - - .album-item { - width: 100%; - padding: 1em 1em 5em; - margin: 0 0 2em; - - img{ - border: .1em solid #eee; - border-top-color: #bbb; - border-left-color: #ddd; - } - } - - .product-info { - bottom: .5em; - } - } - - .gallery-album { - margin: 0 0 1em; - } -} - -@media screen and (min-width: $mobile-width) and (max-width: $desktop-width){ - .album-block { - .album-info{ - width: 100%; - margin: 0 0 2em; - font-size: 0.75em; - } - - .album-item { - width: 100%; - padding: 2em 2em 5em; - margin: 0 0 2em; - - img{ - border: .15em solid #eee; - border-top-color: #bbb; - border-left-color: #ddd; - } - } - - .product-info { - bottom: .5em; - } - } -} \ No newline at end of file diff --git a/src/templates/components/gallery-item.html b/src/templates/components/gallery-item.html new file mode 100644 index 00000000..cf242be8 --- /dev/null +++ b/src/templates/components/gallery-item.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/src/templates/views/gallery.html b/src/templates/views/gallery.html index 64f9e280..d62d9bb7 100644 --- a/src/templates/views/gallery.html +++ b/src/templates/views/gallery.html @@ -2,13 +2,7 @@

{{period.year}}

- +