Skip to content

Commit

Permalink
Task CR-999: update shortfreetext(S) with maps (input-group-text, inp…
Browse files Browse the repository at this point in the history
…ut-group)
  • Loading branch information
ptelu committed Mar 22, 2023
1 parent 7b79042 commit 50ff6f2
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 9 deletions.
9 changes: 8 additions & 1 deletion assets/survey_themes/ls6_surveytheme/forms/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@ $input-border-width : 2px;
border-width : $input-border-width;
line-height : $input-line-height;
}

.input-group-text {
padding : $input-padding-y $input-padding-x;
border-width : $input-border-width;
line-height : $input-line-height;
}
.input-group>:not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback){
margin-left: -$input-border-width;
}
16 changes: 14 additions & 2 deletions assets/survey_themes/ls6_surveytheme/forms/forms_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@ $input-box-shadow : 4px 4px 0 $elevation-shadow;
$input-focus-border-color : $g-900;
// input field
.form-control {
color : $input-color ;
color : $input-color;
border-color : $input-border-color;

&:focus {
box-shadow : $input-box-shadow;
border-color : $input-focus-border-color
}

&::placeholder {
color : $g-600;
opacity : 1;
}

&:-ms-input-placeholder {
color : $g-600;
opacity : 1;
Expand All @@ -22,9 +25,11 @@ $input-focus-border-color : $g-900;

.form-control[disabled] {
color : $color_mercury_approx;

&.total {
color : $color_gravel_approx;
}

background-color : $color_wild_sand_approx;
opacity : 1;
}
Expand All @@ -41,6 +46,13 @@ fieldset[disabled] {
}
}

.input-group-text {
color : $white;
background-color : $base-color;
border-color : $input-border-color;
}


input[type="checkbox"]:checked:after,
.checkbox input[type="checkbox"]:checked:after,
.checkbox-inline input[type="checkbox"]:checked:after {
Expand All @@ -59,4 +71,4 @@ textarea,
.checkbox-item input[type="radio"]:checked + label::after {
background-color : $base-color;
color : white;
}
}
4 changes: 0 additions & 4 deletions assets/survey_themes/ls6_surveytheme/src/definitions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1155,10 +1155,6 @@ body {
color: white;
background-color: $base-color;
}
.input-group-text {
color: white;
background-color: $base-color;
}
.nav {
.nav-divider {
background-color: $mercury;
Expand Down
10 changes: 10 additions & 0 deletions themes/survey/ls6_surveytheme/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -879,4 +879,14 @@ a {
padding: 10px 12px;
border-width: 2px;
line-height: 16px;
}

.input-group-text {
padding: 10px 12px;
border-width: 2px;
line-height: 16px;
}

.input-group > :not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
margin-left: -2px;
}
2 changes: 1 addition & 1 deletion themes/survey/ls6_surveytheme/css/variations/green.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion themes/survey/ls6_surveytheme/css/variations/red.css

Large diffs are not rendered by default.

0 comments on commit 50ff6f2

Please sign in to comment.