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

Add mobile version of the countries emissions bubble chart #461

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Add mobile version of the countries emissions bubble chart #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22512e7
Add mobile version of the countries emissions bubble chart
barbara-chaves Oct 17, 2023
3dd6305
Merge branch 'develop' into client/feature/LSE-126-mobile-version-of-…
martintomas Oct 17, 2023
5ef5b88
test: Fix of ASCOR bubble chart test (desktop and mobile version)
martintomas Oct 17, 2023
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
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 @@ -26,6 +26,7 @@
@import "tpi/navbar";
@import "tpi/publications";
@import "tpi/bubble-chart";
@import "tpi/bubble-chart-countries";
@import "tpi/charts";
@import "tpi/base-tooltip";
@import "tpi/info-tooltip";
Expand Down
195 changes: 195 additions & 0 deletions app/assets/stylesheets/tpi/_bubble-chart-countries.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
@import "colors";
@import "typography";
$tape-height: 8px;
$tape-color: rgba(25, 25, 25, 0.1);
$cell-height: 80px;
$cell-height-banks: 100px;
$legend-image-width: 60px;

.bubble-chart__container__grid {
display: none;
@include desktop {
grid-template-columns: 0.5fr 0.5fr 1.5fr 1fr 1fr 1fr;
padding: 0;
display: grid;
}
}

.bubble-chart__container__mobile {
display: block;
width: 100%;
padding: 10px;

.country-bubble-mobile {
width: 100%;
border: 1px solid $ascor-background-color;

> ul > li:last-of-type .country-bubble-mobile__item {
border-bottom: none;
}

&__item {
width: 100%;
display: flex;
justify-content: space-between;
font-size: 16px;
font-style: normal;

&.--pillar {
font-weight: 700;
font-family: $font-family-bold;
background: $ascor-background-color;
color: #fff;
padding: 20px 10px;
cursor: pointer;
border-bottom: 1px solid $grey-medium;
&.--open {
border-bottom: none;
}
}
&.--area {
color: #000;
padding: 10px;
font-family: $font-family-regular;
border-top: 1px solid $ascor-background-color;
cursor: pointer;
&.--open {
border-bottom: 1px solid $grey-medium;
}
}

.chevron-icon {
width: 12px;
}

&__result {
font-family: $font-family-regular;
font-size: 16px;

&__title {
display: flex;
align-items: center;
gap: 12px;
width: 100%;
padding: 10px;
border-bottom: 1px solid $grey-medium;
cursor: pointer;
min-height: 45px;
position: relative;

div {
width: 20px;
height: 20px;
border-radius: 50%;
}
}

&:not(:last-of-type) .country-bubble-mobile__item__result__title {
border-bottom-style: dashed;
}

&.--open {
.country-bubble-mobile__item__result__title {
border-bottom: none;
position: absolute;
}
.country-bubble-mobile__item__result__countries {
border-bottom: 1px solid $grey-medium;
border-bottom-style: dashed;
}
}

&:last-of-type {
.country-bubble-mobile__item__result__countries {
border-bottom: none;
}
}

&__countries {
padding: 10px 0px 10px 42px;
min-height: 45px;
li:not(:last-of-type) {
padding-bottom: 10px;
}
}
}
}
}
}

.bubble-chart__cell-country {
position: relative;
height: $cell-height-banks;
display: flex;
align-items: center;
border-right: calc(#{$tape-height / 2}) dashed $tape-color;

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

&::before {
background-color: $tape-color;
content: "";
position: absolute;
top: calc(50% - #{$tape-height / 2});
height: $tape-height;
width: calc(100% + #{$tape-height / 2});
}
}

.bubble-chart_circle_country {
circle:hover {
stroke-width: 3;
stroke: $black !important;
}
}

.bubble-chart__level-country {
border-right: calc(#{$tape-height / 2}) dashed $tape-color;
position: relative;
padding-left: 20px;
height: 100%;
}

.bubble-chart__level-title-country {
height: 100%;
font-family: $font-family-bold;
font-size: 16px;
color: $black;
margin-bottom: 20px;
}

.bubble-chart__level-area-country {
font-family: $font-family-bold;
font-size: 16px;
background-color: $ascor-background-color;
color: white;
padding: 10px;
width: 100%;
display: flex;
align-items: center;

color: $black;
text-align: end;
margin-right: 14px;
grid-column: span 2;
height: 100%;
padding: 46px 0 46px;
gap: 16px;
background-color: white;

&__line {
border: 8px solid #e8e8e8;
border-right: none;
height: 100%;
flex: 1;
}

&__area {
text-align: end;
padding-right: 14px;
flex: 1;
}
}
54 changes: 1 addition & 53 deletions app/assets/stylesheets/tpi/_bubble-chart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import "typography";

$tape-height: 8px;
$tape-color: rgba(25,25,25,0.1);
$tape-color: rgba(25, 25, 25, 0.1);
$cell-height: 80px;
$cell-height-banks: 100px;
$legend-image-width: 60px;
Expand All @@ -21,7 +21,6 @@ $legend-image-width: 60px;
.last {
border-right: none;
}

}

&--banks {
Expand Down Expand Up @@ -62,42 +61,13 @@ $legend-image-width: 60px;
}
}

.bubble-chart__cell-country {
position: relative;
height: $cell-height-banks;
display: flex;
align-items: center;
border-right: calc(#{$tape-height / 2}) dashed $tape-color;

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

&::before {
background-color: $tape-color;
content: "";
position: absolute;
top: calc(50% - #{$tape-height / 2});
height: $tape-height;
width: calc(100% + #{$tape-height / 2});
}
}

.bubble-chart_circle {
circle:hover {
stroke-width: 14;
stroke: $black;
}
}

.bubble-chart_circle_country {
circle:hover {
stroke-width: 3;
stroke: $black!important;
}
}

.bubble-tip {
font-size: 14px;
padding: 10px;
Expand Down Expand Up @@ -201,28 +171,6 @@ $legend-image-width: 60px;
}
}

.bubble-chart__level-country {
border-right: calc(#{$tape-height / 2}) dotted $tape-color;
position: relative;
padding-left: 20px;
height: 100%;
}

.bubble-chart__level-title-country {
height: 100%;
font-family: $font-family-bold;
font-size: 16px;
color: $black;
}

.bubble-chart__level-area-country {
font-family: $font-family-bold;
font-size: 16px;
color: $black;
text-align: end;
margin-right: 14px;
}

.bubble-chart__container--banks {
.bubble-chart__level-title {
font-family: $font-family-bold;
Expand Down
Loading