Skip to content
代码片段 群组 项目
未验证 提交 b4324e10 编辑于 作者: Scott de Jonge's avatar Scott de Jonge 提交者: GitLab
浏览文件

Use icon semantic design token value for subtle icons

上级 3eea92e4
No related branches found
No related tags found
无相关合并请求
...@@ -43,6 +43,6 @@ export default { ...@@ -43,6 +43,6 @@ export default {
data-track-action="open_review_app" data-track-action="open_review_app"
data-track-label="review_app" data-track-label="review_app"
> >
{{ display.text }} <gl-icon class="gl-fill-gray-500" name="external-link" /> {{ display.text }} <gl-icon variant="subtle" name="external-link" />
</gl-button> </gl-button>
</template> </template>
...@@ -30,21 +30,21 @@ ...@@ -30,21 +30,21 @@
%h2.gl-font-base.gl-mb-2.gl-mt-4= s_('UserProfile|Info') %h2.gl-font-base.gl-mb-2.gl-mt-4= s_('UserProfile|Info')
- if work_information(@user).present? - if work_information(@user).present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('work', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('work', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
%span %span
= work_information(@user, with_schema_markup: true) = work_information(@user, with_schema_markup: true)
- if @user.location.present? - if @user.location.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('location', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('location', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
%span{ itemprop: 'addressLocality' } %span{ itemprop: 'addressLocality' }
= @user.location = @user.location
- if user_local_time.present? - if user_local_time.present?
.gl-display-flex.gl-gap-2.gl-mb-2{ data: { testid: 'user-local-time' } } .gl-display-flex.gl-gap-2.gl-mb-2{ data: { testid: 'user-local-time' } }
= sprite_icon('clock', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('clock', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
%span %span
= user_local_time = user_local_time
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('calendar', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('calendar', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
%span= s_('Member since %{date}') % { date: l(@user.created_at.to_date, format: :long) } %span= s_('Member since %{date}') % { date: l(@user.created_at.to_date, format: :long) }
- if @user.website_url.present? || display_public_email?(@user) || @user.skype.present? || @user.linkedin.present? || @user.twitter.present? || @user.mastodon.present? || @user.discord.present? - if @user.website_url.present? || display_public_email?(@user) || @user.skype.present? || @user.linkedin.present? || @user.twitter.present? || @user.mastodon.present? || @user.discord.present?
...@@ -52,29 +52,29 @@ ...@@ -52,29 +52,29 @@
%h2.gl-font-base.gl-mb-2.gl-mt-4= s_('UserProfile|Contact') %h2.gl-font-base.gl-mb-2.gl-mt-4= s_('UserProfile|Contact')
- if @user.website_url.present? - if @user.website_url.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('earth', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('earth', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to @user.short_website_url, @user.full_website_url, class: 'gl-text-gray-900', target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url' = link_to @user.short_website_url, @user.full_website_url, class: 'gl-text-gray-900', target: '_blank', rel: 'me noopener noreferrer nofollow', itemprop: 'url'
- if display_public_email?(@user) - if display_public_email?(@user)
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('mail', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('mail', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to @user.public_email, "mailto:#{@user.public_email}", class: 'gl-text-gray-900', itemprop: 'email' = link_to @user.public_email, "mailto:#{@user.public_email}", class: 'gl-text-gray-900', itemprop: 'email'
- if @user.skype.present? - if @user.skype.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('skype', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('skype', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to @user.skype, "skype:#{@user.skype}", class: 'gl-text-gray-900', title: "Skype" = link_to @user.skype, "skype:#{@user.skype}", class: 'gl-text-gray-900', title: "Skype"
- if @user.linkedin.present? - if @user.linkedin.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('linkedin', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('linkedin', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to linkedin_name(@user), linkedin_url(@user), class: 'gl-text-gray-900', title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow' = link_to linkedin_name(@user), linkedin_url(@user), class: 'gl-text-gray-900', title: "LinkedIn", target: '_blank', rel: 'noopener noreferrer nofollow'
- if @user.twitter.present? - if @user.twitter.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('x', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('x', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to @user.twitter, twitter_url(@user), class: 'gl-text-gray-900', title: _("X (formerly Twitter)"), target: '_blank', rel: 'noopener noreferrer nofollow' = link_to @user.twitter, twitter_url(@user), class: 'gl-text-gray-900', title: _("X (formerly Twitter)"), target: '_blank', rel: 'noopener noreferrer nofollow'
- if @user.mastodon.present? - if @user.mastodon.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('mastodon', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('mastodon', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to @user.mastodon, mastodon_url(@user), class: 'gl-text-gray-900', title: "Mastodon", target: '_blank', rel: 'noopener noreferrer nofollow' = link_to @user.mastodon, mastodon_url(@user), class: 'gl-text-gray-900', title: "Mastodon", target: '_blank', rel: 'noopener noreferrer nofollow'
- if @user.discord.present? - if @user.discord.present?
.gl-display-flex.gl-gap-2.gl-mb-2 .gl-display-flex.gl-gap-2.gl-mb-2
= sprite_icon('discord', css_class: 'gl-fill-gray-500 gl-mt-1 flex-shrink-0') = sprite_icon('discord', css_class: 'gl-fill-icon-subtle gl-mt-1 flex-shrink-0')
= link_to @user.discord, discord_url(@user), class: 'gl-text-gray-900', title: "Discord", target: '_blank', rel: 'noopener noreferrer nofollow' = link_to @user.discord, discord_url(@user), class: 'gl-text-gray-900', title: "Discord", target: '_blank', rel: 'noopener noreferrer nofollow'
...@@ -90,7 +90,7 @@ exports[`Environment Header renders name and link to app matches the snapshot 1` ...@@ -90,7 +90,7 @@ exports[`Environment Header renders name and link to app matches the snapshot 1`
View app View app
<svg <svg
aria-hidden="true" aria-hidden="true"
class="gl-fill-current gl-fill-gray-500 gl-icon s16" class="gl-fill-icon-subtle gl-icon s16"
data-testid="external-link-icon" data-testid="external-link-icon"
role="img" role="img"
> >
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册