Skip to content

G
gitlab-ce
Commit 76844015 authored by Natalia Tepluhina's avatar Natalia Tepluhina
Browse files
Options

Merge branch '354217-support-ukraine-tanuki' into 'master' 

Add the "Support Ukraine" tanuki

See merge request gitlab-org/gitlab!82050
parents 96f5de2a 72585cf3
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 78 deletions
app/assets/stylesheets/startup/startup-dark.scss
View file @ 76844015
......@@ -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;
......
app/assets/stylesheets/startup/startup-general.scss
View file @ 76844015
......@@ -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;
......
app/assets/stylesheets/startup/startup-signin.scss
View file @ 76844015
......@@ -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;
......
app/helpers/appearances_helper.rb
View file @ 76844015
......@@ -38,6 +38,8 @@ module AppearancesHelper
def brand_header_logo
if current_appearance&.header_logo?
image_tag current_appearance.header_logo_path, class: 'brand-header-logo'
elsif Feature.enabled?(:ukraine_support_tanuki)
render partial: 'shared/logo_ukraine', formats: :svg
else
render partial: 'shared/logo', formats: :svg
end
......
app/views/shared/_logo_ukraine.svg 0 → 100644
View file @ 76844015
<svg width="24" height="24" class="tanuki-logo" viewBox="0 0 24 24">
<path d="M4.89929534,0.3165 L7.56629534,8.5025 L16.3922953,8.5025 L19.0592953,0.3165 C19.1962953,-0.1055 19.8432953,-0.1055 19.9792953,0.3165 L23.9122953,12.6095 C23.9722953,12.7935 23.9722953,12.9895 23.9192953,13.1695 L0.0392953418,13.1695 C-0.0143874393,12.9863283 -0.0119492421,12.7912726 0.0462953418,12.6095 L3.97929534,0.3165 C4.11529534,-0.1055 4.76229534,-0.1055 4.89929534,0.3165 Z" id="Path" fill="#005BBB"></path>
<path d="M7.20329534,9.0025 L16.7552953,9.0025 L16.8682953,8.6575 L19.5182953,0.5185 L23.4362953,12.7615 C23.4961172,12.9376949 23.435535,13.1323657 23.2862953,13.2435 L23.2852953,13.2455 L11.9852953,21.4655 L11.9792953,21.4715 L0.673295342,13.2455 C0.522422013,13.1321007 0.462258936,12.9374792 0.522295342,12.7615 L4.43929534,0.5185 L7.09029534,8.6585 L7.20329534,9.0025 Z" id="Shape" stroke="#FFFFFF" opacity="0.32" stroke-linejoin="round"></path>
<path d="M0.0012953418,12.8575 C-0.0152229638,13.1685309 0.127095079,13.4667211 0.379295342,13.6495 L11.9792953,22.0895 L11.9862953,22.0845 L11.9922953,22.0895 L11.9872953,22.0835 L23.5792953,13.6495 C23.8319507,13.466647 23.9743476,13.1679148 23.9572953,12.8565 L0.0012953418,12.8565 L0.0012953418,12.8575 Z" id="Path" fill="#FFD500"></path>
</svg>
\ No newline at end of file
config/feature_flags/development/ukraine_support_tanuki.yml 0 → 100644
View file @ 76844015
---
name: ukraine_support_tanuki
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82050
rollout_issue_url:
milestone: '14.9'
type: development
group: group::editor
default_enabled: false
ee/app/assets/stylesheets/startup/startup-dark.scss
View file @ 76844015
......@@ -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;
......
ee/app/assets/stylesheets/startup/startup-general.scss
View file @ 76844015
......@@ -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;
......
ee/app/assets/stylesheets/startup/startup-signin.scss
View file @ 76844015
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7