From 0017f2d5bcdb0589d6bb6ecdac42ec504ca0032e Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 30 Oct 2015 14:54:31 +0100 Subject: [PATCH] Set uniform line-heights for correct alignment --- app/assets/stylesheets/content/_form_error_messages.sass | 1 + app/assets/stylesheets/content/_forms.sass | 2 +- app/assets/stylesheets/content/_select2.scss | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/content/_form_error_messages.sass b/app/assets/stylesheets/content/_form_error_messages.sass index 3f1c3b0d36..b97f8294d1 100644 --- a/app/assets/stylesheets/content/_form_error_messages.sass +++ b/app/assets/stylesheets/content/_form_error_messages.sass @@ -30,6 +30,7 @@ span.errorSpan font-weight: bold + width: 100% textarea, select, input &, &:hover, &:focus diff --git a/app/assets/stylesheets/content/_forms.sass b/app/assets/stylesheets/content/_forms.sass index 95a78b3614..6a18b5269c 100644 --- a/app/assets/stylesheets/content/_forms.sass +++ b/app/assets/stylesheets/content/_forms.sass @@ -496,7 +496,6 @@ input[readonly].-clickable &.select2-container // styles adapted to input fields to align them - margin-bottom: 0.5rem .select2-choice height: 2.15rem @@ -598,6 +597,7 @@ input[readonly].-clickable font-size: 1em background: none border: none + line-height: 2 .form--label-with-check-box display: block diff --git a/app/assets/stylesheets/content/_select2.scss b/app/assets/stylesheets/content/_select2.scss index fd62fda515..4c532c76cf 100644 --- a/app/assets/stylesheets/content/_select2.scss +++ b/app/assets/stylesheets/content/_select2.scss @@ -122,9 +122,10 @@ $se2-theme-selectable-font-color-highlighted: $drop-down-selected-font-color; $se2-element-height: 33px; $se2-input-height: rem-calc(34px); -$se2-line-height: 30px; +$se2-line-height: $se2-element-height; $se2-button-width: 28px; -$se2-arrow-button-width: 18px; +$se2-arrow-button-height: 20px; +$se2-arrow-button-width: 17px; $se2-results-max-height: 200px; $se-multiple-input-line-height: 19px; @@ -141,7 +142,7 @@ $se2-width: 100%; box-shadow: none; background: none; height: $se2-element-height; - line-height: $se2-element-height; + line-height: $se2-line-height; .select2-chosen { line-height: $se2-line-height; @@ -156,7 +157,7 @@ $se2-width: 100%; > b { display: inline-block; - height: $se2-arrow-button-width; + height: $se2-arrow-button-height; width: $se2-arrow-button-width; } }