diff --git a/tildes/scss/modules/_btn.scss b/tildes/scss/modules/_btn.scss index 340ec81..43baaff 100644 --- a/tildes/scss/modules/_btn.scss +++ b/tildes/scss/modules/_btn.scss @@ -99,6 +99,11 @@ form { min-width: 100%; } + + // Status message (errors) should be on their own line as well + > .text-status-message { + min-width: 100%; + } } .btn-post-action { diff --git a/tildes/scss/modules/_form.scss b/tildes/scss/modules/_form.scss index 7d08a87..d66a81d 100644 --- a/tildes/scss/modules/_form.scss +++ b/tildes/scss/modules/_form.scss @@ -55,6 +55,7 @@ select.form-select:not([multiple]) { display: flex; flex-direction: row-reverse; justify-content: flex-start; + align-items: center; margin: 0.2rem 0; max-width: 40rem; @@ -72,11 +73,6 @@ textarea.form-input { transition: none; } -.form-status { - margin: auto 0; - font-size: 0.6rem; -} - .form-input { max-width: 40rem; } diff --git a/tildes/scss/modules/_text.scss b/tildes/scss/modules/_text.scss index a2c246e..b277d59 100644 --- a/tildes/scss/modules/_text.scss +++ b/tildes/scss/modules/_text.scss @@ -10,6 +10,10 @@ line-height: 0.9rem; } +.text-status-message { + font-size: 0.6rem; +} + // special formatting rules for wiki pages .text-wiki { h1, diff --git a/tildes/scss/themes/_theme_base.scss b/tildes/scss/themes/_theme_base.scss index 805bb4d..ad23b84 100644 --- a/tildes/scss/themes/_theme_base.scss +++ b/tildes/scss/themes/_theme_base.scss @@ -368,10 +368,6 @@ } } - .form-status-error { - color: map-get($theme, "error"); - } - .input-group-addon { background-color: map-get($theme, "background-secondary"); color: map-get($theme, "foreground-highlight"); @@ -478,6 +474,10 @@ } } + .text-error { + color: map-get($theme, "error"); + } + .text-secondary { color: map-get($theme, "foreground-secondary"); } diff --git a/tildes/static/js/behaviors/theme-selector.js b/tildes/static/js/behaviors/theme-selector.js index ae8798b..0d96d63 100644 --- a/tildes/static/js/behaviors/theme-selector.js +++ b/tildes/static/js/behaviors/theme-selector.js @@ -8,7 +8,7 @@ $.onmount("[data-js-theme-selector]", function() { // hide any IC change message $(this) .parent() - .find(".form-status") + .find(".text-status-message") .hide(); var new_theme = $(this).val(); diff --git a/tildes/static/js/scripts.js b/tildes/static/js/scripts.js index af1ee64..d11040a 100644 --- a/tildes/static/js/scripts.js +++ b/tildes/static/js/scripts.js @@ -26,45 +26,48 @@ $(function() { $.onmount(); }); - // Called whenever an Intercooler request completes; used for
elements - // to display the error or a success message. - // If the triggering element already contains an element with class - // "form-status", it will be removed, then a new one is added inside the - // .form-buttons element if possible, otherwise it will be appended to the - // triggering element itself. The status div will then have its class set based - // on whether the response was an error or not, and the text set to either the - // error message or a generic success message. + // Called whenever an Intercooler request completes; used to display an error or + // success message in an appropriate place near supported elements. /* eslint-disable-next-line no-unused-vars */ $(document).on("complete.ic", function(evt, elt, data, status, xhr, requestId) { - // only do anything for elements - if (elt[0].tagName !== "FORM") { + var $container = null; + + // Only display these messages if the triggering element was or {% if previous_topics %} -
Link has been posted before, see below
+
Link has been posted before, see below
{% endif %}