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.

Sign up for GitHub

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

Fix styles and add download form #497

Merged
merged 3 commits into from
Oct 29, 2024
Merged

Fix styles and add download form #497

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed50875
Fix styles and add download form
barbara-chaves Oct 28, 2024
ce41571
fix: Adding downloadUrl to DownloadFormModal component
martintomas Oct 29, 2024
c70a536
chore: upgrade of rexml gem
martintomas Oct 29, 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
5 changes: 5 additions & 0 deletions app/assets/images/tpi/icons/download.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/stylesheets/tpi.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
@import "tpi/mq_beta_scores";
@import "tpi/mq-beta-modal";
@import "tpi/selector";
@import "tpi/download-form-modal";
@import "tpi/emissions-chart";
@import "tpi/ascor-benchmarks";
@import "tpi/pages/*";
Expand Down
3 changes: 3 additions & 0 deletions app/assets/stylesheets/tpi/_base-tooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ div[data-react-class=BaseTooltip] {

.base-tooltip {
position: relative;
>div:first-child {
height: auto;
}

&__default-trigger {
font-family: $font-family-bold;
Expand Down
33 changes: 17 additions & 16 deletions app/assets/stylesheets/tpi/_bubble-chart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import "colors";
@import "typography";

$tape-height: 8px;
$tape-height: 1px;
$tape-color: rgba(25, 25, 25, 0.1);
$cell-height: 80px;
$cell-height: 60px;
$cell-height-banks: 100px;
$legend-image-width: 60px;

Expand All @@ -13,18 +13,18 @@ $legend-image-width: 60px;
color: $blue-darker;
margin-top: 28px;
line-height: 20px;
margin-bottom: 20px;
}

.bubble-chart__container {
width: 100%;
padding: 50px 0;
/* CSS GRID */
display: grid;
grid-row-gap: 4px;
align-items: center;

&--sectors {
grid-template-rows: 150px auto;
grid-template-rows: 144px auto;

.last {
border-right: none;
Expand All @@ -46,14 +46,13 @@ $legend-image-width: 60px;
height: $cell-height;
display: flex;
align-items: center;
border-right: calc(#{$tape-height / 2}) dotted $tape-color;

& > *:first-child {
margin: auto;
z-index: 1;
}

&::before {
&::after {
background-color: $tape-color;
content: "";
position: absolute;
Expand All @@ -72,13 +71,13 @@ $legend-image-width: 60px;
.bubble-chart_circle {
circle:hover {
stroke-width: 2;
stroke: #FFDD49;
stroke: $yellow;
}
}
.bubble-chart_tooltip {
z-index: 10;
background-color: $white;
border: 1.5px solid $black;
border: 1.25px solid $black;
padding: 20px;
font-size: 14px;
width: max-content;
Expand All @@ -98,15 +97,15 @@ $legend-image-width: 60px;
margin-block: 8px 20px;
}
&_text {
display: grid;
grid-template-columns: repeat(2, 1fr);
columns: 2;
margin-block: 12px;
font-size: 16px;
max-height: 200px;
overflow-y: auto;
gap: 12px 20px;

column-gap: 40px;
.bubble-chart_tooltip_list_item {
margin-top: 12px;
margin-left: 20px;
a {
text-decoration: underline;
Expand All @@ -115,11 +114,12 @@ $legend-image-width: 60px;
}

}
button {
.button.is-secondary.is-small {
float: right;
margin-top: 20px;
height: 40px !important;
width: 62px !important;
min-width: auto;
}
}

Expand Down Expand Up @@ -214,14 +214,15 @@ $legend-image-width: 60px;
.bubble-chart__level {
border-right: calc(#{$tape-height / 2}) dotted $tape-color;
position: relative;
height: 100%;
padding-left: 20px;
height: 20%;

}

.bubble-chart__container--sectors {
.bubble-chart__level-container {
position: absolute;
top: 20%;
padding-inline: 16px 10px;
}

.bubble-chart__level-title {
Expand Down Expand Up @@ -259,5 +260,5 @@ $legend-image-width: 60px;
.bubble-chart__row-link {
color: $blue-dark;
text-align: right;
padding-right: 50px;
padding-right: 16px;
}
136 changes: 136 additions & 0 deletions app/assets/stylesheets/tpi/_download-form-modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
@import "colors";
@import "typography";

.download {
button {
margin-right: 10px;
}
}
.download-form {
> * {
margin-bottom: 20px;
}
h2 {
font-size: 20px !important;
font-weight: bold;
}
.--mandatory {
color: $red;
}
.content {
input[type="text"] {
height: 40px;
width: 100%;
padding-inline: 10px;
border-radius: 0;
border: 1px solid #191919;
&::placeholder {
color: #595b5d;
font-size: 12px;
}
}
.text-inputs {
margin-bottom: 20px;
display: grid;
grid-template-columns: 1fr 1fr;
gap: 20px;
@include until($breakpoint-desktop) {
grid-template-columns: 1fr;
}
label {
display: block;
line-height: 24px;
margin-bottom: 9px;
}
.selector__container {
list-style: none;
margin: 0;
.selector__header {
height: 40px;
}
.selector__input {
border: 0;
background-color: $white !important;
}
.selector__value {
font-size: 14px;
}
.selector__options {
margin: 0;
transform: translateY(-4px);
list-style: none;
max-height: 300px;
overflow-y: auto;
.selector__option {
font-size: 14px;
padding-block: 5px;
}
}
}
&.--full {
.content__input {
column-span: 2;
}
}
}
.checkbox-inputs {
display: flex;
flex-wrap: wrap;
gap: 16px 20px;
margin-bottom: 16px;
.content__input {
display: flex;
flex-direction: row-reverse;
align-items: center;
gap: 12px;

input {
width: 24px;
height: 24px;
border-radius: 0;
display: flex;
justify-content: center;
align-items: center;
border: 2px solid $grey-dark;
appearance: none;
-webkit-appearance: none;
&::before {
content: "";
width: 12px;
height: 12px;
display: block;
transform: scale(0);
background-color: $blue;
}
&:checked {
&::before {
transform: scale(1);
}
}
}
}
}
}
.other-purposes-text {
&.hidden {
display: none;
}
}
.error {
color: $red;
font-size: 12px;
margin-top: 10px;
}
.form-buttons {
margin-top: 20px;
width: 50%;
display: flex;
gap: 8px;
button {
min-width: auto !important;
}
.is-primary {
flex-grow: 1;
}
}
}
Loading
Loading