diff options
| author | Chip Senkbeil <chip.senkbeil@gmail.com> | 2015-08-24 05:46:56 +0300 |
|---|---|---|
| committer | Chip Senkbeil <chip.senkbeil@gmail.com> | 2015-08-24 05:46:56 +0300 |
| commit | 3500c571d684eced3c5ffe57c40d622e40ae6a71 (patch) | |
| tree | bbd7934abf874ec0132b822e918dfd7f5591c965 | |
| parent | 13f0bf0224f2fa4095f7d8676815f73c88ab9a98 (diff) | |
Removed Materialize columns from main page, disabled animation caused by masonry
| -rw-r--r-- | layouts/index.html | 50 | ||||
| -rw-r--r-- | layouts/partials/cell.html | 13 | ||||
| -rw-r--r-- | static/css/main.css | 2 | ||||
| -rw-r--r-- | static/js/main.js | 7 |
4 files changed, 39 insertions, 33 deletions
diff --git a/layouts/index.html b/layouts/index.html index 918a7ea..b1ac551 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -10,36 +10,36 @@ <div class="parallax__group"> <div class="parallax__layer parallax__layer--base"> - <div class="row" style="margin-bottom: 0px;"> - <div class="col s12 row-colors center-align"> - <h2> - <ul class="horizontal no-bullets no-margin"> - <li>{{ partial "svg-face.html" . }}</li> - <li>About Me</li> - </ul> - </h2> - </div> + <div class="row-colors center-align"> + <h2 class="no-margin"> + <ul class="horizontal no-bullets no-margin"> + <li>{{ partial "svg-face.html" . }}</li> + <li>About Me</li> + </ul> + </h2> + </div> + <div class="flex-container"> {{ range .Site.Params.Cells.List }} {{ partial "cell.html" . }} {{ end }} - - {{ with .Site.Params.Footer }} - <div class="col s12 row-colors right-align"> - <ul class="main-page-footer horizontal no-bullets"> - {{ range .List }} - <li> - <a href="{{ .icon_link }}"> - <i class="fa fa-{{ .icon_class }}"></i> - </a> - </li> - <li>|</li> - {{ end }} - <li>{{ $.Site.Copyright | markdownify }}</li> - </ul> - </div> - {{ end }} </div> + + {{ with .Site.Params.Footer }} + <div class="row-colors right-align"> + <ul class="main-page-footer horizontal no-bullets no-margin"> + {{ range .List }} + <li> + <a href="{{ .icon_link }}"> + <i class="fa fa-{{ .icon_class }}"></i> + </a> + </li> + <li>|</li> + {{ end }} + <li>{{ $.Site.Copyright | markdownify }}</li> + </ul> + </div> + {{ end }} </div> </div> </div> diff --git a/layouts/partials/cell.html b/layouts/partials/cell.html index 6c8093d..3a88820 100644 --- a/layouts/partials/cell.html +++ b/layouts/partials/cell.html @@ -1,8 +1,6 @@ -<a href="{{ .link }}"> - <div class="cell col - s{{ with .Size.small }}{{ . }}{{ else }}12{{ end }} - m{{ with .Size.medium }}{{ . }}{{ else }}6{{ end }} - l{{ with .Size.large }}{{ . }}{{ else }}4{{ end }} +<a href="{{ .link }}" class="flex-item"> + <div class="cell + fill-container no-padding {{ if .image }}fullsize-background-image{{ end }} " style=" @@ -13,12 +11,13 @@ {{ end }} {{ with .image_position }} -` + background-position: {{ . }}; + {{ end }} height: {{ with .height }} {{ . }} {{ else }} - 33vh + 33.33vh {{ end }}; "> {{ if eq .always_show_text true }} diff --git a/static/css/main.css b/static/css/main.css index ba30067..503557a 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -382,8 +382,10 @@ ul.pagination { /* ========================================================================= */ .flex-container { + display: -webkit-flex; display: flex; width: 100%; + -webkit-flex-flow: row wrap; flex-flow: row wrap; } diff --git a/static/js/main.js b/static/js/main.js index c93b1b7..f56893c 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -12,7 +12,12 @@ $(document).ready(function(){ $container.masonry({ itemSelector: ".flex-item", columnWidth: ".flex-item", - percentPosition: true + percentPosition: true, + transitionDuration: 0 /* Disable animation of transitions */ + }); + + $(window).resize(function() { + $container.masonry(); }); }); |