Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New X icon #677

Merged
merged 3 commits into from
Aug 23, 2023
Merged

New X icon #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f7f7ea
New X icon
xentenza Aug 8, 2023
fef1bfe
Update social-icon.scss
xentenza Aug 22, 2023
4a14577
Merge branch 'dev' into x-social-icons
williambelle Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/components/atoms/social-icon/social-icon-group.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Facebook', icon: 'icon-facebook', round: round, discrete: discrete, negative: negative } %}
</li>
<li>
{% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Twitter', icon: 'icon-twitter', round: round, discrete: discrete, negative: negative } %}
{% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'X', icon: 'icon-x', round: round, discrete: discrete, negative: negative } %}
</li>
<li>
{% include '@atoms/social-icon/social-icon-single.twig' with { pretty_name: 'Instagram', icon: 'icon-instagram', round: round, discrete: discrete, negative: negative } %}
Expand Down
2 changes: 1 addition & 1 deletion assets/components/atoms/social-icon/social-icon-link-group.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Facebook', icon: 'icon-facebook', round: round, discrete: discrete, negative: negative, url: 'https://www.facebook.com/epflcampus' } %}
</li>
<li>
{% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Twitter', icon: 'icon-twitter', round: round, discrete: discrete, negative: negative, url: 'https://twitter.com/epfl_en' } %}
{% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on X', icon: 'icon-x', round: round, discrete: discrete, negative: negative, url: 'https://x.com/epfl_en' } %}
</li>
<li>
{% include '@atoms/social-icon/social-icon-single-link.twig' with { pretty_name: 'Follow us on Instagram', icon: 'icon-instagram', round: round, discrete: discrete, negative: negative, url: 'http://instagram.com/epflcampus' } %}
Expand Down
4 changes: 2 additions & 2 deletions assets/components/atoms/social-icon/social-icon-link.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set pretty_name = pretty_name ?: 'Twitter' %}
{% set icon = icon ?: 'icon-twitter' %}
{% set pretty_name = pretty_name ?: 'X' %}
{% set icon = icon ?: 'icon-x' %}
{% set round = round ? ' social-icon-round' : '' %}
{% set discrete = discrete ? ' social-icon-discrete' : '' %}
{% set negative = negative ? ' social-icon-negative' : '' %}
Expand Down
4 changes: 2 additions & 2 deletions assets/components/atoms/social-icon/social-icon-single-link-with-details.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set pretty_name = pretty_name ?: 'Twitter' %}
{% set pretty_name = pretty_name ?: 'X' %}
{% set user_id = user_id ?: 'firstname.name' %}
{% set icon = icon ?: 'icon-twitter' %}
{% set icon = icon ?: 'icon-x' %}
{% set round = round ? ' social-icon-round' : '' %}
{% set discrete = discrete ? ' social-icon-discrete' : '' %}
{% set negative = negative ? ' social-icon-negative' : '' %}
Expand Down
4 changes: 2 additions & 2 deletions assets/components/atoms/social-icon/social-icon-single-link.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set pretty_name = pretty_name ?: 'Follow us on Twitter' %}
{% set icon = icon ?: 'icon-twitter' %}
{% set pretty_name = pretty_name ?: 'Follow us on X' %}
{% set icon = icon ?: 'icon-x' %}
{% set round = round ? ' social-icon-round' : '' %}
{% set discrete = discrete ? ' social-icon-discrete' : '' %}
{% set negative = negative ? ' social-icon-negative' : '' %}
Expand Down
4 changes: 2 additions & 2 deletions assets/components/atoms/social-icon/social-icon-single.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set pretty_name = pretty_name ?: 'Twitter' %}
{% set icon = icon ?: 'icon-twitter' %}
{% set pretty_name = pretty_name ?: 'X' %}
{% set icon = icon ?: 'icon-x' %}
{% set round = round ? ' social-icon-round' : '' %}
{% set discrete = discrete ? ' social-icon-discrete' : '' %}
{% set negative = negative ? ' social-icon-negative' : '' %}
Expand Down
4 changes: 4 additions & 0 deletions assets/components/atoms/social-icon/social-icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ a.social-icon {
background-color: $twitter;
}

.social-icon-x {
background-color: $x;
}

.social-icon-whatsapp {
background-color: $whatsappgreen;
}
Expand Down
4 changes: 2 additions & 2 deletions assets/components/atoms/social-icon/social-icon.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set pretty_name = pretty_name ?: 'Twitter' %}
{% set icon = icon ?: 'icon-twitter' %}
{% set pretty_name = pretty_name ?: 'X' %}
{% set icon = icon ?: 'icon-x' %}
{% set round = round ? ' social-icon-round' : '' %}
{% set discrete = discrete ? ' social-icon-discrete' : '' %}
{% set negative = negative ? ' social-icon-negative' : '' %}
Expand Down
2 changes: 1 addition & 1 deletion assets/components/atoms/social-icon/social-icon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ notes: |
Icons to accomodate social boxes. The available social networks are:
* `facebook`
* `instagram`
* `twitter`
* `x`
* `e-mail`
* `whatsapp`
* `linkedin`
4 changes: 2 additions & 2 deletions assets/components/molecules/social-feed/social-feed.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="social-feed">
{% include '@atoms/social-icon/social-icon.twig' with { icon: 'icon-twitter', round: true } %}
{% include '@atoms/social-icon/social-icon.twig' with { icon: 'icon-x', round: true } %}

<div class="social-feed-content">
<div>
Expand All @@ -11,7 +11,7 @@
<p>What's your fave spot for sunset on campus? 😎</p>
</div>
<div>
<a class="btn btn-secondary mt-4">Nous rejoindre sur Twitter</a>
<a class="btn btn-secondary mt-4">Nous rejoindre sur X</a>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions assets/components/molecules/social/social.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</li>
<li>
{% include '@atoms/social-icon/social-icon-single-link.twig' with {
pretty_name: 'Share on Twitter',
icon: 'icon-twitter',
pretty_name: 'Share on X',
icon: 'icon-x',
round: round,
discrete: true,
url: '#'
Expand Down
4 changes: 2 additions & 2 deletions assets/components/pages/news-detail/news-detail.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@
<a href="#" class="social-icon social-icon-discrete social-icon-facebook">
<svg class="icon"><use xlink:href="#icon-facebook"></use></svg>
</a>
<a href="#" class="social-icon social-icon-discrete social-icon-twitter">
<svg class="icon"><use xlink:href="#icon-twitter"></use></svg>
<a href="#" class="social-icon social-icon-discrete social-icon-x">
<svg class="icon"><use xlink:href="#icon-x"></use></svg>
</a>
<a href="#" class="social-icon social-icon-discrete social-icon-instagram">
<svg class="icon"><use xlink:href="#icon-instagram"></use></svg>
Expand Down
3 changes: 2 additions & 1 deletion assets/config/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
"home",
"info",
"instagram",
"linkedin",
"lock",
"mail-plane",
"triangle",
Expand All @@ -91,7 +92,7 @@
"whatsapp",
"planet",
"youtube",
"linkedin"
"x"
],
"feathericons": [
"activity",
Expand Down
1 change: 1 addition & 0 deletions assets/config/social-color.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ $listlyblue: #52b1b3;
$vine: #00b489;
$steam: #171a21;
$discord: #7289da;
$x: #000000;
1 change: 1 addition & 0 deletions assets/icons/x.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading