diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/typography.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/typography.scss index 41b62fa1d..f9aa1d704 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/typography.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/typography.scss @@ -56,9 +56,10 @@ kbd{ /* Help text formatters */ .help-block{ - display:inline-block; + float:left; padding:1em; margin:1em 0; + clear:both; p{ margin-top:0; diff --git a/wagtail/wagtailimages/static/wagtailimages/js/image-url-generator.js b/wagtail/wagtailimages/static/wagtailimages/js/image-url-generator.js index fe3902483..fce263a16 100644 --- a/wagtail/wagtailimages/static/wagtailimages/js/image-url-generator.js +++ b/wagtail/wagtailimages/static/wagtailimages/js/image-url-generator.js @@ -10,6 +10,7 @@ $(function() { var $result = $this.find('#result-url'); var $loadingMask = $this.find('.loading-mask') var $preview = $this.find('img.preview'); + var $sizeNote = $('#note-size') var generatorUrl = $this.data('generatorUrl'); @@ -35,6 +36,13 @@ $(function() { filterSpec += '-' + $widthField.val() + 'x' + $heightField.val(); } + // Display note about scaled down images if image is large + if($widthField.val() > $(window).width()){ + $sizeNote.show(); + }else{ + $sizeNote.hide(); + } + // Fields with width and height $.getJSON(generatorUrl.replace('__filterspec__', filterSpec)) .done(function(data) { diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html index 0e47f5b65..aae28cd95 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html +++ b/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html @@ -26,10 +26,12 @@

{% trans "Preview" %}

-
- Preview +
+
+ Preview +
-

{% trans "Note that images generated larger than the screen will appear smaller when previewed here, so they fit the screen." %}

+

{% trans "Note that images generated larger than the screen will appear smaller when previewed here, so they fit the screen." %}

{% endblock %}