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

Ported site to Bootstrap 4 from 3 #347

Merged
merged 18 commits into from
Jan 14, 2022
Merged

Ported site to Bootstrap 4 from 3 #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b4071c7
updated bootstrap.css to v4
S-kus Jan 13, 2022
10f626c
updated bootstrap.js to v4
S-kus Jan 13, 2022
3c3a34c
fixed firstheader
S-kus Jan 13, 2022
fceaa6b
updated li and dropdown-button
S-kus Jan 13, 2022
3900da6
updated second-header and made responsive
S-kus Jan 13, 2022
4214a9c
corrected link of bootstrap version
S-kus Jan 13, 2022
c301f42
fixed about-us page for v4
S-kus Jan 13, 2022
8dafa76
fixed about-irc page for v4
S-kus Jan 13, 2022
2977829
fixed about-libre-software-culture page for v4
S-kus Jan 13, 2022
9c4d25c
aligned contents of html files
S-kus Jan 13, 2022
d7aca48
aligned contents of more html files
S-kus Jan 13, 2022
d0f8a3a
fixed music-blocks.html for v4
S-kus Jan 13, 2022
cc4d43d
fixed sugar-for-raspbian.html and updated badge with margin
S-kus Jan 13, 2022
ab17394
updated index.html for v4
S-kus Jan 13, 2022
f362fd4
updated footer according to bootstrap v4
S-kus Jan 13, 2022
eabfe19
udpated versions in LicenseInformation.txt
S-kus Jan 13, 2022
9937a52
Review - undo minor change
quozl Jan 14, 2022
8cc7d03
Review - remove extra blank
quozl Jan 14, 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
10 changes: 6 additions & 4 deletions LicenseInformation.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ This file contains the license information of all the dependencies/libraries use

(1)-------
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Bootstrap v4.0.0 (https://getbootstrap.com)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */

Expand All @@ -12,8 +13,9 @@ This file contains the license information of all the dependencies/libraries use

(3)-------
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Bootstrap v4.0.0 (https://getbootstrap.com)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under the MIT license
*/

Expand Down
64 changes: 17 additions & 47 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!-- Footer -->
<footer style="background-color:#282828;padding-top:5px;">
<h4 style="text-align:right;margin-right:20px;"><a href="#top" class="hrefCustomColor">Back to top&nbsp<i class="icon ion-arrow-up-c"></i></a></h4>
<h5 style="text-align:right;margin-right:20px;"><a href="#top" class="hrefCustomColor">Back to top&nbsp<i class="icon ion-arrow-up-c"></i></a></h5>
<div class="container">
<div class="row">
<div class="col-md-12" >
<div class="row">
<div class="row justify-content-around">
<div class="col-md-2 widget">
<h4 class="footerHeaderStyle align-center-md text-center-md">
<h6 class="footerHeaderStyle align-center-md text-center-md">
Sugar Labs® is a registered USA 501(c)(3) tax-exempt, not-for-profit organization, supported by our generous contributors and sponsors. Donate or Volunteer today!
</h4>
</h6>
</div>
<div class="col-md-2 widget">
<div class="col-md-3 widget">
<h4 class="footerHeaderStyle align-center-md"><b>Sugar Labs</b></h4>
<article class="widget_content">
<ul class="leftAlign align-center-col-md">
Expand All @@ -29,7 +29,7 @@ <h4 class="footerHeaderStyle align-center-md"><b>Sugar Labs</b></h4>
</ul>
</article>
</div>
<div class="col-md-2 widget">
<div class="col-md-3 widget">
<h4 class="footerHeaderStyle align-center-md"><b>Development</b></h4>
<article class="widget_content">
<ul class="leftAlign align-center-col-md">
Expand All @@ -43,7 +43,7 @@ <h4 class="footerHeaderStyle align-center-md"><b>Development</b></h4>
</ul>
</article>
</div>
<div class="col-md-2 widget">
<div class="col-md-3 widget">
<h4 class="footerHeaderStyle align-center-md"><b>Resources</b></h4>
<article class="widget_content">
<ul class="leftAlign align-center-col-md">
Expand All @@ -59,48 +59,18 @@ <h4 class="footerHeaderStyle align-center-md"><b>Resources</b></h4>
<div class="col-md-6">
<div class="row">
<div class="col-md-12" >
<div class="row">
<div class="col-md-5 to-animate col-md-push-3" style="margin-top:10px;">
<div class="row align-center-md">
<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>
</br>
<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>
</div>
</div>
</br>
<!--
<div class="row">
<div class="col-md-9 col-md-push-3">
<div id="mc_embed_signup">
<form action="//sugarlabs.us16.list-manage.com/subscribe/post?u=23c6df6118693ee743df3e0a4&amp;id=11cb7e5c96" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
<div id="mc_embed_signup_scroll">
<label class='align-center-md' for="mce-EMAIL"><h4><span class="customSpanColor"><b>Subscribe to our newsletter</b></span></h4></label>
<div class='align-center-md'>
<input type="email" value="" name="EMAIL" class="email footer-email-input-md" id="mce-EMAIL" placeholder="email address" required>
</div>
-->
<!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<!--
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_23c6df6118693ee743df3e0a4_11cb7e5c96" tabindex="-1" value=""></div>
<div class="clear">
<div class='align-center-md'>
<input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="btn btn-primary">
</div>
</div>
</div>
</form>
</div>
</div>
</div>
-->
</br>
<div class="row">
<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>
</div>
Expand Down
Loading