From 24b95e5fbc2cded43065966ffffd7e518b1796b8 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 31 Aug 2016 09:58:26 +0200 Subject: [PATCH] Scale image size also in detail and projector view. --- openslides/core/static/css/app.css | 4 ++++ openslides/core/static/css/projector.css | 4 ++++ openslides/core/static/js/core/site.js | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 4c20c4ce5..c3c02d6b9 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -318,6 +318,10 @@ img { margin-right: 13px; } +.col1 .details img { + max-width: 100%; + height: auto; +} .col1 ul, .col1 ol { margin-left: 20px; } diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index 6bb6d300d..835ae4dfe 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -81,6 +81,10 @@ body{ z-index: -1; line-height: 1.3em; } +.content img { + max-width: 65%; + height: auto; +} .scrollcontent { transition-property: margin, font-size; transition-duration: 1s; diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index ccb35af3b..03b41a9a3 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -360,8 +360,8 @@ angular.module('OpenSlidesApp.core.site', [ // This requires further information // A4 in 72dpi: 595px x 842px var maxResolution = { - width: 590, - height: 840 + width: 435, + height: 830 }, width = parseInt(element.getAttribute("width")), height = parseInt(element.getAttribute("height"));