@explorer02/cfm-survey-sdk 0.3.1 → 0.3.3

package/templates/docs/templates/MatrixDropdown.tsx

@@ -9,6 +9,7 @@
 import React, { useState, useRef, useEffect } from 'react';
 import type { ScaleColumn } from '@explorer02/cfm-survey-sdk';
 import { matrixColumnStoredValue } from '@explorer02/cfm-survey-sdk';
+import { focusRingVar, mcqSelectedAccentVar, mcqSelectedBgVar } from '@/lib/surveyUi/selectionStyles';
 
 type MatrixDropdownProps = {
   options: ScaleColumn[];
@@ -72,9 +73,9 @@ export default function MatrixDropdown({
           style={{
             display: 'flex', alignItems: 'center', flexWrap: 'wrap', gap: '8px',
             width: '100%', padding: '10px 14px', backgroundColor: '#fff',
-            border: `1px solid ${isOpen ? '#e20074' : '#d1d5db'}`, borderRadius: '8px',
+            border: `1px solid ${isOpen ? focusRingVar : '#d1d5db'}`, borderRadius: '8px',
             cursor: 'pointer', transition: 'all 0.2s', minHeight: '44px',
-            boxShadow: isOpen ? '0 0 0 3px rgba(226, 0, 116, 0.1)' : '0 1px 2px rgba(0,0,0,0.05)',
+            boxShadow: isOpen ? '0 0 0 3px var(--cfm-input-focus-glow, rgba(226, 0, 116, 0.1))' : '0 1px 2px rgba(0,0,0,0.05)',
           }}
         >
           {multiValues.length === 0 ? (
@@ -124,9 +125,9 @@ export default function MatrixDropdown({
         style={{
           display: 'flex', alignItems: 'center', justifyContent: 'space-between',
           width: '100%', padding: '14px 16px', backgroundColor: '#fff',
-          border: `1px solid ${isOpen ? '#e20074' : '#d1d5db'}`, borderRadius: '8px',
+          border: `1px solid ${isOpen ? focusRingVar : '#d1d5db'}`, borderRadius: '8px',
           cursor: 'pointer', transition: 'all 0.2s',
-          boxShadow: isOpen ? '0 0 0 3px rgba(226, 0, 116, 0.1)' : '0 1px 2px rgba(0,0,0,0.05)',
+          boxShadow: isOpen ? '0 0 0 3px var(--cfm-input-focus-glow, rgba(226, 0, 116, 0.1))' : '0 1px 2px rgba(0,0,0,0.05)',
         }}
       >
         <span
@@ -165,12 +166,12 @@ export default function MatrixDropdown({
                 key={col.id}
                 style={{
                   padding: '12px 16px', cursor: isDisabled ? 'not-allowed' : 'pointer', transition: 'background-color 0.15s',
-                  backgroundColor: isSelected ? '#fdf2f8' : '#fff',
+                  backgroundColor: isSelected ? mcqSelectedBgVar : '#fff',
                   opacity: isDisabled ? 0.5 : 1,
                   display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: '12px',
                 }}
-                onMouseEnter={e => { if (!isDisabled) e.currentTarget.style.backgroundColor = '#fdf2f8'; }}
-                onMouseLeave={e => { if (!isDisabled) e.currentTarget.style.backgroundColor = isSelected ? '#fdf2f8' : '#fff'; }}
+                onMouseEnter={e => { if (!isDisabled) e.currentTarget.style.backgroundColor = mcqSelectedBgVar; }}
+                onMouseLeave={e => { if (!isDisabled) e.currentTarget.style.backgroundColor = isSelected ? mcqSelectedBgVar : '#fff'; }}
                 onClick={e => {
                   e.preventDefault();
                   if (isDisabled) return;
@@ -187,8 +188,8 @@ export default function MatrixDropdown({
                     <div style={{
                       display: 'flex', alignItems: 'center', justifyContent: 'center',
                       width: '18px', height: '18px', borderRadius: '4px',
-                      border: isSelected ? '2px solid #e20074' : '2px solid #d1d5db',
-                      backgroundColor: isSelected ? '#e20074' : '#fff',
+                      border: isSelected ? `2px solid ${mcqSelectedAccentVar}` : '2px solid #d1d5db',
+                      backgroundColor: isSelected ? mcqSelectedAccentVar : '#fff',
                       flexShrink: 0, transition: 'all 0.15s',
                     }}>
                       {isSelected && (
@@ -198,11 +199,11 @@ export default function MatrixDropdown({
                       )}
                     </div>
                   )}
-                  <span style={{ fontSize: '15px', fontWeight: isSelected ? 600 : 400, color: isSelected ? '#e20074' : '#374151', userSelect: 'none' }}
+                  <span style={{ fontSize: '15px', fontWeight: isSelected ? 600 : 400, color: isSelected ? mcqSelectedAccentVar : '#374151', userSelect: 'none' }}
                         dangerouslySetInnerHTML={{ __html: col.label }} />
                 </div>
                 {!multiple && isSelected && (
-                  <svg style={{ width: '18px', height: '18px', color: '#e20074', flexShrink: 0 }} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <svg style={{ width: '18px', height: '18px', color: mcqSelectedAccentVar, flexShrink: 0 }} fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2.5} d="M5 13l4 4L19 7" />
                   </svg>
                 )}

package/templates/docs/templates/Question.tsx

@@ -11,7 +11,7 @@
 
 import React, { useMemo } from 'react';
 import type { SurveyQuestion, AnswerValue, SurveyAnswers, CustomFieldValueMap, HeatmapAnswer, HeatmapQuestion } from '@explorer02/cfm-survey-sdk';
-import { QUESTION_TYPE, resolveSurveyQuestionPlaceholders, getVisibleMatrixItemsForAnswers, getVisibleMcqOptionsForAnswers, getVisibleRankOrderOptionsForAnswers } from '@explorer02/cfm-survey-sdk';
+import { QUESTION_TYPE, resolveSurveyQuestionPlaceholders, getVisibleMatrixItemsForAnswers, getVisibleMcqOptionsForAnswers, getVisibleRankOrderOptionsForAnswers, normalizeRankOrderAnswers } from '@explorer02/cfm-survey-sdk';
 import { CsatMatrixScale } from './CsatMatrixScale';
 import { SliderMatrixScale } from './SliderMatrixScale';
 import { LikertMatrixScale } from './LikertMatrixScale';
@@ -20,6 +20,13 @@ import { HeatmapScale } from './HeatmapScale';
 import { RankOrderScale } from './RankOrderScale';
 import RatingScale from './RatingScale';
 import { hintLabelStyle } from '@/lib/surveyUi/labelStyles';
+import {
+  mcqCheckboxControlStyle,
+  mcqOptionCardStyle,
+  mcqRadioInnerStyle,
+  mcqRadioOuterStyle,
+  focusRingVar,
+} from '@/lib/surveyUi/selectionStyles';
 
 type QuestionProps = {
   question: SurveyQuestion;
@@ -114,6 +121,7 @@ export default function Question({
         boxShadow: 'var(--cfm-card-shadow, 0 1px 3px rgba(0,0,0,0.1))',
         borderRadius: 'var(--cfm-border-radius, 12px)',
         fontFamily: 'var(--cfm-font-family)',
+        marginBottom: 'var(--cfm-card-gap, 32px)',
       }}
     >
       <h2
@@ -142,15 +150,19 @@ export default function Question({
       {question.type === QUESTION_TYPE.NPS_SCALE && (
         <div className="space-y-3">
           {(question.minLabel || question.midLabel || question.maxLabel) && (
-            <div className="relative w-full h-6 text-xs font-semibold" style={hintLabelStyle()}>
+            <div className="relative w-full min-h-[24px] text-xs font-semibold">
               <span
                 className="absolute left-0 top-0 max-w-[30%] text-left leading-tight"
+                style={{ ...hintLabelStyle(), padding: '2px 6px', borderRadius: '4px' }}
                 dangerouslySetInnerHTML={{ __html: question.minLabel ?? '' }}
               />
               {question.midLabel && (
                 <span
                   className="absolute top-0 -translate-x-1/2 text-center max-w-[40%] leading-tight"
                   style={{
+                    ...hintLabelStyle(),
+                    padding: '2px 6px',
+                    borderRadius: '4px',
                     left: `${question.midLabelIndex !== undefined && question.options.length > 1
                       ? (question.midLabelIndex / (question.options.length - 1)) * 100
                       : 50}%`,
@@ -160,6 +172,7 @@ export default function Question({
               )}
               <span
                 className="absolute right-0 top-0 max-w-[30%] text-right leading-tight"
+                style={{ ...hintLabelStyle(), padding: '2px 6px', borderRadius: '4px' }}
                 dangerouslySetInnerHTML={{ __html: question.maxLabel ?? '' }}
               />
             </div>
@@ -205,14 +218,8 @@ export default function Question({
                 return (
                   <label
                     key={option.id}
-                    className="flex cursor-pointer items-center gap-4 transition-all"
-                    style={{
-                      borderRadius: 'var(--cfm-mcq-border-radius, 8px)',
-                      border: `2px solid ${isSelected ? 'var(--cfm-mcq-selected-accent, var(--cfm-primary))' : 'var(--cfm-card-border-color, #e5e7eb)'}`,
-                      background: isSelected ? 'var(--cfm-mcq-selected-bg, var(--cfm-secondary))' : 'var(--cfm-card-bg, #fff)',
-                      padding: 'var(--cfm-mcq-card-padding, 12px)',
-                      marginBottom: 'var(--cfm-mcq-option-gap, 8px)',
-                    }}
+                    className="cfm-mcq-option flex cursor-pointer items-center gap-4 transition-all hover:bg-gray-50/50"
+                    style={mcqOptionCardStyle(isSelected)}
                   >
                     <input
                       type="checkbox"
@@ -221,6 +228,13 @@ export default function Question({
                       onChange={() => handleToggle(option.id)}
                       className="sr-only"
                     />
+                    <div style={mcqCheckboxControlStyle(isSelected)}>
+                      {isSelected && (
+                        <svg className="h-3 w-3 text-white" viewBox="0 0 12 12" fill="none" aria-hidden="true">
+                          <path d="M2 6l3 3 5-5" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
+                        </svg>
+                      )}
+                    </div>
                     <span
                       className="text-[15px] font-medium text-gray-900 leading-tight"
                       dangerouslySetInnerHTML={{ __html: option.optionLabel }}
@@ -241,14 +255,8 @@ export default function Question({
               return (
                 <label
                   key={option.id}
-                  className="flex cursor-pointer items-center gap-4 transition-all"
-                  style={{
-                    borderRadius: 'var(--cfm-mcq-border-radius, 8px)',
-                    border: `2px solid ${isSelected ? 'var(--cfm-mcq-selected-accent, var(--cfm-primary))' : 'var(--cfm-card-border-color, #e5e7eb)'}`,
-                    background: isSelected ? 'var(--cfm-mcq-selected-bg, var(--cfm-secondary))' : 'var(--cfm-card-bg, #fff)',
-                    padding: 'var(--cfm-mcq-card-padding, 12px)',
-                    marginBottom: 'var(--cfm-mcq-option-gap, 8px)',
-                  }}
+                  className="cfm-mcq-option flex cursor-pointer items-center gap-4 transition-all hover:bg-gray-50/50"
+                  style={mcqOptionCardStyle(isSelected)}
                 >
                   <input
                     type="radio"
@@ -257,6 +265,9 @@ export default function Question({
                     onChange={() => onSelect(option.id)}
                     className="sr-only"
                   />
+                  <div style={mcqRadioOuterStyle(isSelected)}>
+                    {isSelected && <div style={mcqRadioInnerStyle()} />}
+                  </div>
                   <span
                     className="text-[15px] font-medium text-gray-900 leading-tight"
                     dangerouslySetInnerHTML={{ __html: option.optionLabel }}
@@ -271,31 +282,48 @@ export default function Question({
       {question.type === QUESTION_TYPE.RANK_ORDER && rankOrderQuestion && (
         <RankOrderScale
           question={rankOrderQuestion}
-          selectedValue={
-            typeof selectedValue === 'object' && selectedValue !== null && !Array.isArray(selectedValue)
-              ? selectedValue
-              : undefined
-          }
+          selectedValue={normalizeRankOrderAnswers(selectedValue)}
           onSelect={onSelect}
         />
       )}
 
       {question.type === QUESTION_TYPE.TEXTFIELD && (
-        <textarea
-          data-cfm-textfield
-          rows={question.inputVariant === 'long' ? 4 : 1}
-          value={(selectedValue as string) ?? ''}
-          onChange={e => onSelect(e.target.value)}
-          placeholder={question.placeholder || 'Type your response here...'}
-          className="w-full outline-none"
-          style={{
-            height: question.inputVariant === 'long' ? undefined : 'var(--cfm-input-height, 44px)',
-            borderRadius: 'var(--cfm-input-radius, 8px)',
-            border: '1px solid var(--cfm-input-border, #d1d5db)',
-            padding: 'var(--cfm-input-padding, 12px)',
-            color: 'var(--cfm-text)',
-          }}
-        />
+        <div className="space-y-1.5">
+          <textarea
+            data-cfm-textfield
+            rows={question.inputVariant === 'long' ? 4 : 1}
+            value={(selectedValue as string) ?? ''}
+            onChange={e => onSelect(e.target.value)}
+            placeholder={question.placeholder || 'Type your response here...'}
+            className="w-full text-sm outline-none transition-colors"
+            style={{
+              height: question.inputVariant === 'long' ? undefined : 'var(--cfm-input-height, 44px)',
+              borderRadius: 'var(--cfm-input-radius, 4px)',
+              border: '1px solid var(--cfm-input-border, #d1d5db)',
+              padding: 'var(--cfm-input-padding, 16px)',
+              color: 'var(--cfm-text)',
+            }}
+            onFocus={e => {
+              e.currentTarget.style.borderColor = focusRingVar;
+              e.currentTarget.style.boxShadow = `0 0 0 1px ${focusRingVar}`;
+            }}
+            onBlur={e => {
+              e.currentTarget.style.borderColor = 'var(--cfm-input-border, #d1d5db)';
+              e.currentTarget.style.boxShadow = 'none';
+            }}
+          />
+          <div
+            className="text-right text-xs pr-1"
+            style={{ color: 'var(--cfm-input-placeholder, #6b7280)' }}
+          >
+            {Math.max(
+              0,
+              (question.maxCharacterCount ?? 1000) -
+                (typeof selectedValue === 'string' ? selectedValue.length : 0)
+            )}{' '}
+            characters remaining
+          </div>
+        </div>
       )}
 
       {question.type === QUESTION_TYPE.CFM_MATRIX && (
@@ -336,21 +364,64 @@ export default function Question({
       )}
 
       {question.type === QUESTION_TYPE.TEXT_AND_MEDIA && question.media?.url && (
-        <div className={`mt-4 flex w-full ${question.media.alignment?.includes('CENTER') ? 'justify-center' : question.media.alignment?.includes('RIGHT') ? 'justify-end' : 'justify-start'}`}>
-          <div style={{ width: question.media.size ? `${question.media.size}%` : '100%' }}>
+        <div
+          className={`mt-4 flex w-full ${
+            question.media.alignment === 'TOP_CENTER' || question.media.alignment === 'BOTTOM_CENTER'
+              ? 'justify-center'
+              : question.media.alignment === 'TOP_RIGHT' || question.media.alignment === 'BOTTOM_RIGHT'
+                ? 'justify-end'
+                : 'justify-start'
+          }`}
+        >
+          <div
+            style={{
+              width: question.media.size
+                ? `${question.media.size}%`
+                : 'var(--cfm-media-max-width, 100%)',
+              maxWidth: 'var(--cfm-media-max-width, 100%)',
+            }}
+            className="flex flex-col gap-2"
+          >
             {question.media.mimeType?.startsWith('video/') || question.media.mimeType === 'VIDEO' ? (
-              <video controls src={question.media.url} className="max-w-full rounded-md" />
+              <video
+                controls
+                src={question.media.url}
+                className="max-w-full shadow-sm"
+                style={{ borderRadius: 'var(--cfm-media-radius, 8px)' }}
+              />
             ) : (
-              <img src={question.media.url} alt={question.media.title || ''} className="max-w-full rounded-md" />
+              <img
+                src={question.media.url}
+                alt={question.media.title || ''}
+                className="max-w-full shadow-sm"
+                style={{ borderRadius: 'var(--cfm-media-radius, 8px)' }}
+              />
+            )}
+            {question.media.title && (
+              <p
+                className="text-center"
+                style={{
+                  color: 'var(--cfm-media-caption-color, #6b7280)',
+                  fontSize: 'var(--cfm-media-caption-size, 14px)',
+                }}
+              >
+                {question.media.title}
+              </p>
             )}
-            {question.media.title && <p className="text-sm text-gray-500 text-center mt-2">{question.media.title}</p>}
           </div>
         </div>
       )}
 
       {validationError && (
-        <div className="mt-4 rounded border border-gray-800 bg-gray-200 py-3 px-4">
-          <p className="text-sm font-bold text-gray-900">{validationError}</p>
+        <div
+          className="mt-4 rounded py-3.5 px-4 text-left"
+          style={{
+            border: '1px solid var(--cfm-validation-border, #333333)',
+            backgroundColor: 'var(--cfm-validation-bg, #d9d9d9)',
+            borderRadius: 'var(--cfm-input-radius, 4px)',
+          }}
+        >
+          <p className="text-[13px] sm:text-sm font-bold text-gray-900 leading-tight">{validationError}</p>
         </div>
       )}
     </section>

package/templates/docs/templates/RankOrderScale.tsx

@@ -37,6 +37,7 @@ import {
   getOrderedOptionIdsFromRanks,
   normalizeRankOrderAnswers,
 } from '@explorer02/cfm-survey-sdk';
+import { focusRingVar } from '@/lib/surveyUi/selectionStyles';
 
 type RankOrderScaleProps = {
   question: RankOrderQuestion;
@@ -120,15 +121,29 @@ function RankOrderOptionRow({
 }: RankOrderOptionRowProps) {
   return (
     <div
-      className="flex items-center gap-3 rounded-lg border border-[#e5e5e5] px-4 py-3 transition-colors"
-      style={{ backgroundColor: 'var(--cfm-rank-item-bg, #fff)', padding: 'var(--cfm-rank-item-padding, 12px 16px)', marginBottom: 'var(--cfm-rank-item-gap, 12px)' }}
+      className="flex items-center gap-3 rounded-lg border border-[#e5e5e5] transition-colors"
+      style={{
+        backgroundColor: 'var(--cfm-rank-item-bg, #fff)',
+        padding: 'var(--cfm-rank-item-padding, 12px 16px)',
+        marginBottom: 'var(--cfm-rank-item-gap, 12px)',
+      }}
+      onMouseEnter={(e) => {
+        e.currentTarget.style.backgroundColor =
+          'var(--cfm-rank-dropdown-hover-bg, var(--cfm-rank-item-bg, #f9fafb))';
+      }}
+      onMouseLeave={(e) => {
+        e.currentTarget.style.backgroundColor = 'var(--cfm-rank-item-bg, #fff)';
+      }}
     >
       {rankSelect}
       {dragHandle}
       {rankBadge !== undefined && (
         <span
-          className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-sm font-semibold text-white"
-          style={{ backgroundColor: 'var(--cfm-rank-badge, var(--cfm-primary))' }}
+          className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-sm font-semibold"
+          style={{
+            backgroundColor: 'var(--cfm-rank-badge-bg, var(--cfm-mcq-selected-bg, #fdf2f8))',
+            color: 'var(--cfm-rank-badge-text, var(--cfm-mcq-selected-accent, var(--cfm-primary, #e20074)))',
+          }}
         >
           {rankBadge}
         </span>
@@ -169,6 +184,14 @@ function DropdownRankLayout({
                 onChange={event => handleRankChange(option.id, event.target.value)}
                 className="h-10 w-16 shrink-0 rounded border bg-white px-2 text-sm outline-none"
                 style={{ borderColor: 'var(--cfm-rank-select-border, #d1d5db)' }}
+                onFocus={e => {
+                  e.currentTarget.style.borderColor = focusRingVar;
+                  e.currentTarget.style.boxShadow = `0 0 0 1px ${focusRingVar}`;
+                }}
+                onBlur={e => {
+                  e.currentTarget.style.borderColor = 'var(--cfm-rank-select-border, #d1d5db)';
+                  e.currentTarget.style.boxShadow = 'none';
+                }}
               >
                 <option value="">-</option>
                 {rankChoices.map(rank => (
@@ -225,7 +248,8 @@ function SortableRankItem({
           <button
             type="button"
             aria-label={`Drag to reorder ${option.optionLabel || option.id}`}
-            className="flex h-10 w-8 shrink-0 cursor-grab items-center justify-center rounded text-gray-500 hover:bg-gray-100 active:cursor-grabbing"
+            className="flex h-10 w-8 shrink-0 cursor-grab items-center justify-center rounded active:cursor-grabbing"
+            style={{ color: 'var(--cfm-rank-handle, #9ca3af)' }}
             {...attributes}
             {...listeners}
           >

package/templates/docs/templates/RatingScale.tsx

@@ -20,7 +20,7 @@ type RatingScaleProps = {
   selectedValue?: AnswerValue;
   onSelect: (value: AnswerValue) => void;
   variant?: 'nps' | 'star';
-  buttonStyle?: 'standard' | 'numbered' | 'emoji';
+  buttonStyle?: 'standard' | 'numbered' | 'emoji' | 'pill';
 };
 
 function resolveBadgeColor(index: number, value: number): string {
@@ -68,6 +68,7 @@ export default function RatingScale({
     gap: 'var(--cfm-nps-cell-gap, 2px)',
   };
   const showNumberBadges = buttonStyle !== 'standard';
+  const usePillCells = buttonStyle === 'pill';
 
   if (buttonStyle === 'emoji') {
     return (
@@ -92,7 +93,7 @@ export default function RatingScale({
                   style={{
                     ...scaleRadioRingStyle(isSelected, {
                       pill: false,
-                      size: 'var(--cfm-csat-emoji-size, 48px)',
+                      size: 'var(--cfm-csat-emoji-size, 40px)',
                     }),
                     fontSize: 'var(--cfm-csat-emoji-size, 24px)',
                   }}
@@ -111,7 +112,7 @@ export default function RatingScale({
     <div role="radiogroup" className="w-full overflow-x-auto" data-cfm-nps-area>
       {showNumberBadges && (
         <div className="mb-3 min-w-0" style={gridStyle}>
-          {resolvedOptions.map((option) => {
+          {resolvedOptions.map((option, index) => {
             const isSelected = isScaleAnswerSelected(selectedValue, option.value);
             return (
               <div key={`${questionId}-badge-${option.value}`} className="flex justify-center">
@@ -124,6 +125,7 @@ export default function RatingScale({
                       ? scaleCellSelectedStyle(true)
                       : { backgroundColor: option.color }),
                   }}
+                  data-cfm-number-badge={index}
                   title={option.label}
                 >
                   {option.label}
@@ -158,9 +160,10 @@ export default function RatingScale({
                   className="flex items-center justify-center rounded-full border-2 transition-all"
                   style={scaleRadioRingStyle(isSelected, {
                     size: 'var(--cfm-nps-cell-size, 40px)',
+                    pill: usePillCells,
                   })}
                 >
-                  <div style={scaleRadioDotStyle(isSelected)} />
+                  <div style={scaleRadioDotStyle(isSelected, { pill: usePillCells })} />
                 </div>
               </label>
             );

package/templates/docs/templates/SliderMatrixScale.tsx

@@ -9,6 +9,10 @@ import React from 'react';
 import type { SliderMatrixQuestion, MatrixRowAnswers } from '@explorer02/cfm-survey-sdk';
 import { tickColorFromIndex } from './surveyUiScaleUtils';
 import { CustomSliderTrack } from './CustomSliderTrack';
+import { hintLabelStyle, sliderTickLabelStyle } from '@/lib/surveyUi/labelStyles';
+
+const MATRIX_ROW_LABEL_WIDTH = 'var(--cfm-matrix-row-width, 180px)';
+const SLIDER_ROW_BAND = 'var(--cfm-slider-row-band, var(--cfm-row-band, #f3f4f6))';
 
 type SliderMatrixScaleProps = {
   question: SliderMatrixQuestion;
@@ -67,26 +71,44 @@ export function SliderMatrixScale({ question, selectedValue = {}, onSelect }: Sl
         display: 'flex', width: '100%', marginBottom: '4px', alignItems: 'flex-end',
         padding: '0 16px', boxSizing: 'border-box',
       }}>
-        <div style={{ flex: '0 0 25%', paddingRight: '16px' }} />
+        <div style={{ flex: `0 0 ${MATRIX_ROW_LABEL_WIDTH}`, paddingRight: '16px' }} />
 
         <div style={{ flex: '1', position: 'relative' }}>
           {labels && labels.length > 0 && (
-            <div style={{
-              position: 'relative', display: 'flex', justifyContent: 'space-between',
-              margin: '0 16px', marginBottom: '16px', color: '#111827', fontSize: '14px', fontWeight: 500,
-            }}>
+            <div
+              style={{
+                position: 'relative',
+                display: 'flex',
+                justifyContent: 'space-between',
+                margin: '0 16px',
+                marginBottom: '16px',
+                fontSize: '14px',
+                fontWeight: 500,
+              }}
+            >
               {labels.map((lbl, idx) => (
                 <div key={idx} style={{ width: 0, display: 'flex', justifyContent: 'center' }}>
-                  <span style={{ whiteSpace: 'nowrap' }}>{lbl}</span>
+                  <span
+                    style={{ ...hintLabelStyle(), padding: '2px 8px', borderRadius: '4px', whiteSpace: 'nowrap' }}
+                  >
+                    {lbl}
+                  </span>
                 </div>
               ))}
             </div>
           )}
 
-          <div style={{
-            position: 'relative', margin: '0 16px', marginBottom: '8px',
-            color: '#4b5563', fontSize: '14px', fontWeight: 400, height: '28px',
-          }}>
+          <div
+            style={{
+              position: 'relative',
+              margin: '0 16px',
+              marginBottom: '8px',
+              fontSize: '14px',
+              fontWeight: 400,
+              height: '28px',
+              ...sliderTickLabelStyle(),
+            }}
+          >
             {tickValues.length > 0 ? (
               tickValues.map((tv, idx) => {
                 const percentage = max !== min ? ((tv.value - min) / (max - min)) * 100 : 0;
@@ -101,11 +123,20 @@ export function SliderMatrixScale({ question, selectedValue = {}, onSelect }: Sl
                         {tv.label}
                       </div>
                     ) : (
-                      <div style={{
-                        backgroundColor: tv.color, color: 'white', padding: '4px 8px', borderRadius: '4px',
-                        fontWeight: 600, wordBreak: 'break-word', textAlign: 'center', lineHeight: '1.2',
-                        boxShadow: '0 1px 2px rgba(0,0,0,0.1)',
-                      }}>
+                      <div
+                        style={{
+                          backgroundColor: tv.color,
+                          color: 'white',
+                          padding: '4px 8px',
+                          borderRadius: '4px',
+                          fontWeight: 600,
+                          wordBreak: 'break-word',
+                          textAlign: 'center',
+                          lineHeight: '1.2',
+                          boxShadow: '0 1px 2px rgba(0,0,0,0.1)',
+                          minWidth: 'var(--cfm-slider-tick-size, 28px)',
+                        }}
+                      >
                         {tv.label}
                       </div>
                     )}
@@ -151,9 +182,10 @@ export function SliderMatrixScale({ question, selectedValue = {}, onSelect }: Sl
         return (
           <div key={row.id} style={{
             display: 'flex', width: '100%', alignItems: 'center',
-            backgroundColor: '#f3f4f6', borderRadius: '12px', padding: '16px', boxSizing: 'border-box',
+            backgroundColor: SLIDER_ROW_BAND, borderRadius: '12px', padding: '16px', boxSizing: 'border-box',
+            borderBottom: '1px solid var(--cfm-card-border-color, #e5e7eb)',
           }}>
-            <div style={{ flex: '0 0 25%', paddingRight: '16px', fontSize: '15px', color: '#111827', wordWrap: 'break-word', display: 'flex', alignItems: 'center' }}>
+            <div style={{ flex: `0 0 ${MATRIX_ROW_LABEL_WIDTH}`, paddingRight: '16px', fontSize: '15px', color: '#111827', wordWrap: 'break-word', display: 'flex', alignItems: 'center' }}>
               {row.statementText !== 'Question' && row.statementText !== '' ? (
                 <span dangerouslySetInnerHTML={{ __html: row.statementText }} />
               ) : null}