Merge remote-tracking branch 'origin/develop' into release/2.5

superdesk · Aug 11, 2023 · 4a48f71 · 4a48f71
2 parents 2d68f58 + cc3c28a
commit 4a48f71
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/assets/styles/navbar.scss b/assets/styles/navbar.scss
@@ -334,11 +334,10 @@
     padding-block: var(--top-bar-logo-main-padding-y);
     padding-inline: var(--top-bar-logo-main-padding-x);
     img {
-        width: 100%;
-        max-width: var(--top-bar-logo-main-max-width);
+        width: var(--top-bar-logo-main-max-width);
         margin-block-start: var(--top-bar-logo-main-margin-top);
         @include phone {
-            max-width: var(--top-bar-logo-main-max-width--mobile);
+            width: var(--top-bar-logo-main-max-width--mobile);
             margin-block-start: var(--top-bar-logo-main-margin-top--mobile);
         }
     }
@@ -380,8 +379,7 @@
         height: auto;
         position: relative;
         display: var(--top-bar-logo-additional-display);
-        max-width: var(--top-bar-logo-additional-max-width);
-        width: 100%;
+        width: var(--top-bar-logo-additional-max-width);
         height: auto;
         margin-block-start: var(--top-bar-logo-additiona-margin-top);
     }

diff --git a/design_app/src/assets/styles/theme_Command-News.scss b/design_app/src/assets/styles/theme_Command-News.scss
@@ -78,22 +78,22 @@
 
 .navbar__logo {
     img.navbar__logo-img--fr {
-        max-width: 200px;
+        width: 200px;
         margin-block-start: 0;
     }
 }
 
 .navbar__additional-logo {
     .navbar__additional-logo-img--fr {
-        max-width: 120px;
+        width: 120px;
     }
 }
 
 @media only screen and (max-width: 575px) {
     .navbar__logo {
         img.navbar__logo-img--fr {
             margin-block-start: 0;
-            max-width: 160px;
+            width: 160px;
         }
     }
 }
diff --git a/design_app/src/components/MainNavbar.jsx b/design_app/src/components/MainNavbar.jsx
@@ -7,16 +7,16 @@ function MainNavbar() {
             <h3 className="a11y-only">main nav bar</h3>
             <div className="navbar__logo">
                 {/* Default */}
-                {/* <a href="#">
+                <a href="#">
                     <h1 className="a11y-only">Newsroom</h1>
                     <img className="navbar__logo-img navbar__logo-img--en" src="static/logo.svg" alt="Newsroom" aria-hidden="true" />
-                </a> */}
+                </a>
 
                 {/* Canadian Press */}
-                <a href="#">
+                {/* <a href="#">
                     <h1 className="a11y-only">The Canadian Press</h1>
                     <img className="navbar__logo-img navbar__logo-img--en" src="static/temp_logos/logo.svg" alt="The Canadian Press" aria-hidden="true" />
-                </a>
+                </a> */}
 
                 {/* Canadian Press - French */}
                 {/* <a href="#">
@@ -26,10 +26,10 @@ function MainNavbar() {
             </div>
 
             {/* NewsPro */}
-            <div className="navbar__additional-logo">
+            {/* <div className="navbar__additional-logo">
                 <h1 className="a11y-only">NewsPro</h1>
                 <img className="navbar__additional-logo-img navbar__additional-logo-img--en" src="static/temp_logos/logo-newspro.svg" alt="Newspro" aria-hidden="true" />
-            </div>
+            </div> */}
 
             {/* NewsPro French */}
             {/* <div className="navbar__additional-logo">