Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Advanced Custom Styling #2182

Merged
merged 139 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
ed2253d
feat: styling zod schema and data migration
pandeymangg Feb 28, 2024
1f884a4
feat: styling zod schema and data migration
pandeymangg Feb 28, 2024
73f1d09
Merge branch 'main' into feat/form-styling
pandeymangg Feb 28, 2024
2c13121
fix: data migration and product types
pandeymangg Feb 28, 2024
38c6cb0
fix: styling object
pandeymangg Feb 28, 2024
08ccb95
fix: styling object
pandeymangg Feb 28, 2024
b84e322
Merge branch 'main' into feat/form-styling
pandeymangg Feb 29, 2024
71bdb50
fix: schema
pandeymangg Feb 29, 2024
a9d8239
UI
pandeymangg Feb 29, 2024
d7fc799
wip
pandeymangg Feb 29, 2024
d5b1831
feat: product settings page styling UI and service
pandeymangg Mar 4, 2024
77408bf
Merge branch 'main' of https://github.com/formbricks/formbricks into …
pandeymangg Mar 4, 2024
2586a3b
feat: surveys package styling changes
pandeymangg Mar 4, 2024
7a1af85
fix: product settings
pandeymangg Mar 4, 2024
84b0941
wip
pandeymangg Mar 5, 2024
d1eb48c
fix: default values
pandeymangg Mar 5, 2024
5c63927
fix: UI
pandeymangg Mar 5, 2024
5a0bea0
styling tab
pandeymangg Mar 6, 2024
8decd1c
Merge branch 'main' into feat/form-styling
pandeymangg Mar 6, 2024
bcc5dd5
fix: survey editor
pandeymangg Mar 6, 2024
4504fb3
feat: survey editor
pandeymangg Mar 7, 2024
ac0ff52
fix: constant names and suchj
pandeymangg Mar 7, 2024
a4c4b73
fix: survey editor styling
pandeymangg Mar 7, 2024
6e38536
fix: build
pandeymangg Mar 7, 2024
02bde34
fix: UI
pandeymangg Mar 7, 2024
a291796
Merge branch 'main' into feat/form-styling
jobenjada Mar 7, 2024
3ab12c2
fix: icon
pandeymangg Mar 7, 2024
2c7aea6
Merge branch 'feat/form-styling' of https://github.com/formbricks/for…
pandeymangg Mar 7, 2024
8d6a985
fix: migration
pandeymangg Mar 7, 2024
98c7f11
Merge branch 'main' into feat/form-styling
jobenjada Mar 7, 2024
6c1b366
tweaks
jobenjada Mar 7, 2024
0754098
Merge branch 'feat/form-styling' of github.com:formbricks/formbricks …
jobenjada Mar 7, 2024
08de3ca
fix: address feedback UI
pandeymangg Mar 8, 2024
bb45db3
Merge branch 'main' into feat/form-styling
pandeymangg Mar 8, 2024
7738b7e
fix: schema and migration
pandeymangg Mar 8, 2024
e923b19
fix: maximum roundness
pandeymangg Mar 8, 2024
fc3f6c9
fix: schema and migration script
pandeymangg Mar 8, 2024
5bb25ef
fix: address feedback
pandeymangg Mar 8, 2024
4747f6a
fix: UI
pandeymangg Mar 8, 2024
6767da0
fix: UI
pandeymangg Mar 8, 2024
d9a6fcf
feat: migration script for product overwrites
pandeymangg Mar 11, 2024
85d4611
Merge branch 'main' into feat/form-styling
pandeymangg Mar 11, 2024
b1137f3
fix: migration
pandeymangg Mar 11, 2024
0c44183
fix: migration
pandeymangg Mar 11, 2024
87d125e
wip
pandeymangg Mar 11, 2024
ca9459d
fix: data migration script
pandeymangg Mar 11, 2024
423a616
fix: reset styles
pandeymangg Mar 11, 2024
7762ce5
Merge branch 'main' into feat/form-styling
pandeymangg Mar 11, 2024
d295007
fix: color
pandeymangg Mar 11, 2024
c53d1d3
tweak hover color
jobenjada Mar 11, 2024
7cca51c
Merge branch 'feat/form-styling' of github.com:formbricks/formbricks …
jobenjada Mar 11, 2024
c423e28
remove black default
jobenjada Mar 11, 2024
37cc097
feedback
pandeymangg Mar 12, 2024
709cfee
schema
pandeymangg Mar 12, 2024
9c58610
Merge branch 'main' into feat/form-styling
pandeymangg Mar 12, 2024
5c879ca
schema and data migration
pandeymangg Mar 12, 2024
79f535d
UI changes
pandeymangg Mar 12, 2024
399c338
Merge branch 'feat/form-styling' of https://github.com/formbricks/for…
pandeymangg Mar 12, 2024
353bf77
card border and suggest colors in both styling settings
pandeymangg Mar 12, 2024
f442f1c
fix: media bg
pandeymangg Mar 12, 2024
55ec101
merge
pandeymangg Mar 12, 2024
627bd3d
fix: legal footer
pandeymangg Mar 13, 2024
fe54eca
chore: merge with main
pandeymangg Mar 13, 2024
d87966c
fix: placeholder text color
pandeymangg Mar 13, 2024
1862835
fix: fixes
pandeymangg Mar 13, 2024
1182167
Merge branch 'main' into feat/form-styling
jobenjada Mar 13, 2024
99ddc19
update icons, set background color and tweak suggested colors
jobenjada Mar 13, 2024
c9314f5
Merge branch 'main' into feat/form-styling
jobenjada Mar 13, 2024
d31de98
fix: UI changes
pandeymangg Mar 13, 2024
fe2271f
fix: UI changes
pandeymangg Mar 14, 2024
9ff601c
fix: NPS question hover and active states
pandeymangg Mar 14, 2024
52303a3
styles fix
pandeymangg Mar 14, 2024
3abbab1
tweaks
jobenjada Mar 14, 2024
71455bc
finish tweaking date picker colors
jobenjada Mar 14, 2024
cd0aa04
feat: shadow picker
pandeymangg Mar 14, 2024
156cdb9
Merge branch 'feat/form-styling' of https://github.com/formbricks/for…
pandeymangg Mar 14, 2024
2319d38
fix: survey save
pandeymangg Mar 14, 2024
400aad7
tweaks
jobenjada Mar 14, 2024
10375ea
suggest button improvements
mattinannt Mar 14, 2024
fb0077b
fix: adds loading to unified styling component
pandeymangg Mar 15, 2024
eb94050
chore: merge with main
pandeymangg Mar 15, 2024
8817d03
fix Card border color not saving
mattinannt Mar 15, 2024
e66b229
Merge branch 'feat/form-styling' of github.com:formbricks/formbricks …
mattinannt Mar 15, 2024
b8e4402
fix background card also showing when unified styling not overwritten
mattinannt Mar 15, 2024
85158fe
Merge branch 'main' of github.com:formbricks/formbricks into feat/for…
mattinannt Mar 16, 2024
b97a1ad
fix: move everything to base styling schema and reuse the components
pandeymangg Mar 18, 2024
2b69017
fix: survey editor styling settings
pandeymangg Mar 18, 2024
ada224a
fix: backwards compatibility
pandeymangg Mar 18, 2024
ab5939f
Merge branch 'main' into feat/form-styling
pandeymangg Mar 19, 2024
0b31b74
fixes
pandeymangg Mar 19, 2024
f3fbace
fix: backwards compatibility
pandeymangg Mar 19, 2024
e59c511
Merge branch 'main' into feat/form-styling
pandeymangg Mar 19, 2024
c51f9cd
Merge branch 'main' into feat/form-styling
pandeymangg Mar 19, 2024
18b7657
fix: card border color card
pandeymangg Mar 19, 2024
4694894
Merge branch 'main' into feat/form-styling
mattinannt Mar 19, 2024
3fc4f7b
move migration to the end; add v1.7 migration script
mattinannt Mar 19, 2024
2ae6c6e
increase package-version numbers of js and surveys package
mattinannt Mar 19, 2024
c24870d
fix product settings
mattinannt Mar 19, 2024
857378f
fix modal roundness
mattinannt Mar 19, 2024
bf090a5
smaller fixes
mattinannt Mar 19, 2024
b5adcd8
add custom data migration timeout
mattinannt Mar 19, 2024
125282f
fix overwriteUnifiedStyling toggle in modified surveys
mattinannt Mar 19, 2024
d1113ce
update wording
mattinannt Mar 19, 2024
80adddb
Merge branch 'feat/form-styling' of https://github.com/formbricks/for…
pandeymangg Mar 20, 2024
246e8ec
refactor: advanced styling
pandeymangg Mar 20, 2024
89bf963
fix: card border
pandeymangg Mar 20, 2024
bc91207
modal fix
pandeymangg Mar 20, 2024
a2b0baa
fix: migration script
pandeymangg Mar 20, 2024
c418bed
fix: migration script
pandeymangg Mar 20, 2024
ea79b86
migration wip
pandeymangg Mar 21, 2024
2ab7efd
migration wip
pandeymangg Mar 21, 2024
820b6f9
migration wip
pandeymangg Mar 21, 2024
0bac2d0
fixes
pandeymangg Mar 21, 2024
12254e3
chore: merge with main
pandeymangg Mar 21, 2024
cb77709
fix: render
pandeymangg Mar 21, 2024
38b822d
Merge branch 'main' into feat/form-styling
pandeymangg Mar 21, 2024
45c08bd
fix: render
pandeymangg Mar 21, 2024
ea8798d
fix: data migration script
pandeymangg Mar 21, 2024
3d3066a
tweaks
jobenjada Mar 21, 2024
7849594
Merge branch 'feat/form-styling' of github.com:formbricks/formbricks …
jobenjada Mar 21, 2024
df336b2
update wording
jobenjada Mar 21, 2024
c4ca434
wording
jobenjada Mar 21, 2024
02990fd
fixes
pandeymangg Mar 21, 2024
85c0b59
fix: styling fixes
pandeymangg Mar 21, 2024
edd53f7
Merge branch 'feat/form-styling' of https://github.com/formbricks/for…
pandeymangg Mar 21, 2024
fb18d8f
resolve merge conflicts
mattinannt Mar 21, 2024
1415cb4
remove card border color disabled state
mattinannt Mar 21, 2024
ec2a5e4
fix open text question input color
mattinannt Mar 21, 2024
40ab0f4
fix local styling acc
mattinannt Mar 21, 2024
5b64747
show fields based on survey type
mattinannt Mar 21, 2024
d638ff3
fix self-made surveyType condition issue
mattinannt Mar 21, 2024
e9401be
rename unified styling to theme styling in code
mattinannt Mar 21, 2024
daf7b93
fix: brigtness
pandeymangg Mar 21, 2024
3712f3c
Merge branch 'feat/form-styling' of https://github.com/formbricks/for…
pandeymangg Mar 21, 2024
4288bb7
fix: placement
pandeymangg Mar 22, 2024
dc36c79
fixes
pandeymangg Mar 22, 2024
b411c91
fix: brightness slider
pandeymangg Mar 22, 2024
4badc1f
fix: brightness slider
pandeymangg Mar 22, 2024
b1d621b
fix: confirm modal for reset
pandeymangg Mar 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/demo/pages/app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function AppPage({}) {
{process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID}
</strong>
<span className="relative ml-2 flex h-3 w-3">
<span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
<span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500 opacity-75"></span>
<span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/formbricks-com/components/shared/APILayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function APILayout({ method, url, description, headers, bodies, responses
className={clsx(
"mr-3 inline rounded-full p-1 px-3 font-semibold text-white",
method === "POST" && "bg-red-400 dark:bg-red-800",
method === "GET" && "bg-green-400 dark:bg-green-800"
method === "GET" && "bg-green-500 dark:bg-green-800"
)}>
{method}
</div>
Expand Down Expand Up @@ -174,7 +174,7 @@ function Response({ color, statusCode, description, example }: RespProps) {
<div
className={clsx(
"mr-3 inline h-3 w-3 rounded-full",
color === "green" && "bg-green-400",
color === "green" && "bg-green-500",
color === "brown" && "bg-amber-800"
)}>
&nbsp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@ export default function SettingsCard({
soon = false,
noPadding = false,
beta,
className,
}: {
title: string;
description: string;
children: any;
soon?: boolean;
noPadding?: boolean;
beta?: boolean;
className?: string;
}) {
return (
<div className="my-4 w-full bg-white shadow sm:rounded-lg">
<div className={cn("my-4 w-full max-w-4xl bg-white shadow sm:rounded-lg", className)}>
<div className="border-b border-slate-200 bg-slate-100 px-6 py-5">
<div className="flex">
<h3 className="text-lg font-medium leading-6 text-slate-900">{title}</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default async function SettingsLayout({ children, params }) {
isMultiLanguageAllowed={isMultiLanguageAllowed}
/>
<div className="w-full md:ml-64">
<div className="max-w-4xl px-20 pb-6 pt-14 md:pt-6">
<div className="max-w-7xl px-20 pb-6 pt-14 md:pt-6">
<div>{children}</div>
</div>
</div>
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading