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 sticky header and other design reviews #501

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Add sticky header and other design reviews #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77cb361
Add sticky header and other design reviews
barbara-chaves Oct 31, 2024
ccb887a
test: fir sectors test
martintomas Nov 1, 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
57 changes: 31 additions & 26 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 @@ -21,6 +21,7 @@ $legend-image-width: 60px;
/* CSS GRID */
display: grid;
align-items: center;
justify-content: center;

&--sectors {
grid-template-rows: 144px auto;
Expand Down Expand Up @@ -61,12 +62,6 @@ $legend-image-width: 60px;
}
}

.bubble-chart__container--banks {
.bubble-chart__cell {
height: $cell-height-banks;
}
}

.bubble-chart_circle {
circle:hover {
stroke-width: 2;
Expand Down Expand Up @@ -155,6 +150,22 @@ $legend-image-width: 60px;
}

.bubble-chart__container--banks {
.bubble-chart__cell {
height: $cell-height-banks;
border-left: 4px dotted rgba(25, 25, 25, 0.1);
&:first-of-type {
border-left: none;
}
&::after {
background-color: rgba(25, 25, 25, 0.1);
content: "";
position: absolute;
top: calc(50% - 4px);
height: 8px;
width: calc(100% + 4px);
}
}

.bubble-chart__title-container {
position: absolute;
top: -50px;
Expand All @@ -168,6 +179,20 @@ $legend-image-width: 60px;
font-size: 16px;
font-weight: bold;
}
.bubble-chart__level-title {
font-family: $font-family-bold;
font-size: 12px;
color: $black;
}

.bubble-chart__level {
text-align: center;
padding-left: 0px;
}

.bubble-chart__legend-container + .bubble-chart__level {
text-align: left;
}
}

.bubble-chart_circle {
Expand Down Expand Up @@ -231,26 +256,6 @@ $legend-image-width: 60px;
}
}

.bubble-chart__container--banks {
.bubble-chart__level-title {
font-family: $font-family-bold;
font-size: 12px;
color: $black;
}

.bubble-chart__level {
text-align: center;
}

.bubble-chart__legend-container + .bubble-chart__level {
text-align: left;
}

.bubble-chart__level {
padding-left: 0px;
}
}

.bubble-chart__level-subtitle {
color: $grey-dark;
font-size: 12px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tpi/_dropdown-selector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ $header-height-mobile: 60px;
left: calc(-1 * #{$box-shadow});
width: calc(100% + (2 * #{$box-shadow})); // 60px = 2 x 30px for box shadow from left and right
margin-top: 20px;
z-index: 1;
z-index: 15;
overflow: hidden;
}

Expand Down
5 changes: 4 additions & 1 deletion app/assets/stylesheets/tpi/_mq_beta_scores.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
display: flex;
flex-wrap: wrap;
flex-direction: row;
align-items: center;

&__container {
display: flex;
padding: 4px 4px 4px 14px;
flex-wrap: wrap;
@include until($desktop) {
padding: 0;
Expand Down Expand Up @@ -47,6 +47,8 @@


.button {
height: 36px !important;

@include until($desktop) {
width: 50%;
height: 40px;
Expand Down Expand Up @@ -86,6 +88,7 @@

.button {
background-color: $blue;
height: 36px !important;
}

@include until($desktop) {
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/tpi/charts/cp-all-sectors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

.chart--cp-all-sectors {
justify-content: unset;
margin-bottom: 50px;

div[data-highcharts-chart] {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tpi/charts/cp-performance.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
.chart--cp-performance {
@import 'chart-company-selector';

margin-top: 10px;
margin-block: 50px;
justify-content: unset;
flex-flow: column;

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/tpi/pages/banks-index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

.dropdown-selector-wrapper {
background-color: $blue;

transform: translateY(-1px);
.dropdown-selector__container {
@include desktop {
padding: $container-top-padding $container-side-padding 40px $container-side-padding;
Expand Down
9 changes: 7 additions & 2 deletions app/assets/stylesheets/tpi/pages/company.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@

.companies-header {
background: $blue;

height: 100px;
// height: 100px;
min-height: 76px;
display: flex;
align-items: center;
position: sticky;
top: 0;
z-index: 10;
transform: translateY(-1px);

a {
color: white;
Expand All @@ -33,6 +37,7 @@
font-size: $size-7;
height: auto;
font-family: $font-family-regular;
min-height: 76px;
}
}

Expand Down
15 changes: 8 additions & 7 deletions app/assets/stylesheets/tpi/pages/sector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,14 @@ $tape-color: rgba(25, 25, 25, 0.1);

.sectors-header {
background: $blue;

height: 100px;
display: flex;
align-items: center;

min-height: 76px;
position: sticky;
top: 0;
z-index: 10;
transform: translateY(-1px);

a {
color: white;
line-height: 40px;
Expand All @@ -33,7 +36,7 @@ $tape-color: rgba(25, 25, 25, 0.1);
font-size: $size-7;
height: auto;
font-family: $font-family-regular;

min-height: auto;
}
}

Expand Down Expand Up @@ -96,7 +99,7 @@ $tape-color: rgba(25, 25, 25, 0.1);
color: white;
display: flex;
align-items: end;

> div:first-child {
width: 100%;
text-align: center;
Expand All @@ -109,8 +112,6 @@ $tape-color: rgba(25, 25, 25, 0.1);
}
}



.mq-level-trend {
@include mq-level-trend(20px);
background-color: rgba(0, 0, 0, 0.4);
Expand Down
12 changes: 9 additions & 3 deletions app/assets/stylesheets/tpi/pages/sectors-index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@
.sectors-index-page {
.sectors-header {
background: $blue;
min-height: 100px;
min-height: 76px;
display: flex;
align-items: center;
justify-content: space-between;
position: sticky;
top: 0;
z-index: 10;
transform: translateY(-1px);

a {
color: white;
Expand All @@ -24,9 +29,9 @@
@include until($desktop) {
padding: 0;
font-size: $size-7;
min-height: 60px;
height: auto;
font-family: $font-family-regular;
// transform: translateY(-1px);
min-height: 76px;
}
}

Expand All @@ -49,6 +54,7 @@
font-weight: bold;
line-height: 40px;
margin-bottom: 80px;
font-size: 28px !important;
}

@include until($desktop) {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/components/tpi/BaseTooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ BaseTooltip.propTypes = {

BaseTooltip.defaultProps = {
trigger: (
<span className="base-tooltip__default-trigger">?</span>
<span className="base-tooltip__default-trigger">i</span>
)
};

Expand Down
2 changes: 1 addition & 1 deletion app/javascript/components/tpi/InfoTooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ InfoTooltip.propTypes = {

InfoTooltip.defaultProps = {
trigger: (
<span className="base-tooltip__default-trigger">?</span>
<span className="base-tooltip__default-trigger">i</span>
),
html: false
};
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/components/tpi/charts/mq-sector-pie/Chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function MQSectorChart({ dataUrl }) {
<p>Level {item.name}</p>
<InfoTooltip
content={LEVELS_SUBTITLES[index]}
trigger={<span className="button is-secondary is-info" type="button">?</span>}
trigger={<span className="button is-secondary is-info" type="button">i</span>}
/>
</div>
<p className="chart-legend-item__value">
Expand Down
2 changes: 1 addition & 1 deletion app/views/tpi/shared/_mq_beta_scores.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
style: "min-width: 0;") { "Current V5.0" } %>

<div class="mq-beta-scores__container">
<span class="mq-beta-scores__text">MQ Methodology</span>

<%= link_to disable_beta_data_tpi_mq_assessments_path,
class: class_names('button', 'is-primary', 'no-margin', 'weight-normal': session[:enable_beta_mq_assessments], 'active': !session[:enable_beta_mq_assessments]),
style: "min-width: 0;" do %>
Expand Down
10 changes: 5 additions & 5 deletions spec/system/public/tpi/sectors_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
it 'loads all elements' do
# bubble chart loads
within '.chart--mq-sector-pie-chart' do
expect(page).to have_text('Level 0 ? 0 companies', normalize_ws: true) # Level 0 0 companies
expect(page).to have_text('Level 1 ? 2 companies', normalize_ws: true) # Level 1 2 companies
expect(page).to have_text('Level 2 ? 0 companies', normalize_ws: true) # Level 2 0 companies
expect(page).to have_text('Level 3 ? 2 companies', normalize_ws: true) # Level 3 2 companies
expect(page).to have_text('Level 4 ? 1 company', normalize_ws: true) # Level 4 1 company
expect(page).to have_text('Level 0 i 0 companies', normalize_ws: true) # Level 0 0 companies
expect(page).to have_text('Level 1 i 2 companies', normalize_ws: true) # Level 1 2 companies
expect(page).to have_text('Level 2 i 0 companies', normalize_ws: true) # Level 2 0 companies
expect(page).to have_text('Level 3 i 2 companies', normalize_ws: true) # Level 3 2 companies
expect(page).to have_text('Level 4 i 1 company', normalize_ws: true) # Level 4 1 company
expect(page).to have_text('Level 5')
expect(page).to have_selector('.companies-size', text: '5')
end
Expand Down
Loading