Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-13 16:21:57 -05:00
Code Issues Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2021-12-28 13:48:16 +01:00
commit c69d7f50a3
3 changed files with 67 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/resources/error-report.tmpl
View file

@ -144,15 +144,9 @@
</div>
{% endif %}
{% if explain %}
<div>(<a href="#explain">go to explain</a>)</div>
{% endif %}
{% if data %}
<div>(<a href="#edata">go to edata</a>)</div>
{% endif %}
{% if error %}
<div>(<a href="#trace">go to trace</a>)</div>
{% endif %}
<div>(<a href="#explain">go to explain</a>)</div>
<div>(<a href="#edata">go to edata</a>)</div>
<div>(<a href="#trace">go to trace</a>)</div>
{% if params %}
<div id="params" class="table-row multiline">

62
frontend/resources/styles/main/partials/af-signup-questions.scss
View file

@ -103,6 +103,12 @@
margin: 0.5rem 0;
}
.af-field-input input[type="text"],
.af-choice-option label:before,
.af-dropdown {
border-color: #c5c6c9 !important;
}
.af-choice-option input:checked+label:before,
.af-legal input:checked+label:before {
background-color: $color-primary;
@ -112,7 +118,7 @@
.af-field-previous_design_tool .af-choice-option input:checked+label {
&::before {
background-color: transparent;
border: 2px solid $color-primary;
border: 2px solid $color-primary !important;
}
}
@ -193,4 +199,58 @@
.af-field-previous_design_tool .af-choice-option:nth-child(6) label {
background-image: url("../images/form/never-used.png");
}
.af-field-previous_design_tool .af-choice-option:nth-child(7) label,
.af-field-use_of_penpot .af-choice-option:nth-child(5) label {
justify-content: flex-start;
min-height: auto;
padding-left: 1.4rem;
padding-top: 0;
&:hover {
box-shadow: none;
}
&::before {
content: "";
background-color: #fff;
border: 1px solid #e0e6f0;
border-width: 1px;
border-radius: 50%;
min-width: 20px;
min-height: 20px;
box-sizing: border-box;
margin-left: 4px;
}
&::after {
content: "";
position: absolute;
opacity: 0;
width: 5px;
height: 8px;
margin-top: -1px;
border: solid #fff;
border-width: 0 2px 2px 0;
transform: rotate(45deg);
}
}
.af-field-use_of_penpot .af-choice-option:nth-child(5) label {
&::before {
border-radius: 3px;
}
}
.af-field-previous_design_tool .af-choice-option:nth-child(7) input:checked+label,
.af-field-use_of_penpot .af-choice-option:nth-child(5) input:checked+label {
&::before {
background-color: $color-primary;
}
&::after {
opacity: 1;
}
}
}

4
frontend/resources/styles/main/partials/modal.scss
View file

@ -832,7 +832,7 @@
flex-direction: column;
.modal-top {
padding-top: 40px;
padding: 40px 40px 0 40px;
color: $color-gray-60;
display: flex;
flex-direction: column;
@ -843,11 +843,13 @@
font-weight: 700;
font-size: 27px;
margin-bottom: $size-3;
text-align: center;
}
p {
font-family: 'worksans', sans-serif;
font-weight: 500;
font-size: $fs18;
text-align: center;
}
}