updated bitmask.net home page to be compatible with new footer

6 files changed, 58 insertions, 107 deletions

diff --git a/files/webapp/stylesheets/tail.scss b/files/webapp/stylesheets/tail.scss
index c84b286..e7b362d 100644
--- a/files/webapp/stylesheets/tail.scss
+++ b/files/webapp/stylesheets/tail.scss
@@ -1,8 +1,7 @@
 //
-// APP STYLES
+// MASTHEAD
 //
 
-
 #masthead {
   background: 50% 50% url(/img/rainbow-masthead-small.png) no-repeat;
   height: 96px;
@@ -16,12 +15,37 @@
   }
 }
 
+body.home #masthead {
+  background: 50% 50% url(/img/rainbow-masthead.png) no-repeat;
+  height: 256px;
+  margin: 0;
+  border-bottom: 0;
+  .text {
+    width: 360px;
+    margin: 0 auto;
+    padding-top: 80px;
+  }
+  .title {
+    font-size: 80px;
+    line-height: 60px;
+    color: #000;
+    margin: 0;
+    font-weight: bold;
+    width: auto;
+  }
+  .tagline {
+    padding-left: 5px;
+    margin-top: 6px;
+    font-size: 18px;
+    line-height: 24px;
+  }
+}
 
 //
 // HOME PAGE STYLES
 //
 
-.home-page {
+body.home {
   .b {
     font-weight: bold;
   }
@@ -33,8 +57,7 @@
   }
 }
 
-//.home-page .navbar .navbar-inner {
-.home-page {
+body.home {
   .navcontainer {
     overflow: hidden;
   }
@@ -67,81 +90,17 @@
   }
 }
 
-.home-page .heroish-unit {
-  background: 50% 50% url(/img/rainbow-masthead.png) no-repeat;
-
-  //background-image:  url('image.png');
-  //background-image:  none,url('image.svg'), url('image.png');
-  //background-size: 100% 100%;
-
-
-
-  height: 256px;
-  //padding: 60px;
-
-  //@include gradient-vertical(#e6e6e6, #ccc);
-  //margin: 10px 0 1px 0;
-  color: black;
-
-  //@include box-shadow(#{0 4px 6px rgba(0,0,0,.15) inset, 0 -2px 5px rgba(0,0,0,.25) inset});
-  //@include box-shadow(#{2px 2px 8px rgba(255,255,255,.3) inset});
-  //@include border-top-radius(4px);
-
-  //.image {
-  //  background-image: url(/img/bitmask-large.png);
-  //  height: 122px;
-  //  width: 256px;
-  //  float: left;
-  //  margin-right: 20px;
-  //}
-  .text {
-    width: 360px;
-    margin: 80px auto 0 auto;
-  }
-  .title {
-    font-size: 80px;
-    line-height: 60px;
-    color: #000;
-    margin: 0;
-    font-weight: bold;
-  }
-  .tagline {
-    padding-left: 5px;
-    margin-top: 6px;
-    font-size: 18px;
-    line-height: 24px;
-  }
-}
-
-.home-page {
-  .introtext {
-    font-size: 18px;
-    line-height: 24px;
-    margin: 10px 0;
-  }
-  .home-buttons {
-    //text-align: left;
-    //a.btn {
-    //  width: 12em;
-    //  padding: 8px;
-    //  margin: 0 0 12px 0;
-    //}
-  }
-
-}
 
 //
 // SMALL SCREEN
 //
 
 @media (max-width: 767px) {
-  .home-page .masthead {
-    margin-left: -20px;
-    margin-right: -20px;
-    .heroish-unit {
-      background: 40% 50% url(/img/rainbow-masthead-small.png) no-repeat;
-      height: 96px;
-    }
+  body.home #masthead {
+    //margin-left: -20px;
+    //margin-right: -20px;
+    background: 40% 50% url(/img/rainbow-masthead-small.png) no-repeat;
+    height: 96px;
     .tagline {
       display: none;
     }
diff --git a/files/webapp/views/home/_content.html.haml b/files/webapp/views/home/_content.html.haml
new file mode 100644
index 0000000..fbca554
--- /dev/null
+++ b/files/webapp/views/home/_content.html.haml
@@ -0,0 +1,8 @@
+.row-fluid
+  .span12
+    %p.introtext
+      <b>Bitmask</b> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
+
+    = render 'common/home_page_buttons', :divider => 'home/bitmask'
+
+    = render 'text'
\ No newline at end of file
diff --git a/files/webapp/views/home/_masthead.html.haml b/files/webapp/views/home/_masthead.html.haml
index b04661c..bce5505 100644
--- a/files/webapp/views/home/_masthead.html.haml
+++ b/files/webapp/views/home/_masthead.html.haml
@@ -1,17 +1,15 @@
-.home-page
-  .masthead
-    .heroish-unit.clearfix
-      .text
-        .title Bitmask
-        .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
-    .navcontainer
-      .navheader
-        %ul.nav.nav-pills
-          %li
-            %a{href:"#how-it-works"} How it works
-          %li
-            %a{href:"#providers"} Supported providers
-          %li
-            %a{href:"#about-us"} About us
-          %li
-            %a{href:"#code"} Fork our code
\ No newline at end of file
+#masthead
+  .text
+    .title Bitmask
+    .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
+.navcontainer
+  .navheader
+    %ul.nav.nav-pills
+      %li
+        %a{href:"#how-it-works"} How it works
+      %li
+        %a{href:"#providers"} Supported providers
+      %li
+        %a{href:"#about-us"} About us
+      %li
+        %a{href:"#code"} Fork our code
diff --git a/files/webapp/views/home/_home_content.html.haml b/files/webapp/views/home/_text.html.haml
index 58f881b..58f881b 100644
--- a/files/webapp/views/home/_home_content.html.haml
+++ b/files/webapp/views/home/_text.html.haml
diff --git a/files/webapp/views/home/index.html.haml b/files/webapp/views/home/index.html.haml
deleted file mode 100644
index 4483ee3..0000000
--- a/files/webapp/views/home/index.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- icon_color = :black
-
-= render 'masthead'
-
-#main.home-page
-  .container-fluid
-    .row-fluid
-      .span12
-        %p.introtext
-          <b>Bitmask</b> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
-
-        = render 'common/home_page_buttons', :divider => 'home/bitmask'
-
-        = render 'home_content'
\ No newline at end of file
diff --git a/services/webapp.json b/services/webapp.json
index c21cfff..0ccc293 100644
--- a/services/webapp.json
+++ b/services/webapp.json
@@ -2,8 +2,8 @@
   "webapp": {
     "admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "etest1", "meanderingcode"],
     "git": {
-      "source": "https://leap.se/git/leap_web",
-      "revision": "origin/develop"
+      "source": "https://github.com/elijh/leap_web",
+      "revision": "origin/feature/pages"
     }
   }
 }