Merge pull request #50 from sebgroup/develop

cut release
seb-oss · Oct 11, 2018 · 83f7398 · 83f7398
2 parents 0ef7b7f + b0d57d8
commit 83f7398
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/scss/styles/_forms.scss b/scss/styles/_forms.scss
@@ -69,18 +69,19 @@ input + .progress-feedback, select + .progress-feedback, textarea + .progress-fe
   font-size: $form-feedback-font-size;
   color: $text-muted;
   margin-top: 5px;
+  width: 100%;
   &.valid-feedback {
     margin-top: 4px;
   }
 }
 
 // SEB Specific styles for validation progress bar
-:focus + .progress-feedback,
-:focus + .invalid-feedback,
-:focus + .valid-feedback,
-.input-group-append + .progress-feedback,
-.input-group-append + .invalid-feedback,
-.input-group-append + .valid-feedback {
+.form-control:focus + .progress-feedback,
+.form-control:focus + .invalid-feedback,
+.form-control:focus + .valid-feedback,
+.form-control:focus ~ .input-group-append + .progress-feedback,
+.form-control:focus ~ .input-group-append + .invalid-feedback,
+.form-control:focus ~ .input-group-append + .valid-feedback {
   &.progress-0::before {
     width: 0;
     border-radius: 0 0 0 4px;

diff --git a/scss/styles/_input-group.scss b/scss/styles/_input-group.scss
@@ -14,6 +14,10 @@
   position: relative;
 }
 
+.form-control:disabled ~ .input-group-append > .input-group-text {
+  background: $input-disabled-bg;
+}
+
 @include media-breakpoint-down(xs) {
   .input-group.active {
     color: $input-focus-color;

diff --git a/scss/styles/_utilities.scss b/scss/styles/_utilities.scss
@@ -2,6 +2,7 @@
 @import "../bootstrap-core/utilities/align";
 @import "../bootstrap-core/utilities/background";
 @import "../bootstrap-core/utilities/borders";
+@import "utilities/borders";
 @import "../bootstrap-core/utilities/clearfix";
 @import "../bootstrap-core/utilities/display";
 @import "../bootstrap-core/utilities/embed";

diff --git a/scss/styles/utilities/_borders.scss b/scss/styles/utilities/_borders.scss
@@ -0,0 +1,4 @@
+.input-border-right {
+  border-top-right-radius: $input-border-radius !important;
+  border-bottom-right-radius: $input-border-radius !important;
+}