From 8208bc0c718459de4df2eba33984fbc3edf78c06 Mon Sep 17 00:00:00 2001 From: Jeremy Rudman Date: Sat, 8 Aug 2020 00:30:43 -0400 Subject: [PATCH 1/3] fix(questionnaire): fixed background in school autocomplete fixed the questionnaire edit page so that it was blank in the management edit page --- app/assets/stylesheets/manage.sass | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/assets/stylesheets/manage.sass b/app/assets/stylesheets/manage.sass index e08c1596e..470bb45ef 100644 --- a/app/assets/stylesheets/manage.sass +++ b/app/assets/stylesheets/manage.sass @@ -3,6 +3,8 @@ @import manage/selectize-fix @import vendor/simplemde.min @import vendor/codemirror +@import general/variables +@import general/css4 $grey-dark: #555 $grey-med: #999 @@ -172,6 +174,30 @@ $grey-med: #999 .sidebar-mobile .sidebar-sticky height: auto +// jquery ui override +.ui-autocomplete + @include css4 + background: var(--input--background--focus) + border: 1px solid var(black) + color: var(--input--text--focus) + list-style: none + padding: 0 + .ui-menu-item div + padding: 2px 5px + display: block + cursor: pointer + overflow: hidden + text-overflow: ellipsis + white-space: nowrap + &:hover + @include css4 + background: var(--primary) + @include css4 + color: var(--white) +// needed for ellipsis in text to work and acts as a min-width +.ui-menu + width: 50px + /* * Datatable changes */ From 572965f34e0cbf858cb527872c85c9b517b6e513 Mon Sep 17 00:00:00 2001 From: Jeremy Rudman Date: Sat, 8 Aug 2020 18:29:52 -0400 Subject: [PATCH 2/3] fix(questionnaire): sperated autocomplete sass into its own file seperated the sass for the autocomplete into its own file so that manage could use it without the other sass in forms.sass --- app/assets/stylesheets/application.sass | 1 + .../stylesheets/forms/_autocomplete.sass | 24 +++++++++++++++++++ app/assets/stylesheets/forms/_forms.sass | 24 ------------------- app/assets/stylesheets/manage.sass | 24 +------------------ 4 files changed, 26 insertions(+), 47 deletions(-) create mode 100644 app/assets/stylesheets/forms/_autocomplete.sass diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index bf1d19b10..3a4b95ddb 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -25,6 +25,7 @@ @import general/table @import forms/forms @import forms/confirmation +@import forms/autocomplete @import general/theming-editor diff --git a/app/assets/stylesheets/forms/_autocomplete.sass b/app/assets/stylesheets/forms/_autocomplete.sass new file mode 100644 index 000000000..05e044650 --- /dev/null +++ b/app/assets/stylesheets/forms/_autocomplete.sass @@ -0,0 +1,24 @@ + +// jquery ui override +.ui-autocomplete + @include css4 + background: var(--input--background--focus) + border: 1px solid var(--input--border-color--focus) + color: var(--input--text--focus) + list-style: none + padding: 0 + .ui-menu-item div + padding: 2px 5px + display: block + cursor: pointer + overflow: hidden + text-overflow: ellipsis + white-space: nowrap + &:hover + @include css4 + background: var(--primary) + @include css4 + color: var(--white) +// needed for ellipsis in text to work and acts as a min-width +.ui-menu + width: 50px diff --git a/app/assets/stylesheets/forms/_forms.sass b/app/assets/stylesheets/forms/_forms.sass index 2c9f272e0..ab8a3fcb0 100644 --- a/app/assets/stylesheets/forms/_forms.sass +++ b/app/assets/stylesheets/forms/_forms.sass @@ -253,30 +253,6 @@ input[type=submit] margin-bottom: 3px -// jquery ui override -.ui-autocomplete - @include css4 - background: var(--input--background--focus) - border: 1px solid var(--input--border-color--focus) - color: var(--input--text--focus) - list-style: none - padding: 0 - .ui-menu-item div - padding: 2px 5px - display: block - cursor: pointer - overflow: hidden - text-overflow: ellipsis - white-space: nowrap - &:hover - @include css4 - background: var(--primary) - @include css4 - color: var(--white) -// needed for ellipsis in text to work and acts as a min-width -.ui-menu - width: 50px - // form wizard .wizard-stage display: none diff --git a/app/assets/stylesheets/manage.sass b/app/assets/stylesheets/manage.sass index 470bb45ef..4a55323cb 100644 --- a/app/assets/stylesheets/manage.sass +++ b/app/assets/stylesheets/manage.sass @@ -5,6 +5,7 @@ @import vendor/codemirror @import general/variables @import general/css4 +@import forms/autocomplete $grey-dark: #555 $grey-med: #999 @@ -174,29 +175,6 @@ $grey-med: #999 .sidebar-mobile .sidebar-sticky height: auto -// jquery ui override -.ui-autocomplete - @include css4 - background: var(--input--background--focus) - border: 1px solid var(black) - color: var(--input--text--focus) - list-style: none - padding: 0 - .ui-menu-item div - padding: 2px 5px - display: block - cursor: pointer - overflow: hidden - text-overflow: ellipsis - white-space: nowrap - &:hover - @include css4 - background: var(--primary) - @include css4 - color: var(--white) -// needed for ellipsis in text to work and acts as a min-width -.ui-menu - width: 50px /* * Datatable changes From 1a902003a592705950ac731479d699d86ee13016 Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Sun, 20 Sep 2020 03:53:14 -0400 Subject: [PATCH 3/3] Use grays for manage backgrouind --- app/assets/stylesheets/manage.sass | 2 +- app/assets/stylesheets/manage/_autocomplete.sass | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/manage/_autocomplete.sass diff --git a/app/assets/stylesheets/manage.sass b/app/assets/stylesheets/manage.sass index 4a55323cb..087c35ffa 100644 --- a/app/assets/stylesheets/manage.sass +++ b/app/assets/stylesheets/manage.sass @@ -5,7 +5,7 @@ @import vendor/codemirror @import general/variables @import general/css4 -@import forms/autocomplete +@import manage/autocomplete $grey-dark: #555 $grey-med: #999 diff --git a/app/assets/stylesheets/manage/_autocomplete.sass b/app/assets/stylesheets/manage/_autocomplete.sass new file mode 100644 index 000000000..f5e716fea --- /dev/null +++ b/app/assets/stylesheets/manage/_autocomplete.sass @@ -0,0 +1,12 @@ + +@import ../forms/autocomplete + +// jquery ui override +.ui-autocomplete + background: white + border: 1px solid #333 + color: #222 + .ui-menu-item div + &:hover + background: #999 + color: white