merge: merge upstream changes
diff --git a/index.html b/index.html
index 0e27699..7623dc6 100644
--- a/index.html
+++ b/index.html
@@ -23,7 +23,7 @@
<script> (adsbygoogle = window.adsbygoogle || []).push({ google_ad_client: "ca-pub-7639560510014441", enable_page_level_ads: true }); </script>
</head>
-<body class="" style="">
+<body class="" >
<!-- Navbar -->
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="padding-right: 41px;">
<div class="container pt-6">
@@ -32,7 +32,7 @@
<div class="col-md-12"><a class="navbar-brand" href="#"><b><b>Bliss ROMs</b></b></a></div>
</div>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar2SupportedContent" aria-controls="navbar2SupportedContent" aria-expanded="true" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button>
- <div class="navbar-collapse text-center justify-content-end collapse show" id="navbar2SupportedContent" style="">
+ <div class="navbar-collapse text-center justify-content-end collapse show" id="navbar2SupportedContent">
<ul class="navbar-nav">
<li class="nav-item mx-2">
<a class="nav-link" href="#features"><b><b>Features</b></b></a>
@@ -53,7 +53,7 @@
<a class="nav-link" href="#gear"><b><b>Gear</b></b></a>
</li>
</ul>
- <a class="btn navbar-btn mx-2 btn-primary shadowed" href="#download"><b><b>Download</b></b></a>
+ <a class="btn navbar-btn mx-2 btn-primary" href="#download"><b><b>Download</b></b></a>
</div>
</div>
</nav>
@@ -61,10 +61,13 @@
<div class="section-fade-out pt-5" style="background-image: url("https://i.imgur.com/BOGKaGy.jpg"); background-position: center bottom;">
<div class="container pt-5">
<div class="row">
- <div class="col-md-4 ">
+ <div class="col-md-5">
<div class="col-md-12">
<h1 class="display-3 mb-4">Bliss</h1>
- <p class="lead mb-4">An Open Source OS, based on Android, that incorporates many customizations options and added security features. <br><br>And it is available for...</p>
+ <p class="lead">An Open Source OS, based on Android, that incorporates many customizations options and added security features. <br><br>And it is available for...</p>
+ <div class="d-inline-flex justify-content-center align-items-center mx-auto">
+ <a href="#download" class="btn btn-lg btn-primary d-inline-flex justify-content-center align-items-center mx-auto">Download Now</a>
+ </div>
</div>
</div>
<div class="d-flex justify-content-center align-items-center flex-grow-1" align="center" style="max-height: 100%;max-width: 100%;vertical-align: middle;display: inline-flex;float: none; margin-top: -8%;">
@@ -94,15 +97,12 @@
</div>
</div>
</div>
- <div class="row">
- <div class="col-md-12 d-inline-flex justify-content-center align-items-center mx-auto mt-5"><a href="#download" class="btn btn-lg btn-primary d-inline-flex justify-content-center align-items-center mx-auto">Download Now</a></div>
- </div>
</div>
</div>
<!-- Article style section -->
<div class="py-5">
<div class="container">
- <div class="row" style="" id="about">
+ <div class="row" id="about">
<div class="col-md-6 order-2 order-md-1 animate-in-left d-flex flex-grow-1 align-items-center justify-content-center">
<div class="flex-grow-1 justify-content-center align-items-center">
<div class="device iphone animate-in-left d-flex flex-grow-1 align-items-center justify-content-center">
@@ -125,7 +125,7 @@
</div>
<div class="col-md-6 align-self-center order-1 order-md-2 my-3 text-md-left text-center">
<h3 class="display-3">About Bliss</h3>
- <p class="my-4 text-light">We are a volunteer based non-profit organization that works to maintain various open source & closed source development projects. We provide the inspiration, training and mentorship to help the dreams of those that join, become reality.<br><br>One of our main focuses is to provide a quality ROM/OS that can run on all your devices, preserving customizations and options by syncing across all platforms. We try to include all the features you can imagine, for just about any situation.<br><br>You will also find us regularly contributing to other projects as well because we believe that building our community through positive influence will go further than building an empire on selfish goals.</p>
+ <p class="my-4 body-font">We are a volunteer based non-profit organization that works to maintain various open source & closed source development projects. We provide the inspiration, training and mentorship to help the dreams of those that join, become reality.<br><br>One of our main focuses is to provide a quality ROM/OS that can run on all your devices, preserving customizations and options by syncing across all platforms. We try to include all the features you can imagine, for just about any situation.<br><br>You will also find us regularly contributing to other projects as well because we believe that building our community through positive influence will go further than building an empire on selfish goals.</p>
<a class="btn btn-outline-primary" href="bfor.html">Learn More About Us</a>
</div>
</div>
@@ -133,17 +133,19 @@
</div>
<!-- Features -->
<div class="text-center bg-primary py-5 px-5">
- <div class="d-flex justify-content-center align-items-center px-0 container-fluid mx-auto">
- <div class="row mx-auto d-flex align-items-center justify-content-center">
- <div class="col-md-12">
- <div class="row mx-auto">
- <div class="align-self-center col-lg-7 text-md-left text-center">
- <h3 class="display-3">Moar Bliss</h3>
- <p class="my-4 text-light">Bliss comes in a few variants. On top of our traditional device builds of Bliss ROM, our GSI/Treble builds will work on most treble compatible devices (Android Pie+) And our x86 variant (Bliss OS) is made to work with the Linux kernel, and supports booting with MBR/UEFI type bootloaders. So just about any Windows/Linux PC or tablet released in the last 4 years. We are always developing with usability in mind, and supporting more and more devices each week. <br></p>
- <a class="btn shadowed btn-dark" href="#download">Download</a>
+ <div class="container">
+ <div class="d-flex justify-content-center align-items-center px-0 container-fluid mx-auto">
+ <div class="row mx-auto d-flex align-items-center justify-content-center">
+ <div class="col-md-12">
+ <div class="row mx-auto">
+ <div class="align-self-center col-lg-6 text-md-left text-center">
+ <h3 class="display-3">Moar Bliss</h3>
+ <p class="my-4 body-font">Bliss comes in a few variants. On top of our traditional device builds of Bliss ROM, our GSI/Treble builds will work on most treble compatible devices (Android Pie+) And our x86 variant (Bliss OS) is made to work with the Linux kernel, and supports booting with MBR/UEFI type bootloaders. So just about any Windows/Linux PC or tablet released in the last 4 years. We are always developing with usability in mind, and supporting more and more devices each week. <br></p>
+ <a class="btn btn-dark" href="#download">Download</a>
+ </div>
+ <div class="align-self-center mt-5 col-lg-5 offset-1 animate-in-right">
+ <img class="img-fluid d-block" src="images/bliss_surface.png"> </div>
</div>
- <div class="align-self-center mt-5 col-lg-5 animate-in-right">
- <img class="img-fluid d-block" src="images/bliss_surface.png"> </div>
</div>
</div>
</div>
@@ -156,7 +158,7 @@
<h3 class="display-3">Bliss Features</h3>
</div>
</div>
- <div class="row" style="">
+ <div class="row" >
<div class="align-self-center text-md-right text-center col-lg-4 col-md-6">
<h4 class="text-primary"><b>Focus on design</b></h4>
<p class="mb-5 text-white">We include many options for customization and theming throughout the OS</p>
@@ -165,8 +167,8 @@
<h4 class="text-primary"><b>Performance</b></h4>
<p class="mb-5 text-white">Focused on speed and stability with tweaks to assist in the most demanding applications</p>
</div>
- <div class="my-3 d-none d-lg-block animate-in-down col-md-4" style="">
- <img class="img-fluid d-block" src="images/Phone_features_dark.png" style=""> </div>
+ <div class="my-3 d-none d-lg-block animate-in-down col-md-4" >
+ <img class="img-fluid d-block" src="images/Phone_features_dark.png" > </div>
<div class="align-self-center text-md-left text-center col-lg-4 col-md-6">
<h4 class="text-primary"><b>Battery-friendly</b></h4>
<p class="mb-5 text-white">Extra options are provided to help tune battery consumption to the best levels</p>
@@ -183,13 +185,13 @@
<div class="section">
<div class="container d-flex justify-content-center align-items-center flex-grow-1 mx-auto w-75 py-4">
<div class="row">
- <div class="col-md-6 text-center mx-auto flex-center">
+ <div class="col-md-6 text-left mx-auto flex-center">
<div>
<h2 class="my-3 highlight_secondary team-header text-white no-wrap">We volunteer our time.</h2>
- <p class="mb-3">We are a 501(c3) nonprofit, run by people that donate their free time towards the project. We do our best to bring a quality OS to your device, while working a real job on the side in most cases. Please consider showing us we're on the right track by clicking the button below and making a small contribution towards our efforts.</p> <a href="https://www.paypal.me/TeamBliss" class="btn btn-primary">Buy Us a Coffee</a>
+ <p class="mb-3 body-font">We are a 501(c3) nonprofit, run by people that donate their free time towards the project. We do our best to bring a quality OS to your device, while working a real job on the side in most cases. Please consider showing us we're on the right track by clicking the button below and making a small contribution towards our efforts.</p> <a href="https://www.paypal.me/TeamBliss" class="btn btn-primary">Buy Us a Coffee</a>
</div>
</div>
- <div class="col-md-6 py-5"><img class="img-fluid d-block d-flex align-items-center justify-content-center flex-grow-1 mx-auto animate-in-right" src="images/coffee-break.svg" width="300"></div>
+ <div class="col-md-5 py-5 offset-1"><img class="img-fluid d-block d-flex align-items-center justify-content-center flex-grow-1 mx-auto animate-in-right" src="images/coffee-break.svg" width="300"></div>
</div>
</div>
</div>
@@ -202,18 +204,18 @@
<div class="download-card-common download-card-white download-card-one">
<div class="card-header-rows">
<div class="card-header-column-one">
- <h3 class="card-header-title"><b>Bliss ROM</b></h3>
+ <h3 class="card-header-title mb-2"><b>Bliss ROM</b></h3>
<img src="https://img.shields.io/sourceforge/dm/blissroms.svg?style=for-the-badge&logo=appveyor&colorB=blue" max-width="160px" width="100%">
</div>
<div class="card-header-column-two">
<h2 class="mb-0 card-or-donation"><b>$0</b></h2>
- <p class="card-or-donation">Or Donation</p>
+ <p class="card-or-donation mt-2">Or Donation</p>
</div>
</div>
<div class="card-main-area">
<div class="text">
- <p class="my-3">This is Bliss for your typical Android devices.<br>GSI/Treble options are also available. <br>These builds are available in a flashable .zip format, and our GSI/Treble builds are also available in .img format for flashing with fastboot</p>
- <ul class="pl-3">
+ <p class="my-3 body-font">This is Bliss for your typical Android devices.<br>GSI/Treble options are also available. <br>These builds are available in a flashable .zip format, and our GSI/Treble builds are also available in .img format for flashing with fastboot</p>
+ <ul class="pl-3 body-font">
<li>Multiple Devices Supported</li>
<li>Tons of Customization Options</li>
<li>GSI/Treble builds support multiple devices</li>
@@ -221,26 +223,26 @@
</ul>
</div>
<div class="buttons">
- <a class="btn btn-primary mt-3 text-white" href="" target="_blank" data-target="#popup-modal6" data-toggle="modal">Learn More </a>
<a class="btn btn-primary mt-3 text-white" data-target="#popup-modal1" data-toggle="modal">Download Now</a>
+ <a class="btn mt-3 text-black" href="" target="_blank" data-target="#popup-modal6" data-toggle="modal">Learn More </a>
</div>
</div>
</div>
<div class="download-card-common download-card-white download-card-two">
<div class="card-header-rows">
<div class="card-header-column-one">
- <h3 class="card-header-title"><b>Bliss OS (x86)</b></h3>
+ <h3 class="card-header-title mb-2"><b>Bliss OS (x86)</b></h3>
<img src="https://img.shields.io/sourceforge/dm/blissos-x86.svg?style=for-the-badge&logo=appveyor&colorB=blue" max-width="160px" width="100%">
</div>
<div class="card-header-column-two">
<h2 class="mb-0 card-or-donation"><b>$0</b></h2>
- <p class="card-or-donation">Or Donation</p>
+ <p class="card-or-donation mt-2">Or Donation</p>
</div>
</div>
<div class="card-main-area">
<div class="text">
- <p class="my-3">This is Bliss, running as a native or emulated* OS for PCs.. These builds are compatible with PCs, MacBooks and Chromebooks equipped with x86/x86_64 compatible CPUs. Supports both BIOS/CSM and UEFI boot.<br><br>*Only KVM/QEMU emulation is currently supported</p>
- <ul class="pl-3">
+ <p class="my-3 body-font">This is Bliss, running as a native or emulated* OS for PCs.. These builds are compatible with PCs, MacBooks and Chromebooks equipped with x86/x86_64 compatible CPUs. Supports both BIOS/CSM and UEFI boot.<br><br>*Only KVM/QEMU emulation is currently supported</p>
+ <ul class="pl-3 body-font">
<li>Limited Online Support (<a href="https://forum.xda-developers.com/bliss-roms/bliss-roms-development/bliss-os-pie-beta-preview-t3855917">visit XDA thread</a>)<br></li>
<li>Multiple Device Compatibility</li>
<li>Multiple Kernel & Mesa options </li>
@@ -248,8 +250,8 @@
</ul>
</div>
<div class="buttons">
- <a class="btn btn-primary mt-3 text-white" href="" target="_blank" data-target="#popup-modal4" data-toggle="modal">Learn More </a>
- <a class="btn btn-primary mt-3 text-white" href="" data-target="#popup-modal2" data-toggle="modal">Download Now</a>
+ <a class="btn btn-primary mt-3 text-white" href="" data-target="#popup-modal2" data-toggle="modal">Download Now</a>
+ <a class="btn mt-3 text-black" href="" target="_blank" data-target="#popup-modal4" data-toggle="modal">Learn More </a>
</div>
</div>
</div>
@@ -267,8 +269,8 @@
</div>
<div class="card-main-area">
<div class="text">
- <p class="my-3">This is for businesses and educational institutions, that wish to use Bliss ROM or OS on specific Android or x86 hardware. This service includes hourly fees for development as well as per device pricing options*. </p>
- <ul class="pl-3">
+ <p class="my-3 body-font">This is for businesses and educational institutions, that wish to use Bliss ROM or OS on specific Android or x86 hardware. This service includes hourly fees for development as well as per device pricing options*. </p>
+ <ul class="pl-3 body-font">
<li>Tech Support Contract Included</li>
<li>Extra Kernel & device options **</li>
<li>Full Source Code Available</li>
@@ -345,7 +347,7 @@
<p class="text-center"><b>Bootable Installer supports BIOS/CSM and UEFI boot. We recommend using Rufus to flash the ISO to a USB drive, and boot into that to test by running in Live mode. If that works, use the USB drive and boot into the installer to install/upgrade</b></p>
<div class="modal-social text-right">
<div class="row">
- <div style="" class="d-flex justify-content-center align-items-center flex-grow-1">
+ <div class="d-flex justify-content-center align-items-center flex-grow-1">
<a class="btn btn-primary btn-block" target="”_blank”" href="https://forum.xda-developers.com/bliss-roms/bliss-roms-development/bliss-os-pie-beta-preview-t3855917">Bliss OS XDA Thread</a>
</div>
</div>
@@ -402,7 +404,7 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-body px-3 bg-dark">
- <h1 class="text-center" style=""> Thanks for your interest in Bliss ROM/OS Development</h1>
+ <h1 class="text-center" > Thanks for your interest in Bliss ROM/OS Development</h1>
<p class="text-center">Please Fill out the form below, leaving as much detail as possible about your target device* and or opportunity and we will be in touch shortly.<br></p>
<p class="text-center" style="font-size:.75em;">* Inquiries requesting us to work on a single device, already on the consumer market will be ignored. This opportunity is for manufacturers and OEM's only. </p>
<form action="mailto:blissfamilyroms@gmail.com" method="GET" data-form-title="CONTACT US">
@@ -419,7 +421,7 @@
</div>
</div>
- <div class="py-5" id="team" style="">
+ <div class="py-5" id="team" >
<div class="container">
<div class="row">
<div class="mx-auto col-md-12 text-center">
@@ -523,15 +525,15 @@
<div class="row d-flex justify-content-between">
<div class="col-md-4 col-lg-3 p-4"> <img class="img-fluid d-block" width="1500" src="images/560.jpg">
<h4 class="my-3"> <b>T-Shirts</b></h4>
- <p><b>Be the first one on your block to sport Bliss on your back. Various sizes and colors available.</b></p>
+ <p class="body-font"><b>Be the first one on your block to sport Bliss on your back. Various sizes and colors available.</b></p>
</div>
<div class="col-md-4 col-lg-3 p-4"> <img class="img-fluid d-block" src="images/560 (1).jpg" width="1500">
<h4 class="my-3"> <b>Hoodies</b></h4>
- <p><b>Keep warm in style. Wr have hoodies and sweatshirts available. Various sizes and colors options too.</b></p>
+ <p class="body-font"><b>Keep warm in style. Wr have hoodies and sweatshirts available. Various sizes and colors options too.</b></p>
</div>
<div class="col-md-4 col-lg-3 p-4"> <img class="img-fluid d-block" src="images/560 (2).jpg" width="1500">
<h4 class="my-3"> <b>Tank Tops</b></h4>
- <p><b>It's all about the Bliss when you are wearing one of our tank tops. Various sizes and colors available.</b></p>
+ <p class="body-font"><b>It's all about the Bliss when you are wearing one of our tank tops. Various sizes and colors available.</b></p>
</div>
</div>
<div class="row">
@@ -539,7 +541,7 @@
<div class="card">
<div class="card-body">
<h4 class="card-title"><b>Want More?</b></h4>
- <p class="card-text">We are constantly updating our selection of apparel, adding more cool designs and options as we go. So make sure you check back for any updates. </p> <a class="btn btn-primary" href="https://teespring.com/stores/bliss-family-store-2">Visit Our Teespring Store <i class="fa fa-shopping-cart fa-fw"></i></a>
+ <p class="card-text body-font">We are constantly updating our selection of apparel, adding more cool designs and options as we go. So make sure you check back for any updates. </p> <a class="btn btn-primary" href="https://teespring.com/stores/bliss-family-store-2">Visit Our Teespring Store <i class="fa fa-shopping-cart fa-fw"></i></a>
</div>
</div>
</div>
@@ -552,30 +554,30 @@
<div class="col-lg-3 col-6 p-3">
<h5> <b>Socials</b></h5>
<ul class="list-unstyled text-primary">
- <li class="text-primary"> <a href="https://t.me/Team_Bliss_Community" class="text-info">BlissROMs Telegram</a> </li>
- <li> <a href="https://t.me/blissx86" class="text-info">Bliss OS Telegram</a> </li>
- <li> <a href="https://www.facebook.com/BlissFamilyOfROMs/" class="text-info">Bliss Facebook</a> </li>
- <li> <a href="https://twitter.com/Bliss_Roms" class="text-info">Bliss Twitter</a> </li>
+ <li class="text-primary"> <a href="https://t.me/Team_Bliss_Community">BlissROMs Telegram</a> </li>
+ <li> <a href="https://t.me/blissx86">Bliss OS Telegram</a> </li>
+ <li> <a href="https://www.facebook.com/BlissFamilyOfROMs/">Bliss Facebook</a> </li>
+ <li> <a href="https://twitter.com/Bliss_Roms">Bliss Twitter</a> </li>
</ul>
</div>
<div class="col-lg-3 col-6 p-3">
<h5> <b>Sources</b></h5>
<ul class="list-unstyled">
- <li> <a href="https://review.blissroms.com" class="text-info">BlissROMs Gerrit Review</a> </li>
- <li> <a href="https://github.com/BlissRoms" class="text-info">BlissROMs GitHub</a> </li>
- <li> <a href="https://github.com/BlissRoms-Devices" style="" class="text-info">BlissROMs-Devices GitHub</a> </li>
- <li> <a href="https://github.com/BlissRoms-Kernels" class="text-info">BlissROMs-Kernels GitHub</a> </li>
- <li> <a href="https://github.com/BlissRoms-Vendor" class="text-info">BlissROMs-Vendor GitHub</a> </li>
- <li> <a href="https://github.com/BlissRoms-x86" class="text-info">Bliss OS GitHub</a> </li>
- <li> <a href="https://github.com/BlissRoms-pine64" class="text-info">BlissROMs-PINE64 GitHub</a> </li>
+ <li> <a href="https://review.blissroms.com" >BlissROMs Gerrit Review</a> </li>
+ <li> <a href="https://github.com/BlissRoms" >BlissROMs GitHub</a> </li>
+ <li> <a href="https://github.com/BlissRoms-Devices" >BlissROMs-Devices GitHub</a> </li>
+ <li> <a href="https://github.com/BlissRoms-Kernels" >BlissROMs-Kernels GitHub</a> </li>
+ <li> <a href="https://github.com/BlissRoms-Vendor" >BlissROMs-Vendor GitHub</a> </li>
+ <li> <a href="https://github.com/BlissRoms-x86" >Bliss OS GitHub</a> </li>
+ <li> <a href="https://github.com/BlissRoms-pine64" >BlissROMs-PINE64 GitHub</a> </li>
</ul>
</div>
<div class="col-lg-3 col-6 p-3">
<h5>Subreddits</h5>
<ul class="list-unstyled">
- <li> <a href="https://www.reddit.com/r/BlissRoms" class="text-info">BlissROMs</a> </li>
- <li> <a href="https://www.reddit.com/r/BlissOS" class="text-info">Bliss OS</a> </li>
- <li> <a href="https://www.reddit.com/r/TeamBliss" class="text-info">TeamBliss</a> </li>
+ <li> <a href="https://www.reddit.com/r/BlissRoms" >BlissROMs</a> </li>
+ <li> <a href="https://www.reddit.com/r/BlissOS" >Bliss OS</a> </li>
+ <li> <a href="https://www.reddit.com/r/TeamBliss" >TeamBliss</a> </li>
</ul>
</div>
<div class="col-lg-3 col-md-3 p-3">
diff --git a/neon.css b/neon.css
index 8e89964..7fc1b2c 100644
--- a/neon.css
+++ b/neon.css
@@ -149,7 +149,7 @@
background-color: transparent;
-webkit-text-decoration-skip: objects; }
a:hover {
- color: white;
+ color: #0080ff;
text-decoration: none; }
a:not([href]):not([tabindex]) {
@@ -354,6 +354,12 @@
font-weight: 300;
line-height: 1.2; }
+.body-font {
+ font-size: 16px;
+ line-height: 27px;
+ letter-spacing: 1px;
+}
+
hr {
margin-top: 1.5rem;
margin-bottom: 1.5rem;
@@ -374,6 +380,10 @@
padding-left: 0;
list-style: none; }
+.list-unstyled a {
+ color: white;
+}
+
.list-inline {
padding-left: 0;
list-style: none; }
@@ -1827,10 +1837,11 @@
box-shadow: 0 0 0 0.2rem rgba(48, 48, 48, 0.5); }
.btn-outline-primary {
- color: #0080ff;
+ color: #fff;
+ letter-spacing: 1px;
background-color: transparent;
background-image: none;
- border-color: #0080ff; }
+ border-color: #fff; }
.btn-outline-primary:hover {
color: #fff;
background-color: #0080ff;
@@ -3058,9 +3069,9 @@
color: #fff; }
.navbar-dark .navbar-nav .nav-link {
- color: rgba(255, 255, 255, 0.5); }
+ color: rgba(255, 255, 255, 1); }
.navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {
- color: rgba(255, 255, 255, 0.75); }
+ color: rgba(255, 255, 255, 1); }
.navbar-dark .navbar-nav .nav-link.disabled {
color: rgba(255, 255, 255, 0.25); }
@@ -6244,7 +6255,9 @@
.text-white {
color: #fff !important; }
-
+.text-black {
+ color: #000 !important;
+}
.text-primary {
color: #0080ff !important; }