projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 350771a)
New navbar for small screens (<768px).
authorrsiddharth <rsd@gnu.org>
Sun, 28 Feb 2016 18:34:45 +0000 (13:34 -0500)
committerrsiddharth <rsd@gnu.org>
Sun, 28 Feb 2016 18:34:45 +0000 (13:34 -0500)
2016/assets/css/custom.css patch | blob | blame | history
2016/assets/img/site_logo_alternate-small.png [new file with mode: 0644] patch | blob
2016/includes/banner.html patch | blob | blame | history
2016/includes/common_js.html patch | blob | blame | history
2016/includes/home_js.html patch | blob | blame | history
2016/includes/program_js.html patch | blob | blame | history
2016/includes/register-now.html [new file with mode: 0644] patch | blob
2016/includes/sidebar.html patch | blob | blame | history

diff --git a/2016/assets/css/custom.css b/2016/assets/css/custom.css
index 09d777d1d4de8e6560bc5e54b24d9eeab01fa082..f5495b6ae162f986c529b2168131374ea2700242 100644 (file)
--- a/2016/assets/css/custom.css
+++ b/2016/assets/css/custom.css
@@ -692,6 +692,56 @@ hr {
   right: 1%;
 }
 
+.navbar-default {
+    background-color: rgb(250, 250, 250);
+    border-color: #e7e7e7;
+    border-bottom: 3px solid rgba(88, 208, 121, 0.8);
+}
+
+.navbar-brand {
+    float: left;
+    font-size: 18px;
+    height: 50px;
+    line-height: 20px;
+    margin-bottom: 9px;
+    padding: 15px;
+}
+
+.navbar-toggle {
+    background-color: transparent;
+    background-image: none;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    float: right;
+    margin-bottom: 8px;
+    margin-right: 15px;
+    margin-top: 13px;
+    padding: 9px 10px;
+    position: relative;
+}
+
+.navbar-default .navbar-toggle {
+    border-color: rgb(250, 250, 250);
+}
+
+.navbar-default .navbar-toggle:focus,
+.navbar-default .navbar-toggle:hover {
+    background-color: rgb(245, 245, 245);
+}
+
+.navbar-default .navbar-toggle .icon-bar {
+    background-color: rgb(180, 180, 180);
+}
+
+.navbar-collapse {
+    background-color: rgb(240, 240, 240);
+    border-top: 1px solid transparent;
+    box-shadow: 0 1px 0 rgba(255, 255, 255, 0.1) inset;
+    overflow-x: visible;
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
 
 /* Footer - adapted from <http://getbootstrap.com/examples/sticky-footer/>
 -------------------------------------------------- */
diff --git a/2016/assets/img/site_logo_alternate-small.png b/2016/assets/img/site_logo_alternate-small.png
new file mode 100644 (file)
index 0000000..d8947ae
Binary files /dev/null and b/2016/assets/img/site_logo_alternate-small.png differ
diff --git a/2016/includes/banner.html b/2016/includes/banner.html
index 5269a0c5383af01cc8fc74f873918ab09efe5977..6a197b628436fc62de3eabb2232780ad27994f8c 100755 (executable)
--- a/2016/includes/banner.html
+++ b/2016/includes/banner.html
@@ -1,7 +1,7 @@
   </head>
   <body>
     <div id="wrapper"> <!-- start of wrapper -->
-      <div class="lp-banner"> <!--start of lp banner -->
+      <div class="lp-banner hidden-xs"> <!--start of lp banner -->
                <div class="container"> <!-- start of container -->
                  <div class="row">
                        <div class="lp-head"> <!-- start of lp header -->
@@ -23,10 +23,7 @@
 
             <!-- Start of register button -->
                <div class="col-sm-offset-3 col-sm-3 col-xs-12">
-                 <a class="btn btn-register btn-lg btn-block"
-                    href="https://my.fsf.org/civicrm/event/register?id=29&amp;reset=1">
-                   Register now
-                 </a>
+                  <!--#include virtual="/2016/includes/register-now.html"-->
                  <p class="text-muted text-center">
                    gratis for members and students!
                  </p>
@@ -34,3 +31,39 @@
                  </div>
                </div> <!-- end of header container -->
       </div> <!-- end of lp banner -->
+
+      <!-- start nav for small screens -->
+      <nav class="navbar navbar-default visible-xs">
+        <div class="container-fluid">
+          <!-- Brand and toggle get grouped for better mobile display -->
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
+                    data-target="#lp-navbar-collapse" aria-expanded="false">
+              <span class="sr-only">Toggle navigation</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="/2016/">
+              <img src="/2016/assets/img/site_logo_alternate-small.png"
+                   class="img-responsive"
+                   alt="[ LibrePlanet 2016 &mdash; Fork the System ]" />
+            </a>
+            <p class="navbar-text">
+             <strong>March 19-20, MIT, Cambridge, MA</strong>
+           </p>
+          </div>
+
+          <div class="collapse navbar-collapse" id="lp-navbar-collapse">
+            <ul class="nav navbar-nav">
+              <li><!--#include virtual="/2016/includes/register-now.html"--></li>
+              <!--#include virtual="/2016/includes/nav-list-1.html"-->
+            </ul>
+
+            <ul class="nav navbar-nav">
+              <!--#include virtual="/2016/includes/nav-list-2.html"-->
+            </ul>
+          </div><!-- navbar-collapse end -->
+        </div><!-- navbar container-fluid end -->
+      </nav>
+      <!-- end nav for small screens -->
diff --git a/2016/includes/common_js.html b/2016/includes/common_js.html
index a04c03393d64fdf25cc9c92c39b965414991d0b1..90259fb151efbd89bf0fdcdbb0184d2d15d08f03 100755 (executable)
--- a/2016/includes/common_js.html
+++ b/2016/includes/common_js.html
@@ -2,7 +2,8 @@
                src="/2016/assets/js/jquery-1.11.3.min.js"></script>
 <script type="text/javascript"
         src="/2016/assets/js/piwik.js"></script>
-
+<script type="text/javascript"
+       src="/2016/assets/js/bootstrap-3.3.5.min.js"></script>
 <script>
 $(document).ready(logoTextStack);
 
@@ -29,8 +30,10 @@ function logoTextStack() {
      screen_size = $(window).width();
 
      if(screenSize <= 767) {
+         $(".register-now").removeClass("btn btn-register btn-lg btn-block");
          $("#lp-nav").insertAfter("#lp-content");
      } else {
+         $(".register-now").addClass("btn btn-register btn-lg btn-block");
          $("#lp-nav").insertBefore("#lp-content");
      }
  }
diff --git a/2016/includes/home_js.html b/2016/includes/home_js.html
index bb7479475501042f63a042d126ab1ba3b01d8ff5..eb4acefa029e65e95d19bb1c6b0f063b2e6dcd37 100644 (file)
--- a/2016/includes/home_js.html
+++ b/2016/includes/home_js.html
@@ -1,5 +1,3 @@
-<script type="text/javascript"
-       src="/2016/assets/js/bootstrap-3.3.5.min.js"></script>
 <script>
          $(document).ready(function() {
         $('.carousel').carousel({ interval:6000 });
diff --git a/2016/includes/program_js.html b/2016/includes/program_js.html
index ecc41332dc59ccb338be80aa4a9d806a98c255a4..829ffe10661958bbc0cb115bbc3ddd6522815850 100755 (executable)
--- a/2016/includes/program_js.html
+++ b/2016/includes/program_js.html
@@ -1,6 +1,3 @@
-<script type="text/javascript"
-       src="/2016/assets/js/bootstrap-3.3.5.min.js"></script>
-
 <script>
   $('.collapse').removeClass('in');
 
diff --git a/2016/includes/register-now.html b/2016/includes/register-now.html
new file mode 100644 (file)
index 0000000..92d2823
--- /dev/null
+++ b/2016/includes/register-now.html
@@ -0,0 +1,4 @@
+<a class="btn btn-register btn-lg btn-block register-now"
+   href="https://my.fsf.org/civicrm/event/register?id=29&amp;reset=1">
+  Register now
+</a>
diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html
index c6f7acfb7ec2c15d9858ba135bf6b2c7bcfa3dee..7441a5a589d1b75ea48344ddced6b6e0831d0619 100755 (executable)
--- a/2016/includes/sidebar.html
+++ b/2016/includes/sidebar.html
@@ -22,11 +22,11 @@
                -->
 
 
-               <ul class="nav nav-pills nav-stacked">
+               <ul class="nav nav-pills nav-stacked hidden-xs">
                   <!--#include virtual="/2016/includes/nav-list-1.html"-->
                </ul>
 
-               <ul class="nav nav-pills nav-stacked">
+               <ul class="nav nav-pills nav-stacked hidden-xs">
                   <!--#include virtual="/2016/includes/nav-list-2.html"-->
                </ul>