Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252efecd authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'dev/update-html-id' into 'master'

Update html id to match oscar theme

See merge request !163
parents c0e927a7 2ccd4734
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,7 @@ engines:
    timeout : 6.0
    additional_tests:
      rosebud: *test_rosebud
    disabled: True

  - name : tokyotoshokan
    engine : tokyotoshokan
+8 −8
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ input:checked + .slider:before {
    padding-left: 16px;
  }
}
#results {
#main_results {
  margin-top: 32px;
  margin-bottom: 32px;
}
@@ -1028,11 +1028,11 @@ input:checked + .slider:before {
  border: none;
  margin-bottom: 8px;
}
#results.images-gallery {
#main_results.images-gallery {
  display: flex;
  flex-wrap: wrap;
}
#results.images-gallery .result.result-images {
#main_results.images-gallery .result.result-images {
  display: block;
  flex: 20%;
  height: 200px;
@@ -1047,17 +1047,17 @@ input:checked + .slider:before {
  margin-bottom: 0;
}
@supports (display: grid) {
  #results.images-gallery {
  #main_results.images-gallery {
    display: grid;
    grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
    grid-gap: 8px;
  }
  #results.images-gallery .result.result-images {
  #main_results.images-gallery .result.result-images {
    display: block;
    text-align: center;
    overflow: hidden;
  }
  #results.images-gallery .result.result-images .img-thumbnail {
  #main_results.images-gallery .result.result-images .img-thumbnail {
    height: 100%;
    width: auto;
  }
@@ -1150,10 +1150,10 @@ input:checked + .slider:before {
  font-size: 18px;
}
@media screen and (max-width: 1100px) {
  #results.images-gallery {
  #main_results.images-gallery {
    grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
  }
  #results.images-gallery .result.result-images {
  #main_results.images-gallery .result.result-images {
    height: 140px;
    max-height: 140px;
  }
+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ $(document).ready(function(){
    document.getElementById("image_view_url_link").href = target.dataset.url;
  }

  $("#results").on("click", ".result.result-images", function (event) {
  $("#main_results").on("click", ".result.result-images", function (event) {
    event.preventDefault();
    var target = event.target;
    var view_url = target.src;
@@ -108,7 +108,7 @@ $(document).ready(function(){
    document.body.classList.remove("lock");
  });

  if ($("#results").has(".first-page-media-results").length) {
  if ($("#main_results").has(".first-page-media-results").length) {
    var headers = {"headers": { "Content-Type": "application/json"}};
    var query_params = $.param({
      "format": "json",
+0 −0

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

Loading