Skip to content

Commit 99b2346

Browse files
committed
Merge branch 'feature/opinion-scale-question' of https://github.com/ditdot-dev/vue-flow-form into feature/opinion-scale-question
2 parents 65cdf22 + 42d2b73 commit 99b2346

File tree

2 files changed

+34
-17
lines changed

2 files changed

+34
-17
lines changed

src/assets/css/common.css

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ header.vff-header svg.f-logo {
561561
font-size: 2.4em;
562562
line-height: 1.34;
563563
padding-right: 1.8em;
564-
margin-bottom: 20px;
564+
margin-bottom: 21px;
565565
}
566566

567567
.vff h3,
@@ -591,6 +591,10 @@ header.vff-header svg.f-logo {
591591
font-size: .51em;
592592
}
593593

594+
.vff .fh2 span.f-label-scale {
595+
font-size: .42em;
596+
}
597+
594598
.vff span.f-tagline,
595599
.vff span.f-text {
596600
margin-bottom: 8px;
@@ -641,7 +645,7 @@ header.vff-header svg.f-logo {
641645
}
642646

643647
.vff ul.f-radios li {
644-
padding: .6em .68em;
648+
padding: .62em .68em;
645649
margin: .5em 0 .6em;
646650
font-weight: 300;
647651
line-height: 1.24;
@@ -694,7 +698,7 @@ header.vff-header svg.f-logo {
694698
*/
695699

696700
.vff .field-multiplepicturechoice ul.f-radios {
697-
max-width: 750px;
701+
max-width: 760px;
698702
min-width: auto;
699703
display: -ms-flexbox;
700704
display: flex;
@@ -746,7 +750,7 @@ header.vff-header svg.f-logo {
746750
*/
747751

748752
.vff .field-opinionscale ul.f-radios {
749-
max-width: 750px;
753+
max-width: 760px;
750754
min-width: auto;
751755
display: -ms-flexbox;
752756
display: -webkit-box;
@@ -773,13 +777,13 @@ header.vff-header svg.f-logo {
773777
-ms-flex-align: center;
774778
-webkit-box-orient: vertical;
775779
-webkit-box-direction: normal;
776-
padding: 8px 8px 10px;
780+
padding: 9px 8px 8px;
777781
margin-right: 8px;
778782
-ms-flex: 1 0 calc(10% - 8px);
779783
flex: 1 0 calc(10% - 8px);
780784
font-size: 15px;
781785
line-height: 1.38;
782-
min-height: 64px;
786+
min-height: 56px;
783787
}
784788

785789
.vff .field-opinionscale ul.f-radios li .f-label-wrap {
@@ -794,9 +798,9 @@ header.vff-header svg.f-logo {
794798
display: -ms-flexbox;
795799
display: flex;
796800
justify-content: space-between;
797-
max-width: 750px;
801+
max-width: 760px;
798802
min-width: auto;
799-
margin: 8px -8px 0 0;
803+
margin: 2px -8px .6em 0;
800804
}
801805

802806
.vff .f-label-scale {
@@ -814,7 +818,7 @@ header.vff-header svg.f-logo {
814818
*/
815819

816820
.vff .field-iconrate ul.f-radios {
817-
max-width: 750px;
821+
max-width: 760px;
818822
min-width: auto;
819823
display: -ms-flexbox;
820824
display: -webkit-box;
@@ -828,7 +832,7 @@ header.vff-header svg.f-logo {
828832
}
829833

830834
.vff .field-iconrate ul.f-radios li {
831-
max-width: 64px;
835+
max-width: 60px;
832836
height: 100%;
833837
flex: 1 0 0%;
834838
display: -ms-flexbox;
@@ -841,7 +845,8 @@ header.vff-header svg.f-logo {
841845
outline: none;
842846
border: none;
843847
position: relative;
844-
padding: 0 8px 0 0;
848+
margin-top: 0;
849+
padding: 0 10px 0 0;
845850
}
846851

847852
.vff .field-iconrate ul.f-radios li .f-icon-wrap {
@@ -858,11 +863,11 @@ header.vff-header svg.f-logo {
858863
align-self: stretch;
859864
}
860865

861-
.vff .field-iconrate ul.f-radios li .f-icon-wrap svg{
866+
.vff .field-iconrate ul.f-radios li .f-icon-wrap svg {
862867
height: 100%;
863868
width: 100%;
864-
max-height: 64px;
865-
max-width: 64px;
869+
max-height: 60px;
870+
max-width: 60px;
866871
fill: transparent;
867872
stroke: var(--vff-secondary-text-color);
868873
}
@@ -881,7 +886,7 @@ header.vff-header svg.f-logo {
881886
.vff .field-iconrate ul.f-radios li.f-selected .f-icon-wrap svg,
882887
.vff .field-iconrate ul.f-radios li.f-previous .f-icon-wrap svg,
883888
.vff .field-iconrate ul.f-radios li:active .f-icon-wrap svg {
884-
fill: var(--vff-main-text-color);
889+
fill: var(--vff-tertiary-text-color);
885890
stroke: var(--vff-main-text-color);
886891
}
887892

@@ -1308,6 +1313,10 @@ header.vff-header svg.f-logo {
13081313
font-size: .64em;
13091314
}
13101315

1316+
.vff .fh2 span.f-label-scale {
1317+
margin-bottom: .3em;
1318+
}
1319+
13111320
.vff span.f-tagline {
13121321
line-height: 1.5;
13131322
}
@@ -1337,7 +1346,7 @@ header.vff-header svg.f-logo {
13371346
.vff .field-multiplepicturechoice ul.f-radios,
13381347
.vff .field-opinionscale ul.f-radios,
13391348
.vff .f-label-scale-wrap {
1340-
max-width: 320px;
1349+
max-width: 330px;
13411350
}
13421351

13431352
.vff .field-multiplepicturechoice ul.f-radios li {

src/assets/css/themes/theme-purple.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ header.vff-header svg.f-logo {
130130

131131
.vff ul.f-radios li.f-selected,
132132
.vff ul.f-radios li:active {
133-
border-color: var(--vff-main-form-bg-color);
133+
border-color: var(--vff-secondary-form-bg-color);
134134
background-color: var(--vff-secondary-form-bg-color);
135135
color: var(--vff-tertiary-text-color);
136136
}
@@ -143,6 +143,14 @@ header.vff-header svg.f-logo {
143143
color: var(--vff-field-key-color);
144144
}
145145

146+
/* field-rate */
147+
.vff .field-iconrate ul.f-radios li.f-selected .f-icon-wrap svg,
148+
.vff .field-iconrate ul.f-radios li.f-previous .f-icon-wrap svg,
149+
.vff .field-iconrate ul.f-radios li:active .f-icon-wrap svg {
150+
stroke: var(--vff-secondary-form-bg-color);
151+
fill: var(--vff-secondary-form-bg-color);
152+
}
153+
146154
/* field-dropdown */
147155
.vff span.f-empty {
148156
color: var(--vff-secondary-text-color);

0 commit comments

Comments
 (0)