Commits

Sean Wilkinson  committed 16f0e38

Preliminary work moving to Twitter Bootstrap 3.0

  • Participants
  • Parent commits f753421

Comments (0)

Files changed (3)

 #   Thanks for stopping by :-)
 #
 #                                                       ~~ (c) SRW, 06 Feb 2012
-#                                                   ~~ last updated 12 Sep 2013
+#                                                   ~~ last updated 13 Sep 2013
 
 PROJ_ROOT   :=  $(realpath $(dir $(firstword $(MAKEFILE_LIST))))
 
     |   $(CACHE_DIR)
 	@   $(call replace-url-macros, $<, $@)
 
-$(CACHE_DIR)/bootstrap.js: | $(CACHE_DIR)
-	@   $(call download-url, "http://goo.gl/PtIx8")
-
 $(CACHE_DIR)/bootstrap.css: | $(CACHE_DIR)
-	@   $(call download-url, "http://goo.gl/cqWhu")
+	@   $(call download-url, "http://goo.gl/IQG9fJ")
 
-$(CACHE_DIR)/bootstrap-responsive.css: | $(CACHE_DIR)
-	@   $(call download-url, "http://goo.gl/u9uys")
+$(CACHE_DIR)/bootstrap.js: | $(CACHE_DIR)
+	@   $(call download-url, "http://goo.gl/Brc6pW")
 
 $(CACHE_DIR)/coffeescript.js: | $(CACHE_DIR)
 	@   $(call download-url, "http://goo.gl/2RqIb")
 $(CACHE_DIR)/style-min.css:                                                 \
     $(CACHE_DIR)/style.css                                                  \
     $(CACHE_DIR)/bootstrap.css                                              \
-    $(CACHE_DIR)/bootstrap-responsive.css                                   \
     | $(CACHE_DIR)
 	@   $(call minify-css, $^, $@)
 

File src/browser-client/index.html

       <noscript>This page requires JavaScript.</noscript>
     </div>
 
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="brand" href="https://www.qmachine.org">QMachine</a>
-          <ul class="nav">
-            <li>
-              <a href="https://github.com/wilkinson/qmachine">Code</a>
-            </li>
-            <li>
-              <a href="http://status.qmachine.org">Status</a>
-            </li>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown"
-                    href="#">Version<b class="caret"></b></a>
-              <ul class="dropdown-menu">
-                <li>
-                  <a href="https://www.qmachine.org">Latest</a>
-                  <a href="https://v1.qmachine.org">Version 1</a>
-                </li>
-              </ul>
-            </li>
-            <li>
-              <a href="//www.youtube.com/playlist?list=PLijUCyE0Z0-8nLL5qJ__v-VB3ZoRxSubg">Videos</a>
-            </li>
-            <li>
-              <a href="https://wiki.qmachine.org">Wiki</a>
-            </li>
-          </ul>
-        </div>
+    <nav class="navbar navbar-default" role="navigation">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle"
+            data-toggle="collapse" data-target=".navbar-collapse">
+          <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="https://www.qmachine.org">QMachine</a>
       </div>
-    </div>
+      <div class="collapse navbar-collapse">
+        <ul class="nav navbar-nav">
+          <li><a href="https://github.com/wilkinson/qmachine">Code</a></li>
+          <li><a href="http://status.qmachine.org">Status</a></li>
+          <li class="dropdown"><a href="#" class="dropdown-toggle"
+              data-toggle="dropdown">Version<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><a href="https://www.qmachine.org">Latest</a></li>
+              <li><a href="https://v1.qmachine.org">Version 1</a></li>
+            </ul>
+          </li>
+          <li><a href="//www.youtube.com/playlist?list=PLijUCyE0Z0-8nLL5qJ__v-VB3ZoRxSubg">Videos</a></li>
+          <li><a href="https://wiki.qmachine.org">Wiki</a></li>
+        </ul>
+      </div>
+    </nav>
 
     <div class="container">
       <div class="centered hero-unit">

File src/browser-client/style.css

  *  ideas, let me know :-)
  *
  *                                                      ~~ (c) SRW, 29 Oct 2012
- *                                                  ~~ last updated 13 Jun 2013
+ *                                                  ~~ last updated 13 Sep 2013
  */
 
 @media all {
  /* These rules will be applied for to the page for all devices, but they can
   * be overridden by other device-specific settings I may have specified. */
-    body {
-     /* This extends the container all the way to the bottom of the topbar. */
-        padding-top: 60px;
-    }
-    html {
-     /* This snippet makes text look nicer (source: http://goo.gl/fr85e) for
-      * light text on dark backgrounds (http://goo.gl/SrFQ7). I'm not using
-      * anything like that right now, but I just like it better ... argh. */
-        -webkit-font-smoothing: antialiased;
-    }
     noscript {
         color: red;
         font-size: 200%;