Merge remote-tracking branch 'refs/remotes/BlissRoms/master'
diff --git a/Profiles.json b/Profiles.json
index 1ed6aad..4aa487d 100644
--- a/Profiles.json
+++ b/Profiles.json
@@ -1,155 +1 @@
-{
- "Name": [
- "JackEagle",
- "Jon West",
- "Vaughn Newman",
- "Antonio Luciano",
- "BitOBsession",
- "Blake Leeper",
- "Evan Galvin",
- "Henri Koivuneva",
- "Calin Neamtu",
- "Eric Park (ideaman924)",
- "Patrick Graber (pjgraber03)",
- "Aren Clegg"
- ],
- "Avatar": [
- "https:\/\/lh3.googleusercontent.com\/w7i8JBSfddUp88DpBjjdT_PBODfKTiFV8TKHqyZnsU3m0-ppYXsuafqDtBxakFYW3mjIahKkFYBepZIGRQ=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/hcV4Tp81H4TJskQhpKckcDBqwnETos_ZOxXsQbiZGOT5OxMC-3pOD5i22j1tPiaubWW74tmnwB0ixvGwELQ=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/xhKBfn9HcjWayS9gQizUuh7JATtI4i-OvVv9Q6XPy5v5IyiI44lqRoxtMIyI3rlLc7OCyparEB9OqGT_Vg=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/JOdHk7TYY-SLjAANLuK7t68Oz6w4fDFody-Uwj3rtH6oSZkljniUceYFQ52rbJXeBv4kDgoGhrtamLJlwZc=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/LZrBsYT1S4qQI92uCuWx34QSGDcKpwY1G2h3LXT3tEvMPuSA8d6tiY7CsLYvBCznXk4sJhgr6UFk8pg1oA=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/9HpKaGSOQnmm649RlvoUvJVNgoTEhX1w8X9l48wzBacggsottSVVIEX76RP2tRI2CZYu799RdAmhD1fwbQ=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/eRqBEkS4_cWFEkLce4sVRmyCkAwgsGZwIg1kE12_gjBaghKQ8Omc6V2UJT6q6LwZS8l-LkutUrskyeLFrd0=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/t5rLm4Gex0mmG9VkXzfoXIl0t31pBJwPP798GYNOaLxvi9qjfka867yJl0P-8EXpO8_zeFe-Vq346C56Ww=w1920-h1080-no",
- "https:\/\/lh3.googleusercontent.com\/7nQL9EtHPRivUewvtg9sZR44G4wF4e5pLfFy7pX4CnbmxFyyJuaMBU7zcPi8BLlGF9t1cwTl9fdgUg=w1920-h1080-rw-no",
- "https:\/\/lh3.googleusercontent.com\/-zdwriNcIk1c/AAAAAAAAAAI\/AAAAAAAAExQ\/XBgOqSUsfsY\/s750-p-rw-no\/photo.jpg",
- "https:\/\/lh3.googleusercontent.com\/-vQGXN3Rstjo\/AAAAAAAAAAI\/AAAAAAAAEao\/o2tOywhBHzs\/s750-p-rw-no\/photo.jpg",
- "https:\/\/lh3.googleusercontent.com\/8VqQRqDi3dc35qeC_cipzDE5oW8llKvxq0F-uzwmR9jYJvsMtREEaANi874yCBpKvmWy86MwwXC22JDRRKU=w1920-h1080-no"
- ],
- "Description": [
- "CEO\/Founder",
- "CTO\/Incorporator",
- "Admin\/Board Member",
- "Project Manager\/Board Member",
- "Board Member\/Developer",
- "Board Member\/Developer",
- "Board Member\/Product Technology Strategist",
- "Product Technology Strategist",
- "Lead Development Manager\/Web Developer",
- "Developer",
- "Developer",
- "Developer"
- ],
- "Facebook": [
- "",
- "",
- "",
- "",
- "",
- "",
- "https:\/\/www.facebook.com\/evan.galvin",
- "https:\/\/facebook.com\/hkoivuneva",
- "https:\/\/facebook.com\/nilac8991",
- "https:\/\/facebook.com\/ideaman924",
- "",
- ""
- ],
- "Instagram": [
- "",
- "https:\/\/www.instagram.com\/electrikjesus",
- "",
- "",
- "",
- "",
- "",
- "https:\/\/instagram.com\/hkoivuneva",
- "",
- "",
- "",
- ""
- ],
- "Twitter": [
- "",
- "https:\/\/twitter.com/electrikjesus",
- "",
- "",
- "",
- "",
- "https:\/\/twitter.com\/uknowetheg",
- "https:\/\/twitter.com\/hkoivuneva",
- "",
- "https:\/\/twitter.com\/ideaman924",
- "",
- ""
- ],
- "Telegram": [
- "",
- "https:\/\/t.me\/electrikjesus",
- "https:\/\/t.me\/rwaterspf1",
- "",
- "",
- "",
- "https:\/\/t.me\/UknowEtheG",
- "https:\/\/t.me\/hkoivuneva",
- "https:\/\/t.me\/nilac8991",
- "",
- "",
- ""
- ],
- "GooglePlus": [
- "",
- "https:\/\/plus.google.com\/+JonWest",
- "",
- "",
- "",
- "",
- "https:\/\/plus.google.com\/+EvanGalvin",
- "https:\/\/plus.google.com\/+CălinNeamţu",
- "https:\/\/plus.google.com\/+EricParkideaman924",
- "",
- ""
- ],
- "Email": [
- "",
- "mailto:electrikjesus@gmail.com",
- "mailto:rwaterspf1@floydco.net",
- "",
- "",
- "",
- "mailto:evan.galvin@gmail.com",
- "mailto:henri.koivuneva@gmail.com",
- "mailto:nilac8991@gmail.com",
- "mailto:ideamaneric@gmail.com",
- "",
- ""
- ],
- "XDA": [
- "https:\/\/forum.xda-developers.com\/member.php?u=5216756",
- "https:\/\/forum.xda-developers.com\/member.php?u=928479",
- "https:\/\/forum.xda-developers.com\/member.php?u=4957527",
- "",
- "",
- "",
- "",
- "",
- "https:\/\/forum.xda-developers.com\/member.php?u=4968383",
- "",
- "",
- ""
- ],
- "Github": [
- "",
- "https:\/\/github.com\/electrikjesus",
- "https:\/\/github.com\/rwaterspf1",
- "",
- "",
- "",
- "",
- "https:\/\/github.com\/hkoivuneva",
- "https:\/\/github.com\/nilac8991",
- "https:\/\/github.com\/ideaman924",
- "",
- ""
- ]
-}
+{"Name":["JackEagle","Jon West","Vaughn Newman","Antonio Luciano","BitOBsession","Blake Leeper","Evan Galvin","Henri Koivuneva","Calin Neamtu","Eric Park (ideaman924)","Patrick Graber (pjgraber03)","Aren Clegg"],"Avatar":["https://lh3.googleusercontent.com/w7i8JBSfddUp88DpBjjdT_PBODfKTiFV8TKHqyZnsU3m0-ppYXsuafqDtBxakFYW3mjIahKkFYBepZIGRQ=w1920-h1080-no","https://lh3.googleusercontent.com/hcV4Tp81H4TJskQhpKckcDBqwnETos_ZOxXsQbiZGOT5OxMC-3pOD5i22j1tPiaubWW74tmnwB0ixvGwELQ=w1920-h1080-no","https://lh3.googleusercontent.com/xhKBfn9HcjWayS9gQizUuh7JATtI4i-OvVv9Q6XPy5v5IyiI44lqRoxtMIyI3rlLc7OCyparEB9OqGT_Vg=w1920-h1080-no","https://lh3.googleusercontent.com/JOdHk7TYY-SLjAANLuK7t68Oz6w4fDFody-Uwj3rtH6oSZkljniUceYFQ52rbJXeBv4kDgoGhrtamLJlwZc=w1920-h1080-no","https://lh3.googleusercontent.com/LZrBsYT1S4qQI92uCuWx34QSGDcKpwY1G2h3LXT3tEvMPuSA8d6tiY7CsLYvBCznXk4sJhgr6UFk8pg1oA=w1920-h1080-no","https://lh3.googleusercontent.com/9HpKaGSOQnmm649RlvoUvJVNgoTEhX1w8X9l48wzBacggsottSVVIEX76RP2tRI2CZYu799RdAmhD1fwbQ=w1920-h1080-no","https://lh3.googleusercontent.com/eRqBEkS4_cWFEkLce4sVRmyCkAwgsGZwIg1kE12_gjBaghKQ8Omc6V2UJT6q6LwZS8l-LkutUrskyeLFrd0=w1920-h1080-no","https://lh3.googleusercontent.com/t5rLm4Gex0mmG9VkXzfoXIl0t31pBJwPP798GYNOaLxvi9qjfka867yJl0P-8EXpO8_zeFe-Vq346C56Ww=w1920-h1080-no","https://lh3.googleusercontent.com/7nQL9EtHPRivUewvtg9sZR44G4wF4e5pLfFy7pX4CnbmxFyyJuaMBU7zcPi8BLlGF9t1cwTl9fdgUg=w1920-h1080-rw-no","https://lh3.googleusercontent.com/-zdwriNcIk1c/AAAAAAAAAAI/AAAAAAAAExQ/XBgOqSUsfsY/s750-p-rw-no/photo.jpg","https://lh3.googleusercontent.com/-vQGXN3Rstjo/AAAAAAAAAAI/AAAAAAAAEao/o2tOywhBHzs/s750-p-rw-no/photo.jpg","https://lh3.googleusercontent.com/8VqQRqDi3dc35qeC_cipzDE5oW8llKvxq0F-uzwmR9jYJvsMtREEaANi874yCBpKvmWy86MwwXC22JDRRKU=w1920-h1080-no"],"Description":["CEO/Founder","CTO/Incorporator","Admin/Board Member","Project Manager/Board Member","Board Member/Developer","Board Member/Developer","Board Member/Product Technology Strategist","Product Technology Strategist","Lead Development Manager/Web Developer","Developer","Developer","Developer"],"Facebook":["","","","","","","https://www.facebook.com/evan.galvin","https://facebook.com/hkoivuneva","https://facebook.com/nilac8991","https://facebook.com/ideaman924","",""],"Instagram":["","https://www.instagram.com/electrikjesus","","","","","","https://instagram.com/hkoivuneva","","","",""],"Twitter":["","https://twitter.com/electrikjesus","","","","","https://twitter.com/uknowetheg","https://twitter.com/hkoivuneva","","https://twitter.com/ideaman924","",""],"Telegram":["","https://t.me/electrikjesus","https://t.me/rwaterspf1","","","","https://t.me/UknowEtheG","https://t.me/hkoivuneva","https://t.me/nilac8991","","",""],"GooglePlus":["","https://plus.google.com/+JonWest","","","","","https://plus.google.com/+EvanGalvin","","https://plus.google.com/+CălinNeamţu","https://plus.google.com/+EricParkideaman924","",""],"Email":["","mailto:electrikjesus@gmail.com","mailto:rwaterspf1@floydco.net","","","","mailto:evan.galvin@gmail.com","mailto:henri.koivuneva@gmail.com","mailto:nilac8991@gmail.com","mailto:ideamaneric@gmail.com","",""],"XDA":["https://forum.xda-developers.com/member.php?u=5216756","https://forum.xda-developers.com/member.php?u=928479","https://forum.xda-developers.com/member.php?u=4957527","","","","","","https://forum.xda-developers.com/member.php?u=4968383","","",""],"Github":["","https://github.com/electrikjesus","https://github.com/rwaterspf1","","","","","https://github.com/hkoivuneva","https://github.com/nilac8991","https://github.com/ideaman924","",""]}
diff --git a/README.md b/README.md
index f64a85b..8ad8730 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,2 @@
# blissroms.github.io
-Temporary website for Team Bliss / Bliss ROMs
-
-This site is based on a pen, found here: http://codepen.io/k-ya/pen/eJNgWO
+New website for Team Bliss / Bliss Roms / Bliss OS
diff --git a/index.html b/index.html
index 5f19f48..6058116 100644
--- a/index.html
+++ b/index.html
@@ -210,7 +210,7 @@
<!-- End #Contact -->
</div>
<!-- break -->
-
+
<div id="team" class="row cover bottom text-center section">
<h2 class="highlight_secondary team-header">Our Team</h2>
<div class="container">
@@ -326,7 +326,7 @@
</div>
<!-- /.team -->
</div>
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<div class="team">
<div class="team-image">
@@ -354,7 +354,7 @@
</div>
<!-- /.team -->
</div>
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<div class="team">
<div class="team-image">
@@ -382,12 +382,12 @@
</div>
<!-- /.team -->
</div>
-
+
<!-- End LINE -->
-
+
<!-- <div class="hr invisible_hr"> <i class="fa fa-"></i> </div>
<div class="row"> -->
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<div class="team">
<div class="team-image">
@@ -415,10 +415,10 @@
</div>
<!-- /.team -->
</div>
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<!-- add col-md-offset-1 for 5 members -->
-
+
<div class="team">
<div class="team-image">
<img src="https://lh3.googleusercontent.com/-zdwriNcIk1c/AAAAAAAAAAI/AAAAAAAAExQ/XBgOqSUsfsY/s750-p-rw-no/photo.jpg" class="img-circle img-responsive">
@@ -444,12 +444,12 @@
<!-- /.team-content -->
</div>
<!-- /.team -->
-
+
</div>
-
-
+
+
<div class="col-md-2 col-sm-4 col-xs-6">
-
+
<div class="team">
<div class="team-image">
<img src="https://lh3.googleusercontent.com/-vQGXN3Rstjo/AAAAAAAAAAI/AAAAAAAAEao/o2tOywhBHzs/s750-p-rw-no/photo.jpg" class="img-circle img-responsive">
@@ -475,9 +475,9 @@
<!-- /.team-content -->
</div>
<!-- /.team -->
-
+
</div>
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<div class="team">
<div class="team-image">
@@ -494,9 +494,9 @@
<!-- /.team-links -->
</div>
<!-- /.team-image -->
-
+
<!-- END BOARD MEMBERS -->
-
+
<div class="team-content">
<div class="team-name">Henri Koivuneva</div>
<div class="team-role">
@@ -508,7 +508,7 @@
</div>
<!-- /.team -->
</div>
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<div class="team">
<div class="team-image">
@@ -536,7 +536,7 @@
</div>
<!-- /.team -->
</div>
-
+
<div class="col-md-2 col-sm-4 col-xs-6">
<div class="team">
<div class="team-image">
@@ -564,7 +564,7 @@
</div>
<!-- /.team -->
</div>
-
+
</div>
</div>
@@ -573,7 +573,7 @@
<!-- Close Team -->
<div id="family" class="row cover">
<div class="container">
- <div class="family-header text-center">
+ <div class="family-header text-center">
<h2 class="text-center">About Bliss Family</h2></div>
<div class="row">
<div class="text-center">
@@ -586,16 +586,16 @@
<p class="text-center">Or if you represent an already existing project and would like to join the Bliss Family, please fill out the form found here:
</p>
<a class="btn btn-rounded family-projects--btn" href="https://goo.gl/kAb7ti" role="button">Join Bliss Family</a>
-
+
</div><br/> <br/>
- <div class="family-header text-center">
+ <div class="family-header text-center">
<h2 class="text-center">Bliss Family Projects</h2></div>
<div class="center">
<h4 class="text-center highlight_secondary">The Bliss Family projects we currently support can be found below:<br><br></h4>
<div class="col-lg-3">
- <div class="family">
+ <div class="family">
<div class="family-image text-center">
- <img class="img-circle img-responsive" src="images/deso.jpg">
+ <img class="img-circle img-responsive" src="images/deso.jpg">
<div class="family-links ">
<div class="family-links-list">
<a href="https://t.me/DesolationDomination" target="_blank"><i class="fa fa-paper-plane"></i></a>
@@ -670,7 +670,7 @@
</div>
<!-- /.family -->
</div>
-
+
<div class="col-lg-3">
<div class="family">
<div class="family-image text-center">
@@ -699,17 +699,17 @@
</div>
<!-- /.family -->
</div>
-
+
</div>
</div>
</div>
</div>
<!-- End #About -->
-
-
+
+
<footer class="footer">
- <div class="footer container-fluid ">
-
+ <div class="footer container-fluid ">
+
<div class="container-fluid">
<div class="row ">
<div class="col-xs-6 col-sm-3 column footer-header">
@@ -737,7 +737,7 @@
<div class="form-group">
<input type="email" class="form-control" name="email" required="" placeholder="Email*" data-form-field="Email">
</div>
-
+
<div class="form-group">
<textarea class="form-control" name="message" placeholder="Message" rows="3" data-form-field="Message"></textarea>
</div>
@@ -757,11 +757,12 @@
</div>
</div>
<br/>
- <span class="pull-right text-muted small"><a href="http://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 Team Bliss</span>
</div>
-
+
</div>
</footer>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.1/js/tether.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/jquery.scrollto/2.1.0/jquery.scrollTo.min.js"></script>