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

Social icon #354

Merged
merged 8 commits into from
Feb 5, 2022
Merged

Social icon #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ffeb328
Improve the design of Social Media icons
nikkuAg Jan 20, 2022
1016309
Corrected the changes due to editor.
nikkuAg Jan 20, 2022
89041f8
Resolving merge conflicts
nikkuAg Feb 3, 2022
d51769f
Resolving merge conflicts in footer.html file
nikkuAg Feb 3, 2022
af552e9
Ion Icons updated to v6.0.1
nikkuAg Feb 4, 2022
7936ab0
Social icons on the webpage are updated to newer version of ion icons.
nikkuAg Feb 4, 2022
d09058a
Removed unrequired spaces from the footer.html
nikkuAg Feb 5, 2022
22d6280
Removed unwanted space from ion_icon_customization
nikkuAg Feb 5, 2022
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
24 changes: 12 additions & 12 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ <h4 class="footerHeaderStyle align-center-md"><b>Resources</b></h4>
<br>
<div class="justify-content-center">
<div class="row d-flex justify-content-center">
<div id="own-ssk" class="ssk-group">
<a href="https://www.facebook.com/SugarLabs-187845102582/timeline/" class="ion-icon ion-social-facebook"></a>
<a href="https://github.com/sugarlabs" class="ion-icon ion-social-github"></a>
<a href="https://twitter.com/sugar_labs" class="ion-icon ion-social-twitter"></a>
<a href="https://www.instagram.com/sugarlabsforall/" class="ion-icon ion-social-instagram" ></a>
<a href="https://www.youtube.com/channel/UCfsR9AEb7HuPRAc14jfiI6g/featured" class="ion-icon ion-social-youtube"></a>
<div id="own-ssk" class="ssk-group d-flex">
<a href="https://www.facebook.com/SugarLabs-187845102582/timeline/" class="ion-icon ion-logo-facebook"></a>
<a href="https://github.com/sugarlabs" class="ion-icon ion-logo-github"></a>
<a href="https://twitter.com/sugar_labs" class="ion-icon ion-logo-twitter"></a>
<a href="https://www.instagram.com/sugarlabsforall/" class="ion-icon ion-logo-instagram" ></a>
<a href="https://www.youtube.com/channel/UCfsR9AEb7HuPRAc14jfiI6g/featured" class="ion-icon ion-logo-youtube"></a>
</div>
</div>
<br>
<div id="contributeHeader" class="col-md-12">
<h4 class='align-center-md'><a href="https://github.com/sugarlabs/www-sugarlabs"><b><span class="ion-social-github" style="font-size:17px;color: #0099FF; margin-right: 12px;"></span><span style="font-size:17px;color: #0099FF;">Contribute to website</span></b></a></h4>
<h4 class='align-center-md'><a href="https://github.com/sugarlabs/www-sugarlabs"><b><span class="ion-logo-github" style="font-size:17px;color: #0099FF; margin-right: 12px;"></span><span style="font-size:17px;color: #0099FF;">Contribute to website</span></b></a></h4>
</div>
</div>
</div>
Expand All @@ -95,11 +95,11 @@ <h4 class='align-center-md'><a href="https://github.com/sugarlabs/www-sugarlabs"

<!-- FLoating social media icons -->
<div id="mobile-ssk" class="ion-sticky ssk-group">
<a href="https://www.facebook.com/SugarLabs-187845102582/timeline/" class="ion-sticky-icon ion-social-facebook"></a>
<a href="https://github.com/sugarlabs" class="ion-sticky-icon ion-social-github"></a>
<a href="https://twitter.com/sugar_labs" class="ion-sticky-icon ion-social-twitter"></a>
<a href="https://www.instagram.com/sugarlabsforall/" class="ion-sticky-icon ion-social-instagram"></a>
<a href="https://www.youtube.com/channel/UCfsR9AEb7HuPRAc14jfiI6g/featured" class="ion-sticky-icon ion-social-youtube"></a>
<a href="https://www.facebook.com/SugarLabs-187845102582/timeline/" class="ion-sticky-icon ion-logo-facebook"></a>
<a href="https://github.com/sugarlabs" class="ion-sticky-icon ion-logo-github"></a>
<a href="https://twitter.com/sugar_labs" class="ion-sticky-icon ion-logo-twitter"></a>
<a href="https://www.instagram.com/sugarlabsforall/" class="ion-sticky-icon ion-logo-instagram"></a>
<a href="https://www.youtube.com/channel/UCfsR9AEb7HuPRAc14jfiI6g/featured" class="ion-sticky-icon ion-logo-youtube"></a>
</div>

<!-- Javascript files -->
Expand Down
41 changes: 26 additions & 15 deletions css/ion_icon_customization.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
$darken-percent: 10%;

// Facebook colors
$facebook-color: #3b5998;
$facebook-color: white;
$facebook-color-hover: darken($facebook-color, $darken-percent);
$facebook-background: #3b5998;
$facebook-background: #1877f2;
$facebook-background-hover: darken($facebook-background, $darken-percent);

// Github colors
$github-color: #767676;
$github-color: white;
$github-color-hover: darken($github-color, $darken-percent);
$github-background: black;
$github-background-hover: darken($github-background, $darken-percent);

// Twitter colors
$twitter-color: #38A1F3;
$twitter-color: white;
$twitter-color-hover: darken($twitter-color, $darken-percent);
$twitter-background: #38A1F3;
$twitter-background-hover: darken($twitter-background, $darken-percent);
Expand All @@ -28,11 +28,11 @@ $twitter-background-hover: darken($twitter-background, $darken-percent);
// Instagram uses the background on both for both sticky and non sticky icons
$instagram-color: white;
$instagram-color-hover: #d9a1f1;
$instagram-background: linear-gradient(#4c4bdb, transparent), linear-gradient(60deg, #ffff00, #ff00d3, #0e39dc);
$instagram-background-hover: linear-gradient(darken(#4c4bdb, $darken-percent), darken(transparent, $darken-percent)), linear-gradient(60deg, darken(#ffff00, $darken-percent), darken(#ff00d3, $darken-percent), darken(#0e39dc, $darken-percent));
$instagram-background: linear-gradient(#4c4bdb85, transparent), linear-gradient(60deg, #ffff00, #ff00d3, #0e39dc);
$instagram-background-hover: linear-gradient(darken(#4c4bdb85, $darken-percent), darken(transparent, $darken-percent)), linear-gradient(60deg, darken(#ffff00, $darken-percent), darken(#ff00d3, $darken-percent), darken(#0e39dc, $darken-percent));

// Youtube colors
$youtube-color: red;
$youtube-color: white;
$youtube-color-hover: darken($youtube-color, $darken-percent);
$youtube-background: red;
$youtube-background-hover: darken($youtube-background, $darken-percent);
Expand All @@ -46,9 +46,6 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);
-ms-transform: translateY(-50%);
-o-transform: translateY(-50%);
left: 0;
box-shadow:0 0 2px 2px rgba(0,0,0,0.2);
border-top-right-radius: 0.25em;
border-bottom-right-radius: 0.25em;
position: fixed;
z-index: 2147483647;
}
Expand All @@ -71,12 +68,12 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);
color: white;
}

&.ion-social- {
&.ion-logo- {

&facebook {
background: $facebook-background;
text-indent: 8.5px;
margin-right: -8.5px;
text-indent: 3px;
margin-right: -1.5px;
border-radius: 0 0.25em 0 0;

&:hover {
Expand Down Expand Up @@ -106,8 +103,9 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);

&instagram {
background: $instagram-background;
text-indent: 3.5px;
text-indent: 2px;
margin-right: -3.5px;
font-size: 2rem;

&:hover {
background: $instagram-background-hover;
Expand All @@ -127,12 +125,18 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);

.ion-icon {
padding: 1px 4px;
margin: 0.5rem;
display: inline-block;
border-radius: 50%;
font-size: 2rem;

&.ion-social- {
&.ion-logo- {

&facebook {
color: $facebook-color;
border: 1px solid $facebook-background;
padding: 0.3rem 0.55rem;
background-color: $facebook-background;

&:hover {
color: $facebook-color-hover;
Expand All @@ -141,6 +145,7 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);

&github {
color: $github-color;
font-size: 2.7rem;

&:hover {
color: $github-color-hover;
Expand All @@ -149,6 +154,9 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);

&twitter {
color: $twitter-color;
border: 1px solid $twitter-background;
padding: 0.3rem 0.4rem;
background-color: $twitter-background;

&:hover {
color: $twitter-color-hover;
Expand All @@ -159,6 +167,7 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);
// Instagram uses background color
color: $instagram-color;
background: $instagram-background;
padding: 0.4rem 0.5rem;

&:hover {
color: $instagram-color-hover;
Expand All @@ -167,6 +176,8 @@ $youtube-background-hover: darken($youtube-background, $darken-percent);

&youtube {
color: $youtube-color;
background-color: $youtube-background;
padding: 0.4rem;

&:hover {
color: $youtube-color-hover;
Expand Down
13 changes: 12 additions & 1 deletion css/ionicons.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified fonts/ionicons.eot
100755 → 100644
View file
Open in desktop
Binary file not shown.
Loading