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.

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/527_highlight_header_tab #535

Merged
merged 11 commits into from
Oct 10, 2023
Merged

fix/527_highlight_header_tab #535

merged 11 commits into from
Oct 10, 2023

Conversation

AndriyAndriyovuch
Copy link
Contributor

@AndriyAndriyovuch AndriyAndriyovuch commented Aug 1, 2023

Code reviewers

Summary of issue

Highlight active tab on admin panel

Summary of change

  • added dynamically added class "underscore" and highlight active tab on admin panel (issue 527 )
  • added margin to display menu items and locale button in one line (issue 530)
  • fix locale for language selection

CHECK LIST

  • СI passed
  • Сode coverage >=95%
  • PR is reviewed manually again (to make sure you have 100% ready code)
  • All reviewers agreed to merge the PR
  • I've checked new feature as logged in and logged out user if needed
  • PR meets all conventions

Before:

Знімок екрану з 2023-08-01 20-33-08

After:

Знімок екрану з 2023-09-16 15-09-40

@AndriyAndriyovuch AndriyAndriyovuch added the enhancement New feature or request label Aug 1, 2023
@AndriyAndriyovuch AndriyAndriyovuch self-assigned this Aug 1, 2023
@render
Copy link

render bot commented Aug 1, 2023

@AndriyAndriyovuch AndriyAndriyovuch linked an issue Aug 1, 2023 that may be closed by this pull request
@AndriyAndriyovuch AndriyAndriyovuch changed the title add underscored class to header fix/527_highlight_header_tab Aug 1, 2023
@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Patch coverage has no change and project coverage change: -8.92% ⚠️

Comparison is base (f8acd86) 85.34% compared to head (f3518fc) 76.43%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #535      +/-   ##
===========================================
- Coverage    85.34%   76.43%   -8.92%     
===========================================
  Files           64       64              
  Lines          778      802      +24     
===========================================
- Hits           664      613      -51     
- Misses         114      189      +75     

see 12 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -208,6 +208,11 @@ h3.container {
padding: 20px;
}

.tab-active {
color: darkgreen!important;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
color: darkgreen!important;
color: darkgreen !important;

@@ -0,0 +1,91 @@
<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom border-success">
<div class="container-fluid">
<%= link_to root_path, class: 'logo-zerowaste' do %>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

де тайтл?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

і так скрізь у цьому файлі

<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom border-success">
<div class="container-fluid">
<%= link_to root_path, class: 'logo-zerowaste' do %>
<%= image_tag('logo_zerowaste.png') %>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

де альт?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

і так скрізь у цьому файлі

</div>

<div class="d-flex order-lg-1">
<div class="mr-3 align-middle" id="lang-btn">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

айдішка йде першою

<ul class="navbar-nav mr-0">
<li class="nav-item mx-3">
<%= link_to_unless_current t('.calculators'), account_calculators_path, class: "navbar-brand text-success h3" do %>
<span class="navbar-brand h3 tab-active">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а для чого їх всіх в спан огортати? не бачу сенсу

<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom border-success">
<div class="container-fluid">
<%= link_to root_path, title: t('.homepage'), class: 'logo-zerowaste' do %>
<%= image_tag('logo_zerowaste.png', alt: "ZeroWaste_logo")%>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

без андерлайн і має бути локалізація, бо це буде читатися людям з проблемами зору

</li>

<li class="nav-item mx-3">
<%= link_to_unless_current t('.app_config'), edit_account_app_config_path, title: t('.app_config'), class: "navbar-brand text-success h3" do %>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

що це за "h3"?

@AndriyAndriyovuch AndriyAndriyovuch linked an issue Sep 16, 2023 that may be closed by this pull request
@sonarcloud
Copy link

sonarcloud bot commented Sep 16, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@loqimean loqimean merged commit 31baa25 into develop Oct 10, 2023
4 of 7 checks passed
@loqimean loqimean deleted the fix/527_highlight_header_tab branch October 10, 2023 19:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Header] Buttons aren't aligned with language button Add highlighting the active page in the header
2 participants