app/assets/javascripts/language_switcher/components/app.vue

@@ -56,13 +56,5 @@ export default {
         {{ locale.text }}
       </span>
     </template>
-    <template #footer>
-      <div
-        class="gl-flex gl-justify-center gl-border-t-1 gl-border-t-gray-100 gl-p-3 gl-border-t-solid"
-        data-testid="footer"
-      >
-        <gl-link :href="$options.HELP_TRANSLATE_HREF">{{ $options.HELP_TRANSLATE_MSG }}</gl-link>
-      </div>
-    </template>
   </gl-collapsible-listbox>
 </template>

app/assets/javascripts/lib/logger/hello.js

@@ -7,32 +7,4 @@ const ROCKET = String.fromCodePoint(0x1f680);
 
 export const logHello = () => {
   // eslint-disable-next-line no-console
-  console.log(
-    `%c${s__('HelloMessage|Welcome to GitLab!')}%c
-
-${s__(
-  'HelloMessage|Does this page need fixes or improvements? Open an issue or contribute a merge request to help make GitLab more lovable. At GitLab, everyone can contribute!',
-)}
-
-${sprintf(s__('HelloMessage|%{handshake_emoji} Contribute to GitLab: %{contribute_link}'), {
-  handshake_emoji: `${HANDSHAKE}`,
-  contribute_link: `${PROMO_URL}/community/contribute/`,
-})}
-${sprintf(s__('HelloMessage|%{magnifier_emoji} Create a new GitLab issue: %{new_issue_link}'), {
-  magnifier_emoji: `${MAG}`,
-  new_issue_link: 'https://gitlab.com/gitlab-org/gitlab/-/issues/new',
-})}
-${
-  window.gon?.dot_com
-    ? `${sprintf(
-        s__(
-          'HelloMessage|%{rocket_emoji} We like your curiosity! Help us improve GitLab by joining the team: %{jobs_page_link}',
-        ),
-        { rocket_emoji: `${ROCKET}`, jobs_page_link: `${PROMO_URL}/jobs/` },
-      )}`
-    : ''
-}`,
-    `padding-top: 0.5em; font-size: 2em;`,
-    'padding-bottom: 0.5em;',
-  );
 };

app/assets/javascripts/super_sidebar/components/brand_logo.vue

@@ -3,9 +3,11 @@ import { GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import logo from '../../../../views/shared/_logo.svg?raw';
+import logopng from '../../../../views/shared/_logo.png';
 
 export default {
   logo,
+  logopng,
   i18n: {
     homepage: __('Homepage'),
   },
@@ -43,11 +45,12 @@ export default {
       class="gl-h-6 gl-max-w-full"
     />
     <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings -->
-    <span
-      v-else
-      v-safe-html="$options.logo"
-      aria-hidden="true"
-      data-testid="brand-header-default-logo"
-    ></span>
+    <img
+    v-else
+      alt=""
+      :src="$options.logopng"
+      class="gl-h-6 gl-max-w-full"
+    />
+
   </a>
 </template>

app/assets/javascripts/super_sidebar/components/help_center.vue

@@ -78,41 +78,6 @@ export default {
                 ...this.trackingAttrs('support'),
               },
             },
-            {
-              text: this.$options.i18n.docs,
-              href: this.sidebarData.docs_path,
-              extraAttrs: {
-                ...this.trackingAttrs('gitlab_documentation'),
-              },
-            },
-            {
-              text: this.$options.i18n.plans,
-              href: `${PROMO_URL}/pricing`,
-              extraAttrs: {
-                ...this.trackingAttrs('compare_gitlab_plans'),
-              },
-            },
-            {
-              text: this.$options.i18n.forum,
-              href: FORUM_URL,
-              extraAttrs: {
-                ...this.trackingAttrs('community_forum'),
-              },
-            },
-            {
-              text: this.$options.i18n.contribute,
-              href: helpPagePath('', { anchor: 'contribute-to-gitlab' }),
-              extraAttrs: {
-                ...this.trackingAttrs('contribute_to_gitlab'),
-              },
-            },
-            {
-              text: this.$options.i18n.feedback,
-              href: `${PROMO_URL}/submit-feedback`,
-              extraAttrs: {
-                ...this.trackingAttrs('submit_feedback'),
-              },
-            },
             this.isSaas && {
               text: this.$options.i18n.privacy,
               href: `${PROMO_URL}/privacy`,
@@ -142,19 +107,19 @@ export default {
                 'data-track-property': HELP_MENU_TRACKING_DEFAULTS['data-track-property'],
               },
               shortcut: '?',
-            },
-            this.sidebarData.display_whats_new && {
-              text: this.$options.i18n.whatsnew,
-              action: this.showWhatsNew,
-              count:
-                this.showWhatsNewNotification &&
-                this.sidebarData.whats_new_most_recent_release_items_count,
-              extraAttrs: {
-                'data-track-action': 'click_button',
-                'data-track-label': 'whats_new',
-                'data-track-property': HELP_MENU_TRACKING_DEFAULTS['data-track-property'],
-              },
-            },
+            }
+            // this.sidebarData.display_whats_new && {
+            //   text: this.$options.i18n.whatsnew,
+            //   action: this.showWhatsNew,
+            //   count:
+            //     this.showWhatsNewNotification &&
+            //     this.sidebarData.whats_new_most_recent_release_items_count,
+            //   extraAttrs: {
+            //     'data-track-action': 'click_button',
+            //     'data-track-label': 'whats_new',
+            //     'data-track-property': HELP_MENU_TRACKING_DEFAULTS['data-track-property'],
+            //   },
+            // },
           ].filter(Boolean),
         },
       };
@@ -234,12 +199,12 @@ export default {
       <template #list-item="{ item }">
         <span class="gl-flex gl-flex-col gl-leading-24">
           <span class="gl-text-sm gl-font-bold">
-            {{ item.text }}
+            当前版本
             <gl-emoji data-name="rocket" />
           </span>
           <span>
             <span class="gl-mr-2">{{ item.version }}</span>
-            <gitlab-version-check-badge v-if="updateSeverity" :status="updateSeverity" />
+            <!-- <gitlab-version-check-badge v-if="updateSeverity" :status="updateSeverity" /> -->
           </span>
         </span>
       </template>

app/helpers/appearances_helper.rb

@@ -69,7 +69,7 @@ def brand_image
   def brand_image_path
     return current_appearance.logo_path if current_appearance&.logo?
 
-    image_path('logo.svg')
+    image_path('logo.png')
   end
 
   def custom_sign_in_description

app/views/layouts/_head.html.haml

 - page_description brand_title unless page_description
-- site_name = _('GitLab')
+- site_name = '蓝擎GitLab管理系统'
 - omit_og = sign_in_with_redirect?
 
 -# This is a temporary place for the page specific style migrations to be included on all pages like page_specific_files

app/views/user_settings/profiles/show.html.haml

@@ -173,7 +173,7 @@
             s_('Profiles|Display achievements on your profile')
 
     .js-hide-when-nothing-matches-search.settings-sticky-footer
-      = f.submit s_("Profiles|Update profile settings"), class: 'gl-mr-3 js-password-prompt-btn', pajamas_button: true
+      = f.submit "更新个人资料设置", class: 'gl-mr-3 js-password-prompt-btn', pajamas_button: true
       = render Pajamas::ButtonComponent.new(href: user_path(current_user)) do
         = s_('TagsPage|Cancel')
 

config/locales/devise.zh-cn.yml

@@ -31,7 +31,7 @@ zh-CN:
       password_change_by_admin:
         subject: "密码已由管理员更改"
       user_admin_approval:
-        subject: "欢迎使用极狐GitLab！"
+        subject: "欢迎使用蓝擎GitLab！"
     omniauth_callbacks:
       failure: "无法通过 %{kind} 对您进行身份验证，原因：\"%{reason}\"。"
       success: "已成功通过 %{kind} 帐户进行身份验证。"

ee/app/controllers/subscriptions/groups_controller.rb

@@ -44,7 +44,7 @@ def edit
     def update
       if Groups::UpdateService.new(@group, current_user, group_params).execute
         notice = if ::Gitlab::Utils.to_boolean(params[:new_user])
-                   format(_('Welcome to GitLab, %{first_name}!'), first_name: current_user.first_name)
+                   format(_('Welcome to BESP, %{first_name}!'), first_name: current_user.first_name)
                  else
                    format(_('Subscription successfully applied to "%{group_name}"'), group_name: @group.name)
                  end

jh/app/assets/javascripts/lib/logger/hello.js

@@ -7,32 +7,4 @@ const ROCKET = String.fromCodePoint(0x1f680);
 
 export const logHello = () => {
   // eslint-disable-next-line no-console
-  console.log(
-    `%c${s__('HelloMessage|Welcome to GitLab!')}%c
-
-${s__(
-  'HelloMessage|Does this page need fixes or improvements? Open an issue or contribute a merge request to help make GitLab more lovable. At GitLab, everyone can contribute!',
-)}
-
-${sprintf(s__('HelloMessage|%{handshake_emoji} Contribute to GitLab: %{contribute_link}'), {
-  handshake_emoji: `${HANDSHAKE}`,
-  contribute_link: `${PROMO_URL}/community/contribute/`,
-})}
-${sprintf(s__('HelloMessage|%{magnifier_emoji} Create a new GitLab issue: %{new_issue_link}'), {
-  magnifier_emoji: `${MAG}`,
-  new_issue_link: 'https://jihulab.com/gitlab-cn/gitlab/-/issues/new',
-})}
-${
-  window.gon?.dot_com
-    ? `${sprintf(
-        s__(
-          'HelloMessage|%{rocket_emoji} We like your curiosity! Help us improve GitLab by joining the team: %{jobs_page_link}',
-        ),
-        { rocket_emoji: `${ROCKET}`, jobs_page_link: `${PROMO_URL}/jobs/` },
-      )}`
-    : ''
-}`,
-    `padding-top: 0.5em; font-size: 2em;`,
-    'padding-bottom: 0.5em;',
-  );
 };

jh/app/assets/javascripts/super_sidebar/components/brand_logo.vue

@@ -3,9 +3,11 @@ import { GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import logo from '../../../../views/shared/_logo.svg?raw';
+import logopng from '../../../../views/shared/_logo.png';
 
 export default {
   logo,
+  logopng,
   i18n: {
     homepage: __('Homepage'),
   },
@@ -42,11 +44,11 @@ export default {
       :src="logoUrl"
       class="gl-h-6 gl-max-w-full"
     />
-    <span
-      v-else
-      v-safe-html="$options.logo"
-      aria-hidden="true"
-      data-testid="brand-header-default-logo"
-    ></span>
+    <img
+    v-else
+      alt=""
+      :src="$options.logopng"
+      class="gl-h-6 gl-max-w-full"
+    />
   </a>
 </template>

jh/app/assets/javascripts/super_sidebar/components/extra_info.vue

 <script>
 import { GlButton, GlDisclosureDropdown } from '@gitlab/ui';
 import WeChatIcon from '@jihu-fe/svgs/dist/illustrations/jh/logos/wechat.svg?raw';
-import QrCode from 'jh_images/illustrations/wechat-com.svg?url';
+import QrCode from 'jh_images/illustrations/wechat-com.png';
 import SafeHtmlDirective from '~/vue_shared/directives/safe_html';
 import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 import { DROPDOWN_Y_OFFSET } from '~/super_sidebar/constants';
@@ -71,18 +71,8 @@ export default {
           @click="shouldHighlight = false"
         >
           <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings -->
-          <span
-            v-safe-html="$options.svg.WeChatIcon"
-            class="gl-inline-flex gl-items-center gl-justify-center gl-align-middle"
-          >
-          </span>
-          <span
-            v-if="shouldHighlight"
-            data-testid="notification-dot"
-            class="notification-dot-info"
-          ></span>
           <template v-if="showText">
-            {{ __('Support') }}
+            BESP公司
           </template>
         </gl-button>
       </template>
@@ -93,14 +83,6 @@ export default {
           <p class="gl-mb-0 gl-text-center gl-font-bold">
             {{ s__('JH|Support|Scan the QR code to join our WeChat group') }}
           </p>
-          <p class="gl-mb-0 gl-text-center gl-leading-24">
-            {{ s__('JH|Support|1. Access enterprise-level DevOps solutions support') }}
-          </p>
-          <p class="gl-mb-0 gl-text-center gl-leading-24">
-            {{
-              s__('JH|Support|2. Free or Discount JiHu Gitlab official training and certification')
-            }}
-          </p>
         </div>
       </div>
     </gl-disclosure-dropdown>

jh/app/assets/stylesheets/page_bundles/password_reset.scss

@@ -23,3 +23,24 @@
     color: $gray-400;
   }
 }
+
+a {
+  color: #AB2325;
+}
+a::hover {
+  color: #AB2325;
+}
+.btn-confirm::hover {
+  background-color: #AB2325;
+}
+.btn-confirm {
+  background-color: #AB2325;
+}
+button.gl-button.btn-block.btn-confirm {
+  background-color: #AB2325;
+  box-shadow: none;
+}
+button.gl-button.btn-block.btn-confirm::hover {
+  background-color: #AB2325;
+  box-shadow: none;
+}

jh/app/assets/stylesheets/page_bundles/signin.scss

@@ -18,4 +18,24 @@
       margin-left: $gl-padding;
     }
   }
+  a {
+    color: #AB2325;
+  }
+  a::hover {
+    color: #AB2325;
+  }
+  .btn-confirm::hover {
+    background-color: #AB2325;
+  }
+  .btn-confirm {
+    background-color: #AB2325;
+  }
+  button.gl-button.btn-block.btn-confirm {
+    background-color: #AB2325;
+    box-shadow: none;
+  }
+  button.gl-button.btn-block.btn-confirm::hover {
+    background-color: #AB2325;
+    box-shadow: none;
+  }
 }
\ No newline at end of file

jh/app/views/dashboard/projects/_blank_state_support.html.haml

 -# EE:Self Managed
-
-- if !::Gitlab.com?
-  %div{ class: "#{link_classes} flex-column" }
-    .blank-state-icon.gl-mb-3
-      = image_tag("illustrations/wechat-com.svg", { lazy: false })
-    .blank-state-body.sm:gl-pl-6
-      %h3.gl-text-size-h2.gl-mt-0
-        = s_('JH|Support|Scan the QR code to join our WeChat group')
-      %p.gl-mb-0
-        = s_('JH|Support|1. Access enterprise-level DevOps solutions support')
-      %p
-        = s_('JH|Support|2. Free or Discount JiHu Gitlab official training and certification')