Merge branch 'eric'
diff --git a/images/soap.jpg b/images/soap.jpg
new file mode 100644
index 0000000..020c86e
--- /dev/null
+++ b/images/soap.jpg
Binary files differ
diff --git a/index.html b/index.html
index 5cbe4c2..c7691bd 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
<meta name="theme-color" content="#0080ff">
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<link rel="icon" sizes="192x192" href="images/bliss_icon_small.png">
- <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link href="https://fonts.googleapis.com/css?family=Comfortaa:400,700,300" rel="stylesheet">
@@ -83,7 +83,7 @@
<div class="col-md-12" align="center">
<div class="row">
<h1>Bliss</h1>
- <p class="lead">An Open-Source OS, based on Android, that works on</p>
+ <p class="lead">An open source OS, based on Android, that works on</p>
</div>
</div>
<div class="col-md-12" align="center">
@@ -156,11 +156,10 @@
<!--1st side project -->
<div class="row">
<div class="col-sm-5 text-center">
- <h4 class="portfolio-projects--title">Bliss ROM - For Phones and Tablets</h4>
- <p class="portfolio-projects--desc">This is the Bliss you have all come to know and love for your phones and tablets.<br>Our list of supported devices is constantly changing, so make sure you check our Maintainers section to see if your device is supported.</p>
+ <h4 class="portfolio-projects--title">BlissRoms - for phones and tablets</h4>
+ <p class="portfolio-projects--desc">This is the Bliss you have all come to know and love for your phones and tablets.<br><br>Our list of supported devices is constantly changing, so make sure you check our Maintainers section to see if your device is supported.</p>
+ <a class="btn btn-rounded portfolio-projects--btn" href="https://downloads.blissroms.com/BlissRoms/Official/" role="button"><i class="fas fa-download"></i> Downloads</a>
<a class="btn btn-rounded portfolio-projects--btn" href="https://maintainers.blissroms.com" role="button">Maintainers Section</a>
- <p class="portfolio-projects--desc">Devices: axon7, bacon, bullhead, clark, hammerhead, hydrogen, kenzo, kiwi, mako, marlin, oneplus2, shamu, victara, warp4</p>
- <a class="btn btn-rounded portfolio-projects--btn" href="https://downloads.blissroms.com/BlissRoms/Official/" role="button">Bliss Device Downloads</a>
</div>
<div class="col-sm-7 text-center">
<img class="portfolio-projects--image" src="images/bliss_nexus.png">
@@ -172,19 +171,19 @@
<div class="row">
<div class="col-sm-5 text-center pull-right-sm">
<!--flipped on small, unflipped on large-->
- <h4 class="portfolio-projects--title">Bliss OS - For PCs and Laptops</h4>
- <p class="portfolio-projects--desc">This is a newer spin on Bliss for your PCs, Laptops, Tablets, x86 maker boards or just about any device that uses UEFI boot.</p>
- <p class="portfolio-projects--desc">Compatible with PCs, MacBooks & Chromebooks equipped with CPUs from Intel, AMD, nVidia, Qualcomm, etc. & Intel, AMD, Nvidia graphic cards. Bootable on all PCs (Legacy/CSM/MBR/GPT/UEFI/Mac)</p>
- <p class="portfolio-projects--desc">This project includes @farmerbb's Taskbar Launcher for a more PC like experience, and due to the nature of some apps forcing rotation, we also include an Orientation app to manage that. For gaming on Bliss-OS, we also include Octopus, an on-screen keymapping solution from the Phoenix OS team. </p>
- <a class="btn btn-rounded portfolio-projects--btn" href="https://forum.xda-developers.com/android/software/x86-bliss-x86-pc-s-t3534657" role="button">XDA Thread</a>
- <a class="btn btn-rounded portfolio-projects--btn disabled" href="https://downloads.blissroms.com/BlissOS/" role="button">System Downloads</a>
+ <h4 class="portfolio-projects--title">BlissOS - for desktops and laptops</h4>
+ <p class="portfolio-projects--desc">This is a new spin on Bliss for your x86-based devices, including desktops, laptops, tablets, maker boards and a lot more.</p>
+ <p class="portfolio-projects--desc">These builds are compatible with PCs, MacBooks and Chromebooks equipped with CPUs from Intel and AMD, and GPUs from Intel, AMD, or Nvidia. Supports both BIOS/CSM and UEFI boot.</p>
+ <p class="portfolio-projects--desc">This project includes @farmerbb's Taskbar Launcher for a more desktop-like experience, and includes an Orientation app to manage rotation-forcing apps. For gaming on BlissOS, we also include Octopus, an on-screen keymapping solution from the Phoenix OS team.</p>
+ <a class="btn btn-rounded portfolio-projects--btn disabled" href="https://downloads.blissroms.com/BlissOS/" role="button"><i class="fas fa-download"></i>Downloads</a>
+ <a class="btn btn-rounded portfolio-projects--btn" href="https://forum.xda-developers.com/android/software/x86-bliss-x86-pc-s-t3534657" role="button">XDA thread</a>
<p class="portfolio-projects--desc">We currently offer an easy installer for Windows PCs (UEFI only) included in the .ISO</p>
<div class="alert p-0">
<span class="closebtn" onclick="this.parentElement.style.display='none';">×</span>
- <p style="font-size:125%">Bliss OS x86 has currently moved all downloads to our archive on Sourceforge. Please follow the link below to go there. </p>
+ <p style="font-size:125%">BlissOS has currently moved all downloads to our archive on SourceForge. Please follow the link below to download. </p>
</div>
<br>
- <a class="btn btn-rounded portfolio-projects--btn text-white" href="https://sourceforge.net/projects/blissos-x86/files/Official/" role="button">Sourceforge Archive</a>
+ <a class="btn btn-rounded portfolio-projects--btn text-white" href="https://sourceforge.net/projects/blissos-x86/files/Official/" role="button">SourceForge Archive</a>
<a class="btn btn-rounded portfolio-projects--btn" href="https://github.com/BlissRoms-x86/Androidx86-Installer-for-Windows/blob/master/bin/Androidx86-Installv26.0003.exe?raw=true" role="button">(Legacy) Windows Installer</a>
</div>
<div class="col-sm-7 text-center pull-right-sm">
@@ -211,7 +210,7 @@
</div>
<div class="p-5 col-lg-7 d-flex flex-column justify-content-center" style="">
<h2 class="" style="color: #fff;">Bliss Videos</h2>
- <p class="lead mb-0">We like to work on a few videos as well in our spare time. Walkthroughs, Updates, Reviews, we try to cover it all. So make sure you follow us on YouTube for more</p>
+ <p class="lead mb-0">Our team likes to work on a few videos as well in our spare time. Walkthroughs, updates, reviews; we try to cover them all. Make sure to follow us on YouTube for the latest announcements and updates!</p>
<a class="btn btn-rounded family-projects--btn" href="https://www.youtube.com/channel/UCHVCPbyVGPiwZs7XycTYY1g">Team Bliss on YouTube</a>
</div>
</div>
@@ -221,9 +220,9 @@
<h2 class="text-center contact-header" style="color: #fff;">Find Us Online</h2>
<div class="text-center contact-social-icons">
<ul class="centered">
- <a href="mailto:blissfamilyroms@gmail.com">
+ <a href="mailto:contact@blissroms.com">
<li>
- <i class="fa fa-envelope"></i> Contact us via email </li>
+ <i class="fas fa-envelope"></i> Contact us via email </li>
</a>
</ul>
</div>
@@ -233,24 +232,24 @@
<ul class="centered">
<a href="https://t.me/OfficialBlissROMs">
<li>
- <i class="fa fa-telegram"></i> BlissRoms Telegram </li>
+ <i class="fab fa-telegram"></i> BlissRoms Telegram </li>
</a>
<a href="https://t.me/blissx86">
<li>
- <i class="fa fa-telegram"></i> BlissOS Telegram </li>
+ <i class="fab fa-telegram"></i> BlissOS Telegram </li>
</a>
<br>
<a href="https://www.facebook.com/BlissFamilyOfROMs/">
<li>
- <i class="fa fa-facebook"></i> Bliss Facebook </li>
+ <i class="fab fa-facebook"></i> Bliss Facebook </li>
</a>
<a href="https://twitter.com/Bliss_Roms">
<li>
- <i class="fa fa-twitter"></i> Bliss Twitter </li>
+ <i class="fab fa-twitter"></i> Bliss Twitter </li>
</a>
<a href="https://plus.google.com/communities/118265887490106132524">
<li>
- <i class="fa fa-google-plus"></i> Bliss G+ </li>
+ <i class="fab fa-google-plus"></i> Bliss G+ </li>
</a>
</ul>
<p></p>
@@ -262,26 +261,34 @@
<!-- Start BlissRoms resources -->
<a href="https://github.com/BlissRoms">
<li>
- <i class="fa fa-github"></i> BlissRoms Github </li>
+ <i class="fab fa-github"></i> BlissRoms Github </li>
</a>
<a href="https://github.com/BlissRoms-Devices">
<li>
- <i class="fa fa-github"></i> BlissRoms-Devices Github </li>
+ <i class="fab fa-github"></i> BlissRoms-Devices Github </li>
+ </a>
+ <a href="https://github.com/BlissRoms-Kernels">
+ <li>
+ <i class="fab fa-github"></i> BlissRoms-Kernels Github </li>
+ </a>
+ <a href="https://github.com/BlissRoms-Vendor">
+ <li>
+ <i class="fab fa-github"></i> BlissRoms-Vendor Github </li>
</a>
<a href="https://review.blissroms.com">
<li>
- <i class="fa fa-github"></i> BlissRoms Gerrit </li>
+ <i class="fab fa-github"></i> BlissRoms Gerrit </li>
</a>
<!-- End BlissRoms resources-->
<br>
<!-- Start BlissOS resources -->
<a href="https://github.com/BlissRoms-x86">
<li>
- <i class="fa fa-github"></i> BlissOS Github </li>
+ <i class="fab fa-github"></i> BlissOS Github </li>
</a>
<a href="https://github.com/BlissRoms-pine64">
<li>
- <i class="fa fa-github"></i> BlissOS for Pine64 Github </li>
+ <i class="fab fa-github"></i> BlissOS for Pine64 Github </li>
</a>
<a href="https://review-x86.blissroms.com"> </a>
<!-- End BlissOS resources -->
@@ -294,15 +301,15 @@
<ul class="centered">
<a href="https://www.reddit.com/r/BlissRoms">
<li>
- <i class="fa fa-reddit"></i> r/BlissRoms </li>
+ <i class="fab fa-reddit"></i> r/BlissRoms </li>
</a>
<a href="https://www.reddit.com/r/BlissOS">
<li>
- <i class="fa fa-reddit"></i> r/BlissOS </li>
+ <i class="fab fa-reddit"></i> r/BlissOS </li>
</a>
<a href="https://www.reddit.com/r/TeamBliss">
<li>
- <i class="fa fa-reddit"></i> r/TeamBliss </li>
+ <i class="fab fa-reddit"></i> r/TeamBliss </li>
</a>
</ul>
<p></p>
@@ -313,7 +320,7 @@
<div id="team" class="row cover bottom text-center section">
<h2 class="highlight_secondary team-header">Our Team</h2>
<div class="container">
- <h3> It takes alot of talent to make a team run this smoothly.<br>Here are the people that help make it Bliss </h3>
+ <h3> It takes a lot of talent to create an amazing product.<br>Here are the people that help make it Bliss </h3>
<div class="hr big_size_hr invisible_hr">
<i class="fa fa-"></i>
</div>
@@ -731,11 +738,11 @@
</div>
<div class="row">
<div class="col-xs-12 text-center about-tools">
- <p class="text-center">We are a team of designers, developers, maintainers, and business professionals who work together to help achieve the dreams of our teammates and the Android Community. Our goal is to help provide a unique learning environment, using the FOSS mentality, and not only train people how to make and monetize what they aspire to, but also help provide unique business opportunities for new and already existing projects as well.</p>
- <p class="text-center">If you are interested in joining our ROM team, please fill out the form found here:</p>
+ <p class="text-center">We are a team of designers, developers, maintainers, and business professionals working together to help achieve the dreams of our team mates and the Android community. Our goal is to help provide a unique learning environment using the FOSS mentality, to not only train people how to make what they aspire to, but also provide unique business opportunities for new and already existing projects.</p>
+ <p class="text-center">If you are interested in joining our team, please fill out the application:</p>
<a class="btn btn-rounded family-projects--btn" href="https://goo.gl/forms/PdiaAj1PojosmehK2">Join Team Bliss</a>
<p></p>
- <p class="text-center">Or if you represent an already existing project and would like to join the <a href="#family-lt">Bliss Family</a>, please fill out a form by clicking the Join Bliss Family button below</p>
+ <p class="text-center">Or if you already have an existing project and would like to join the <a href="#family-lt">Bliss Family</a>, scroll down below!</p>
<p></p>
</div>
</div>
@@ -751,24 +758,23 @@
<p class="text-center">We are currently in the process of moving into a new era of Bliss. As a ROM team, we worked together to overcome some of the hardest obstacles that a ROM team could face. And in doing so, we have grown and acted as an example to other teams. This growth allowed us to evolve into a family of ROM teams, helping to support one another in our innovative efforts, and inspire work from other community members in the process. </p>
<p class="text-center">This growth allowed us to see many of the needs our fellow community members had, and sparked an idea to allow us all to succeed in the future. This inspired us to start our journey into making that happen, and we have turned Bliss Family of ROMs into a nonprofit corporation, with the intent to enable the development community like never before. </p>
<p></p>
- <p class="text-center">Our Bliss Family projects include applications, ports, ROMs, API's, services, and forks of other projects. Most if not all of our Bliss Family projects will be Open Source, allowing us to truly give back to the community as a team. </p>
+ <p class="text-center">Our Bliss Family projects include applications, ports, ROMs, APIs, services, and forks of other projects. Most if not all of our Bliss Family projects will be open source, allowing us to truly give back to the community as a team. </p>
<p></p>
- <a class="btn btn-rounded family-projects--btn" href="https://goo.gl/kAb7ti" role="button" style="color:#fff;">Submit your project now</a>
<a class="btn btn-rounded family-projects--btn" href="https://www.paypal.me/TeamBliss" target="_blank" role="button" style="color:#fff;">Donate to Bliss Family</a>
<br><br>
</div>
- </div>
- <div class="row">
- <div class="col-xs-12 text-center about-tools">
- <div class="family-header text-center">
- <h2 class="text-center" style="color: #fff;">Bliss Family is accepting applications now!</h2>
+ </div>
+ <div class="row">
+ <div class="col-xs-12 text-center about-tools">
+ <div class="family-header text-center">
+ <h2 class="text-center" style="color: #fff;">Bliss Family is accepting applications now!</h2>
</div>
- <p class="text-center">We are open to the public, and accepting applications now for volunteer only positions (internships coming soon).
- We are accepting people in small managable groups while we grow, and we tend to lean towards the type of people that want to learn and grow with Bliss Family of ROMs.
- Bliss provides the tools, knowledge and the mentorship needed to help bring your development dreams to reality, and all we ask in return is a minimum contribution towards Bliss ROM while you learn and grow in your strengths.</p>
- <p class="text-center">If you are interested in applying for this unique opportunity, please fill out the form below, and we will be in touch with you soon (usually within a few days). </p>
- <a class="btn btn-rounded family-projects--btn" style="color:#fff;" href="https://goo.gl/forms/PdiaAj1PojosmehK2">Join Team Bliss</a>
- <p></p>
+ <p class="text-center">Got a great project idea, but don't have the time or resources to make it a reality? Or having some problems with your project and would like some additional hands?
+ Our team is now accepting applications for new and existing projects!
+ </p>
+ <p class="text-center">If you are interested in applying for this unique opportunity, please fill out the form below, and we will be in touch with you soon (usually within a few days!)</p>
+ <a class="btn btn-rounded family-projects--btn" href="https://goo.gl/kAb7ti" role="button" style="color:#fff;">Submit your project now</a>
+ <p class="text-center">If you're looking for information on how to join our team, please visit our <a href="#family">team section</a> up above.</p>
</div>
</div>
</div>
@@ -787,8 +793,8 @@
<img class="img-circle img-responsive" src="images/invictrix.jpg">
<div class="family-links ">
<div class="family-links-list">
- <a href="https://t.me/InvictusROM" target="_blank"><i class="fa fa-telegram"></i></a>
- <a href="https://plus.google.com/communities/109716291977795337501" target="_blank"><i class="fa fa-google-plus"></i></a>
+ <a href="https://t.me/InvictusROM" target="_blank"><i class="fab fa-telegram"></i></a>
+ <a href="https://plus.google.com/communities/109716291977795337501" target="_blank"><i class="fab fa-google-plus"></i></a>
</div>
<!-- /.family-links-list -->
</div>
@@ -812,8 +818,8 @@
<img class="img-circle img-responsive" src="images/xtremis.jpg">
<div class="family-links ">
<div class="family-links-list">
- <a href="#" target="_blank"><i class="fa fa-telegram"></i></a>
- <a href="#" target="_blank"><i class="fa fa-google-plus"></i></a>
+ <a href="#" target="_blank"><i class="fab fa-telegram"></i></a>
+ <a href="#" target="_blank"><i class="fab fa-google-plus"></i></a>
</div>
<!-- /.family-links-list -->
</div>
@@ -834,10 +840,10 @@
<div class="col-lg-4">
<div class="family">
<div class="family-image text-center">
- <img class="img-circle img-responsive" src="https://lh3.googleusercontent.com/-sK7PJvGhGNs/AAAAAAAAAAI/AAAAAAAAAAw/MksGgq5t7mE/s120-p-rw-no-il/photo.jpg">
+ <img class="img-circle img-responsive" src="images/soap.jpg">
<div class="family-links ">
<div class="family-links-list">
- <a href="https://plus.google.com/u/0/107610198397215674589" target="_blank"><i class="fa fa-google-plus"></i></a>
+ <a href="https://plus.google.com/u/0/107610198397215674589" target="_blank"><i class="fab fa-google-plus"></i></a>
<!--<a href="#" target="_blank"><i class="fa fa-google-plus"></i></a> -->
</div>
<!-- /.family-links-list -->
@@ -856,31 +862,6 @@
</div>
<!-- /.family -->
</div>
- <div class="col-lg-4">
- <div class="family">
- <div class="family-image text-center">
- <img class="img-circle img-responsive" src="images/question-mark.png">
- <div class="family-links ">
- <div class="family-links-list">
- <a href="#" target="_blank"><i class="fa fa-telegram"></i></a>
- <a href="#" target="_blank"><i class="fa fa-google-plus"></i></a>
- </div>
- <!-- /.family-links-list -->
- </div>
- <!-- /.family-links -->
- </div>
- <!-- /.family-image -->
- <div class="family-content text-center">
- <div class="family-name">Your Project</div>
- <div class="family-role">
- <h4>Submit your application now!</h4>
- </div>
- <h4 class="family-description"> Follow the link and fill out an application for your project!<br><br><a class="btn btn-rounded family-projects--btn" role="button" href="https://goo.gl/kAb7ti">Submit your project now</a></h4>
- </div>
- <!-- /.family-content -->
- </div>
- <!-- /.family -->
- </div>
</div>
</div>
</div>
@@ -939,20 +920,20 @@
<h4 class="footer-header">Follow</h4>
<ul class="list-inline">
<li class="">
- <a rel="nofollow" href="https://t.me/OfficialBlissROMs" title="Telegram"><i class="fa fa-telegram fa-4x"></i></a> </li>
+ <a rel="nofollow" href="https://t.me/OfficialBlissROMs" title="Telegram"><i class="fab fa-telegram fa-4x"></i></a> </li>
<li class="">
- <a rel="nofollow" href="https://www.facebook.com/BlissFamilyOfROMs/" title="Facebook"><i class="fa fa-facebook fa-4x"></i></a> </li>
+ <a rel="nofollow" href="https://www.facebook.com/BlissFamilyOfROMs/" title="Facebook"><i class="fab fa-facebook fa-4x"></i></a> </li>
<li class="">
- <a rel="nofollow" href="https://plus.google.com/communities/118265887490106132524" title="Google+"><i class="fa fa-google-plus fa-4x"></i></a>
+ <a rel="nofollow" href="https://plus.google.com/communities/118265887490106132524" title="Google+"><i class="fab fa-google-plus fa-4x"></i></a>
</li>
<li class="">
- <a rel="nofollow" href="https://twitter.com/Bliss_Roms" title="Twitter"><i class="fa fa-twitter fa-4x"></i></a>
+ <a rel="nofollow" href="https://twitter.com/Bliss_Roms" title="Twitter"><i class="fab fa-twitter fa-4x"></i></a>
</li>
</ul>
</div>
</div>
<br>
- <span class="pull-right text-muted small"><a href="https://blissroms.github.io">Bliss Site by Team Bliss</a> ©2017 Team Bliss</span>
+ <span class="pull-right text-muted small"><a href="https://blissroms.com">Bliss Site by Team Bliss</a> ©2017-2018 Team Bliss</span>
</div>
</div>
</footer>
