Change lightbox to magnific-popup; make videos playable inline.

brutaldon/static/css/brutaldon-dark.css

@@ -23,32 +23,14 @@ img.fav-avatar {
     padding: 1.5ex;
 }
 
-@media screen and (max-width: 768px)
+.is-max-128 {
-{
+    max-height: 128px;
-    .is-max-128 {
+    max-width: 128px;
-        max-height: 128px;
-        max-width: 128px;
-    }
-
-    .is-max-256 {
-        max-height: 256px;
-        max-width: 256px;
-    }
-
 }
 
-@media screen and (min-width: 769px)
+.is-max-256 {
-{
+    max-height: 256px;
-    .is-max-128 {
+    max-width: 256px;
-        max-height: 40em;
-        max-width: 40em;
-    }
-
-    .is-max-256 {
-        max-height: 80em;
-        max-width: 80em;
-    }
-
 }
 
 figure.media-left p.image a img

brutaldon/static/css/magnific-popup.css

@@ -0,0 +1,351 @@
+/* Magnific Popup CSS */
+.mfp-bg {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1042;
+  overflow: hidden;
+  position: fixed;
+  background: #0b0b0b;
+  opacity: 0.8; }
+
+.mfp-wrap {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1043;
+  position: fixed;
+  outline: none !important;
+  -webkit-backface-visibility: hidden; }
+
+.mfp-container {
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  padding: 0 8px;
+  box-sizing: border-box; }
+
+.mfp-container:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle; }
+
+.mfp-align-top .mfp-container:before {
+  display: none; }
+
+.mfp-content {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin: 0 auto;
+  text-align: left;
+  z-index: 1045; }
+
+.mfp-inline-holder .mfp-content,
+.mfp-ajax-holder .mfp-content {
+  width: 100%;
+  cursor: auto; }
+
+.mfp-ajax-cur {
+  cursor: progress; }
+
+.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
+  cursor: -moz-zoom-out;
+  cursor: -webkit-zoom-out;
+  cursor: zoom-out; }
+
+.mfp-zoom {
+  cursor: pointer;
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in; }
+
+.mfp-auto-cursor .mfp-content {
+  cursor: auto; }
+
+.mfp-close,
+.mfp-arrow,
+.mfp-preloader,
+.mfp-counter {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none; }
+
+.mfp-loading.mfp-figure {
+  display: none; }
+
+.mfp-hide {
+  display: none !important; }
+
+.mfp-preloader {
+  color: #CCC;
+  position: absolute;
+  top: 50%;
+  width: auto;
+  text-align: center;
+  margin-top: -0.8em;
+  left: 8px;
+  right: 8px;
+  z-index: 1044; }
+  .mfp-preloader a {
+    color: #CCC; }
+    .mfp-preloader a:hover {
+      color: #FFF; }
+
+.mfp-s-ready .mfp-preloader {
+  display: none; }
+
+.mfp-s-error .mfp-content {
+  display: none; }
+
+button.mfp-close,
+button.mfp-arrow {
+  overflow: visible;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  display: block;
+  outline: none;
+  padding: 0;
+  z-index: 1046;
+  box-shadow: none;
+  touch-action: manipulation; }
+
+button::-moz-focus-inner {
+  padding: 0;
+  border: 0; }
+
+.mfp-close {
+  width: 44px;
+  height: 44px;
+  line-height: 44px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  text-decoration: none;
+  text-align: center;
+  opacity: 0.65;
+  padding: 0 0 18px 10px;
+  color: #FFF;
+  font-style: normal;
+  font-size: 28px;
+  font-family: Arial, Baskerville, monospace; }
+  .mfp-close:hover,
+  .mfp-close:focus {
+    opacity: 1; }
+  .mfp-close:active {
+    top: 1px; }
+
+.mfp-close-btn-in .mfp-close {
+  color: #333; }
+
+.mfp-image-holder .mfp-close,
+.mfp-iframe-holder .mfp-close {
+  color: #FFF;
+  right: -6px;
+  text-align: right;
+  padding-right: 6px;
+  width: 100%; }
+
+.mfp-counter {
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #CCC;
+  font-size: 12px;
+  line-height: 18px;
+  white-space: nowrap; }
+
+.mfp-arrow {
+  position: absolute;
+  opacity: 0.65;
+  margin: 0;
+  top: 50%;
+  margin-top: -55px;
+  padding: 0;
+  width: 90px;
+  height: 110px;
+  -webkit-tap-highlight-color: transparent; }
+  .mfp-arrow:active {
+    margin-top: -54px; }
+  .mfp-arrow:hover,
+  .mfp-arrow:focus {
+    opacity: 1; }
+  .mfp-arrow:before,
+  .mfp-arrow:after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
+    margin-top: 35px;
+    margin-left: 35px;
+    border: medium inset transparent; }
+  .mfp-arrow:after {
+    border-top-width: 13px;
+    border-bottom-width: 13px;
+    top: 8px; }
+  .mfp-arrow:before {
+    border-top-width: 21px;
+    border-bottom-width: 21px;
+    opacity: 0.7; }
+
+.mfp-arrow-left {
+  left: 0; }
+  .mfp-arrow-left:after {
+    border-right: 17px solid #FFF;
+    margin-left: 31px; }
+  .mfp-arrow-left:before {
+    margin-left: 25px;
+    border-right: 27px solid #3F3F3F; }
+
+.mfp-arrow-right {
+  right: 0; }
+  .mfp-arrow-right:after {
+    border-left: 17px solid #FFF;
+    margin-left: 39px; }
+  .mfp-arrow-right:before {
+    border-left: 27px solid #3F3F3F; }
+
+.mfp-iframe-holder {
+  padding-top: 40px;
+  padding-bottom: 40px; }
+  .mfp-iframe-holder .mfp-content {
+    line-height: 0;
+    width: 100%;
+    max-width: 900px; }
+  .mfp-iframe-holder .mfp-close {
+    top: -40px; }
+
+.mfp-iframe-scaler {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  padding-top: 56.25%; }
+  .mfp-iframe-scaler iframe {
+    position: absolute;
+    display: block;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #000; }
+
+/* Main image in popup */
+img.mfp-img {
+  width: auto;
+  max-width: 100%;
+  height: auto;
+  display: block;
+  line-height: 0;
+  box-sizing: border-box;
+  padding: 40px 0 40px;
+  margin: 0 auto; }
+
+/* The shadow behind the image */
+.mfp-figure {
+  line-height: 0; }
+  .mfp-figure:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 40px;
+    bottom: 40px;
+    display: block;
+    right: 0;
+    width: auto;
+    height: auto;
+    z-index: -1;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #444; }
+  .mfp-figure small {
+    color: #BDBDBD;
+    display: block;
+    font-size: 12px;
+    line-height: 14px; }
+  .mfp-figure figure {
+    margin: 0; }
+
+.mfp-bottom-bar {
+  margin-top: -36px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  cursor: auto; }
+
+.mfp-title {
+  text-align: left;
+  line-height: 18px;
+  color: #F3F3F3;
+  word-wrap: break-word;
+  padding-right: 36px; }
+
+.mfp-image-holder .mfp-content {
+  max-width: 100%; }
+
+.mfp-gallery .mfp-image-holder .mfp-figure {
+  cursor: pointer; }
+
+@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
+  /**
+       * Remove all paddings around the image on small screen
+       */
+  .mfp-img-mobile .mfp-image-holder {
+    padding-left: 0;
+    padding-right: 0; }
+  .mfp-img-mobile img.mfp-img {
+    padding: 0; }
+  .mfp-img-mobile .mfp-figure:after {
+    top: 0;
+    bottom: 0; }
+  .mfp-img-mobile .mfp-figure small {
+    display: inline;
+    margin-left: 5px; }
+  .mfp-img-mobile .mfp-bottom-bar {
+    background: rgba(0, 0, 0, 0.6);
+    bottom: 0;
+    margin: 0;
+    top: auto;
+    padding: 3px 5px;
+    position: fixed;
+    box-sizing: border-box; }
+    .mfp-img-mobile .mfp-bottom-bar:empty {
+      padding: 0; }
+  .mfp-img-mobile .mfp-counter {
+    right: 5px;
+    top: 3px; }
+  .mfp-img-mobile .mfp-close {
+    top: 0;
+    right: 0;
+    width: 35px;
+    height: 35px;
+    line-height: 35px;
+    background: rgba(0, 0, 0, 0.6);
+    position: fixed;
+    text-align: center;
+    padding: 0; } }
+
+@media all and (max-width: 900px) {
+  .mfp-arrow {
+    -webkit-transform: scale(0.75);
+    transform: scale(0.75); }
+  .mfp-arrow-left {
+    -webkit-transform-origin: 0;
+    transform-origin: 0; }
+  .mfp-arrow-right {
+    -webkit-transform-origin: 100%;
+    transform-origin: 100%; }
+  .mfp-container {
+    padding-left: 6px;
+    padding-right: 6px; } }

brutaldon/templates/base.html

@@ -33,13 +33,13 @@
                     <link rel="stylesheet"
                           href="{% static 'css/bulma-badge.min.css' %}">
                     <link rel="stylesheet"
-                          href="{% static 'css/photobox.css' %}">
+                          href="{% static 'css/magnific-popup.css' %}">
                 {% endif %}
                 {% if not preferences.no_javascript %}
                     <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
                     <script type="text/javascript" src="{% static 'js/intercooler.js' %}"></script>
                     <script type="application/javascript" src="{% static 'js/mousetrap.min.js' %}"></script>
-                    <script type="text/javascript" src="{% static 'js/jquery.photobox.js' %}"></script>
+                    <script type="text/javascript" src="{% static 'js/jquery.magnific-popup.min.js' %}"></script>
                     <script type="text/javascript" src="{% static 'js/brutaldon-enhancements.js' %}"></script>
                     {% block page_scripts %}
                     {% endblock %}
@@ -186,7 +186,15 @@
              {% if preferences.lightbox %}
              Intercooler.ready(function ()
                  {
-                     $(".attachments").photobox('a', { history: false });
+                     $('.attachments').each(function() {
+                         $(this).magnificPopup({
+                             delegate: 'a.attachment-image',
+                             type: 'image',
+                             preload: [1, 1],
+                             gallery:  {enabled: true },
+                             zoom: { enabled: true }
+                         });
+                     });
                  });
              {% endif %}
             </script>

brutaldon/templates/main/toot_partial.html

@@ -56,27 +56,49 @@
                 <div class="level attachments">
                     {% for media in toot.media_attachments %}
                         {% if media.type == "image" %}
-                            <a class="level-item" href="{{ media.url }}">
+                            <a class="level-item attachment-image" href="{{ media.url }}">
+                                {% if toot.sensitive %}
+                                    <img src="{% static "images/sensitive.png" %}"
+                                {% else %}
+                                    <img src="{{ media.preview_url }}"
+                                {% endif %}
+                                         alt="{% if media.description  %}
+                                              {{ media.description }}
+                                         {% elif media.text_url %}
+                                              {{ media.text_url }}
+                                         {% else %}
+                                              {{ media.url  }}
+                                         {% endif %}"
+                                         {% if media.description %}
+                                         title="{{ media.description }}"
+                                         {% endif %}
+                                         class="image is-max-256">
+                            </a>
+
                         {% else %}
-                            <a class="level-item" href="{{ media.url }}" rel="video">
+                            <video class="level-item is-max-256" controls>
-                        {% endif %}
+                                <source src="{{ media.url }}" type="video/mp4">
-                        {% if toot.sensitive %}
+                                <a href="{{ media.url }}">
-                            <img src="{% static "images/sensitive.png" %}"
+                                    {% if toot.sensitive %}
-                        {% else %}
+                                        <img src="{% static "images/sensitive.png" %}"
-                            <img src="{{ media.preview_url }}"
+                                    {% else %}
-                        {% endif %}
+                                        <img src="{{ media.preview_url }}"
-                                 alt="{% if media.description  %}
+                                    {% endif %}
-                                      {{ media.description }}
+                                             alt="{% if media.description  %}
-                                 {% elif media.text_url %}
+                                                  {{ media.description }}
-                                      {{ media.text_url }}
+                                             {% elif media.text_url %}
-                                 {% else %}
+                                                  {{ media.text_url }}
-                                      {{ media.url  }}
+                                             {% else %}
-                                 {% endif %}"
+                                                  {{ media.url  }}
-                                 {% if media.description %}
+                                             {% endif %}"
-                                 title="{{ media.description }}"
+                                             {% if media.description %}
-                                 {% endif %}
+                                             title="{{ media.description }}"
-                                 class="image is-max-256">
+                                             {% endif %}
+                                             class="image is-max-256">
                                 </a>
+                            </video>
+
+                        {% endif %}
                     {% endfor %}
                 </div>
                 {% endif %}

package.json

@@ -6,6 +6,7 @@
     "fork-awesome": "^1.1.0",
     "intercooler": "^1.2.1",
     "jquery": "^3.3.1",
+    "magnific-popup": "^1.1.0",
     "mousetrap": "^1.6.2"
   }
 }

yarn.lock

@@ -26,6 +26,11 @@ jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
 
+magnific-popup@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/magnific-popup/-/magnific-popup-1.1.0.tgz#3e7362c5bd18f6785fe99e59d013e20af33d3049"
+  integrity sha1-PnNixb0Y9nhf6Z5Z0BPiCvM9MEk=
+
 mousetrap@^1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.2.tgz#caadd9cf886db0986fb2fee59a82f6bd37527587"