Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

3 files changed, 5 insertions, 69 deletions

diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index 1397590cc31..00195f553dc 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -993,19 +993,6 @@ input {
 .top-nav-toggle .dropdown-icon {
   margin-right: 0.5rem;
 }
-.tanuki-logo .tanuki-left-ear,
-.tanuki-logo .tanuki-right-ear,
-.tanuki-logo .tanuki-nose {
-  fill: #e24329;
-}
-.tanuki-logo .tanuki-left-eye,
-.tanuki-logo .tanuki-right-eye {
-  fill: #fc6d26;
-}
-.tanuki-logo .tanuki-left-cheek,
-.tanuki-logo .tanuki-right-cheek {
-  fill: #fca326;
-}
 .context-header {
   position: relative;
   margin-right: 2px;
@@ -1393,24 +1380,11 @@ input {
   border-radius: 4px;
   box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
 }
-.sidebar-top-level-items > li .badge.badge-pill:not(.gl-badge) {
-  border-radius: 0.5rem;
-  padding-top: 0.125rem;
-  padding-bottom: 0.125rem;
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-  background-color: #064787;
-  color: #9dc7f1;
-}
 .sidebar-top-level-items
   > li.active
   .sidebar-sub-level-items:not(.is-fly-out-only) {
   display: block;
 }
-.sidebar-top-level-items > li.active .badge.badge-pill:not(.gl-badge) {
-  font-weight: 400;
-  color: #9dc7f1;
-}
 .sidebar-top-level-items li > a.gl-link {
   color: #fafafa;
 }
@@ -1786,7 +1760,6 @@ body.gl-dark {
   --border-color: #4f4f4f;
   --white: #333;
   --black: #fff;
-  --black-normal: #fafafa;
   --svg-status-bg: #333;
 }
 .nav-sidebar li a {
@@ -1824,6 +1797,9 @@ body.gl-dark .navbar-gitlab .navbar-sub-nav {
 body.gl-dark .navbar-gitlab .nav > li {
   color: #fafafa;
 }
+body.gl-dark .navbar-gitlab .nav > li.header-search-new {
+  color: #fafafa;
+}
 body.gl-dark .navbar-gitlab .nav > li > a .notification-dot {
   border: 2px solid #fafafa;
 }
@@ -1861,8 +1837,8 @@ body.gl-dark
 body.gl-dark .header-search {
   background-color: rgba(250, 250, 250, 0.2) !important;
 }
-body.gl-dark .header-search svg {
-  color: rgba(250, 250, 250, 0.8) !important;
+body.gl-dark .header-search svg.gl-search-box-by-type-search-icon {
+  color: rgba(250, 250, 250, 0.8);
 }
 body.gl-dark .header-search input {
   background-color: transparent;
@@ -2017,7 +1993,6 @@ body.gl-dark {
   --border-color: #4f4f4f;
   --white: #333;
   --black: #fff;
-  --black-normal: #fafafa;
   --svg-status-bg: #333;
 }
 .tab-width-8 {
diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss
index 0d35c400676..6d66e207bdc 100644
--- a/app/assets/stylesheets/startup/startup-general.scss
+++ b/app/assets/stylesheets/startup/startup-general.scss
@@ -978,19 +978,6 @@ input {
 .top-nav-toggle .dropdown-icon {
   margin-right: 0.5rem;
 }
-.tanuki-logo .tanuki-left-ear,
-.tanuki-logo .tanuki-right-ear,
-.tanuki-logo .tanuki-nose {
-  fill: #e24329;
-}
-.tanuki-logo .tanuki-left-eye,
-.tanuki-logo .tanuki-right-eye {
-  fill: #fc6d26;
-}
-.tanuki-logo .tanuki-left-cheek,
-.tanuki-logo .tanuki-right-cheek {
-  fill: #fca326;
-}
 .context-header {
   position: relative;
   margin-right: 2px;
@@ -1378,24 +1365,11 @@ input {
   border-radius: 4px;
   box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.08);
 }
-.sidebar-top-level-items > li .badge.badge-pill:not(.gl-badge) {
-  border-radius: 0.5rem;
-  padding-top: 0.125rem;
-  padding-bottom: 0.125rem;
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-  background-color: #cbe2f9;
-  color: #0b5cad;
-}
 .sidebar-top-level-items
   > li.active
   .sidebar-sub-level-items:not(.is-fly-out-only) {
   display: block;
 }
-.sidebar-top-level-items > li.active .badge.badge-pill:not(.gl-badge) {
-  font-weight: 400;
-  color: #0b5cad;
-}
 .sidebar-top-level-items li > a.gl-link {
   color: #303030;
 }
diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss
index c5cbe58ec27..213d1c013a0 100644
--- a/app/assets/stylesheets/startup/startup-signin.scss
+++ b/app/assets/stylesheets/startup/startup-signin.scss
@@ -514,19 +514,6 @@ label.label-bold {
 .navbar-empty .brand-header-logo {
   max-height: 100%;
 }
-.tanuki-logo .tanuki-left-ear,
-.tanuki-logo .tanuki-right-ear,
-.tanuki-logo .tanuki-nose {
-  fill: #e24329;
-}
-.tanuki-logo .tanuki-left-eye,
-.tanuki-logo .tanuki-right-eye {
-  fill: #fc6d26;
-}
-.tanuki-logo .tanuki-left-cheek,
-.tanuki-logo .tanuki-right-cheek {
-  fill: #fca326;
-}
 input::-moz-placeholder {
   color: #868686;
   opacity: 1;