Fix corteza-studio bootstrap scss order

and ui.custom-css settings reference
cortezaproject · Nov 1, 2023 · 8a8b3bd · 8a8b3bd
1 parent 1a1ede0
commit 8a8b3bd
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue b/client/web/admin/src/components/Settings/UI/CUIBrandingEditor.vue
@@ -27,7 +27,7 @@
       >
         <b-form-group
           :label="$t(`brandVariables.${key}`)"
-          label-class="primary"
+          label-class="text-primary"
         >
           <c-input-color-picker
             v-model="brandingVariables[key]"

diff --git a/client/web/admin/src/components/Settings/UI/CUICustomCSS.vue b/client/web/admin/src/components/Settings/UI/CUICustomCSS.vue
@@ -107,14 +107,14 @@ export default {
     settings: {
       immediate: true,
       handler (settings) {
-        this.customCSS = settings['ui.studio.custom-css'] || ''
+        this.customCSS = settings['ui.custom-css'] || ''
       },
     },
   },
 
   methods: {
     onSubmit () {
-      this.$emit('submit', { 'ui.studio.custom-css': this.customCSS })
+      this.$emit('submit', { 'ui.custom-css': this.customCSS })
     },
 
     openEditorModal () {

diff --git a/server/assets/src/css/minified-custom.css b/server/assets/src/css/minified-custom.css
diff --git a/server/assets/src/scss/18183631_card.scss → server/assets/src/scss/18185341_card.scss b/server/assets/src/scss/18183631_card.scss → server/assets/src/scss/18185341_card.scss
diff --git a/server/pkg/webapp/serve.go b/server/pkg/webapp/serve.go
@@ -154,7 +154,7 @@ func serveConfig(r chi.Router, config webappConfig) {
 
 		ctx := auth.SetIdentityToContext(r.Context(), auth.ServiceUser())
 
-		stylesheet, err := service.GenerateCSS(ctx, config.settings.UI.Studio.BrandingSASS, config.settings.UI.Studio.CustomCSS, config.scssDirPath)
+		stylesheet, err := service.GenerateCSS(ctx, config.settings.UI.Studio.BrandingSASS, config.settings.UI.CustomCSS, config.scssDirPath)
 		if err != nil {
 			logger.Default().Error("failed to generate CSS", zap.Error(err))
 		}

diff --git a/server/system/service/settings.go b/server/system/service/settings.go
@@ -246,7 +246,7 @@ func (svc *settings) BulkSet(ctx context.Context, vv types.SettingValueSet) (err
 
 	for _, v := range vv {
 		// if branding-sass or custom-css is updated, empty stylesheet cache
-		if v.Name == "ui.studio.branding-sass" || v.Name == "ui.studio.custom-css" {
+		if v.Name == "ui.studio.branding-sass" || v.Name == "ui.custom-css" {
 			sass.StylesheetCache.Set(map[string]string{})
 		}
 

diff --git a/server/system/types/app_settings.go b/server/system/types/app_settings.go
@@ -248,8 +248,8 @@ type (
 				Disabled bool `json:"disabled"`
 			} `kv:"sidebar,final" json:"sidebar"`
 
+			CustomCSS string `kv:"custom-css" json:"customCSS"`
 			Studio struct {
-				CustomCSS     string `kv:"custom-css" json:"customCSS"`
 				BrandingSASS  string `kv:"branding-sass" json:"branding-sass"`
 				SassInstalled bool   `kv:"sass-installed" json:"sass-installed"`
 			} `kv:"studio" json:"studio"`