ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r804293 [1/2] - in /websites/production/ace: ./ content/ content/css/ content/dev-doc/ content/get-involved/ content/img/ content/js/ content/lib/ content/user-doc/
Date Wed, 08 Feb 2012 23:45:34 GMT
Author: marrs
Date: Wed Feb  8 23:45:33 2012
New Revision: 804293

Log:
Added a lot of content and some placeholders.

Added:
    websites/production/ace/content/dev-doc/
      - copied from r804292, websites/staging/ace/trunk/content/dev-doc/
    websites/production/ace/content/dev-doc/analysis.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/dev-doc/analysis.html
    websites/production/ace/content/dev-doc/architecture.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/dev-doc/architecture.html
    websites/production/ace/content/dev-doc/coding-standards.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/dev-doc/coding-standards.html
    websites/production/ace/content/dev-doc/design.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/dev-doc/design.html
    websites/production/ace/content/img/
      - copied from r804292, websites/staging/ace/trunk/content/img/
    websites/production/ace/content/img/glyphicons-halflings-white.png
      - copied unchanged from r804292, websites/staging/ace/trunk/content/img/glyphicons-halflings-white.png
    websites/production/ace/content/img/glyphicons-halflings.png
      - copied unchanged from r804292, websites/staging/ace/trunk/content/img/glyphicons-halflings.png
    websites/production/ace/content/js/bootstrap-alert.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-alert.js
    websites/production/ace/content/js/bootstrap-button.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-button.js
    websites/production/ace/content/js/bootstrap-carousel.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-carousel.js
    websites/production/ace/content/js/bootstrap-collapse.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-collapse.js
    websites/production/ace/content/js/bootstrap-tab.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-tab.js
    websites/production/ace/content/js/bootstrap-tooltip.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-tooltip.js
    websites/production/ace/content/js/bootstrap-transition.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-transition.js
    websites/production/ace/content/js/bootstrap-typeahead.js
      - copied unchanged from r804292, websites/staging/ace/trunk/content/js/bootstrap-typeahead.js
    websites/production/ace/content/lib/accordion.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/accordion.less
    websites/production/ace/content/lib/alerts.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/alerts.less
    websites/production/ace/content/lib/breadcrumbs.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/breadcrumbs.less
    websites/production/ace/content/lib/button-groups.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/button-groups.less
    websites/production/ace/content/lib/buttons.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/buttons.less
    websites/production/ace/content/lib/carousel.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/carousel.less
    websites/production/ace/content/lib/close.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/close.less
    websites/production/ace/content/lib/code.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/code.less
    websites/production/ace/content/lib/component-animations.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/component-animations.less
    websites/production/ace/content/lib/dropdowns.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/dropdowns.less
    websites/production/ace/content/lib/grid.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/grid.less
    websites/production/ace/content/lib/hero-unit.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/hero-unit.less
    websites/production/ace/content/lib/labels.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/labels.less
    websites/production/ace/content/lib/layouts.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/layouts.less
    websites/production/ace/content/lib/modals.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/modals.less
    websites/production/ace/content/lib/navbar.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/navbar.less
    websites/production/ace/content/lib/navs.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/navs.less
    websites/production/ace/content/lib/pager.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/pager.less
    websites/production/ace/content/lib/pagination.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/pagination.less
    websites/production/ace/content/lib/popovers.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/popovers.less
    websites/production/ace/content/lib/print.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/print.less
    websites/production/ace/content/lib/progress-bars.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/progress-bars.less
    websites/production/ace/content/lib/responsive.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/responsive.less
    websites/production/ace/content/lib/sprites.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/sprites.less
    websites/production/ace/content/lib/thumbnails.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/thumbnails.less
    websites/production/ace/content/lib/tooltip.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/tooltip.less
    websites/production/ace/content/lib/utilities.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/utilities.less
    websites/production/ace/content/lib/wells.less
      - copied unchanged from r804292, websites/staging/ace/trunk/content/lib/wells.less
    websites/production/ace/content/user-doc/
      - copied from r804292, websites/staging/ace/trunk/content/user-doc/
    websites/production/ace/content/user-doc/faq.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/user-doc/faq.html
    websites/production/ace/content/user-doc/features.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/user-doc/features.html
    websites/production/ace/content/user-doc/getting-started.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/user-doc/getting-started.html
    websites/production/ace/content/user-doc/introduction.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/user-doc/introduction.html
    websites/production/ace/content/user-doc/support.html
      - copied unchanged from r804292, websites/staging/ace/trunk/content/user-doc/support.html
Modified:
    websites/production/ace/   (props changed)
    websites/production/ace/content/css/prettify.css
    websites/production/ace/content/downloads.html
    websites/production/ace/content/get-involved/issue-tracking.html
    websites/production/ace/content/get-involved/mailing-lists.html
    websites/production/ace/content/get-involved/project-team.html
    websites/production/ace/content/get-involved/source-code.html
    websites/production/ace/content/index.html
    websites/production/ace/content/js/bootstrap-dropdown.js
    websites/production/ace/content/js/bootstrap-modal.js
    websites/production/ace/content/js/bootstrap-popover.js
    websites/production/ace/content/js/bootstrap-scrollspy.js
    websites/production/ace/content/lib/bootstrap.less
    websites/production/ace/content/lib/forms.less
    websites/production/ace/content/lib/mixins.less
    websites/production/ace/content/lib/patterns.less
    websites/production/ace/content/lib/reset.less
    websites/production/ace/content/lib/scaffolding.less
    websites/production/ace/content/lib/tables.less
    websites/production/ace/content/lib/type.less
    websites/production/ace/content/lib/variables.less
    websites/production/ace/content/news.html
    websites/production/ace/content/on-the-web.html
    websites/production/ace/content/sitemap.html

Propchange: websites/production/ace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  8 23:45:33 2012
@@ -1 +1 @@
-/websites/staging/ace/trunk:801772-803411
+/websites/staging/ace/trunk:801772-804292

Modified: websites/production/ace/content/css/prettify.css
==============================================================================
--- websites/production/ace/content/css/prettify.css (original)
+++ websites/production/ace/content/css/prettify.css Wed Feb  8 23:45:33 2012
@@ -2,93 +2,29 @@
 .lit { color: #195f91; }
 .pun, .opn, .clo { color: #93a1a1; }
 .fun { color: #dc322f; }
-.str, .atv { color: #268bd2; }
-.kwd, .tag { color: #195f91; }
-.typ, .atn, .dec, .var { color: #CB4B16; }
-.pln { color: #93a1a1; }
+.str, .atv { color: #D14; }
+.kwd, .linenums .tag { color: #1e347b; }
+.typ, .atn, .dec, .var { color: teal; }
+.pln { color: #48484c; }
+
 .prettyprint {
-  background-color: #fefbf3;
-  padding: 9px;
-  border: 1px solid rgba(0,0,0,.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
-     -moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);
-          box-shadow: 0 1px 2px rgba(0,0,0,.1);
+  padding: 8px;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+.prettyprint.linenums {
+  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
 }
 
 /* Specify class=linenums on a pre to get line numbering */
 ol.linenums {
-  margin: 0 0 0 40px;
-}
-/* IE indents via margin-left */
+  margin: 0 0 0 33px; /* IE indents via margin-left */
+} 
 ol.linenums li {
-  padding: 0 5px;
-  color: rgba(0,0,0,.15);
-  line-height: 20px;
-  -webkit-border-radius: 2px;
-     -moz-border-radius: 2px;
-          border-radius: 2px;
-}
-/* Alternate shading for lines */
-li.L1, li.L3, li.L5, li.L7, li.L9 {  }
-
-/*
-$base03:    #002b36;
-$base02:    #073642;
-$base01:    #586e75;
-$base00:    #657b83;
-$base0:     #839496;
-$base1:     #93a1a1;
-$base2:     #eee8d5;
-$base3:     #fdf6e3;
-$yellow:    #b58900;
-$orange:    #cb4b16;
-$red:       #dc322f;
-$magenta:   #d33682;
-$violet:    #6c71c4;
-$blue:      #268bd2;
-$cyan:      #2aa198;
-$green:     #859900;
-*/
-
-
-/*
-#1d1f21 Background
-#282a2e Current Line
-#373b41 Selection
-#c5c8c6 Foreground
-#969896 Comment
-#cc6666 Red
-#de935f Orange
-#f0c674 Yellow
-#b5bd68 Green
-#8abeb7 Aqua
-#81a2be Blue
-#b294bb Purple
-*/
-
-
-/* DARK THEME */
-/* ---------- */
-
-.prettyprint-dark {
-  background-color: #1d1f21;
-  border: 0;
-  padding: 10px;
-}
-.prettyprint-dark .linenums li {
-  color: #444;
-}
-.prettyprint-dark .linenums li:hover {
-  background-color: #282a2e;
-}
-/* tags in html */
-.prettyprint-dark .kwd,
-.prettyprint-dark .tag { color: #cc6666; }
-/* html attr */
-.prettyprint-dark .typ,
-.prettyprint-dark .atn,
-.prettyprint-dark .dec,
-.prettyprint-dark .var { color: #de935f; }
-/* html attr values */
-.prettyprint-dark .str,
-.prettyprint-dark .atv { color: #b5bd68; }
+  padding-left: 12px;
+  color: #bebec5;
+  line-height: 18px;
+  text-shadow: 0 1px 0 #fff;
+}
\ No newline at end of file

Modified: websites/production/ace/content/downloads.html
==============================================================================
--- websites/production/ace/content/downloads.html (original)
+++ websites/production/ace/content/downloads.html Wed Feb  8 23:45:33 2012
@@ -11,14 +11,23 @@
     <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="/js/prettify.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
+    
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
     <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
     <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-buttons.js"></script>
     <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
     <script src="/js/bootstrap-tabs.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
     
     
     
@@ -29,13 +38,13 @@
   </head>
 
   <body style="padding-top: 50px;">
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="/index.html">Apache ACE</a>
-          <ul class="nav" data-dropdown="dropdown">
+          <ul class="nav">
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">News</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/news.html">News</a>
@@ -49,7 +58,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">User Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -69,7 +78,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Developer Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/architecture.html">Architecture</a>
@@ -86,7 +95,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Get Involved</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
@@ -103,7 +112,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Wiki</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/wiki/board-reports.html">Board Reports</a>
@@ -114,7 +123,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Apache</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/apache/about.html">About</a>
@@ -139,14 +148,15 @@
       </div>
     </div>
     <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a></p>
       <h1>Downloads</h1>
-      <p><a href="/">Home</a></p>
       <div class="clear"></div>
       <div id="content"><p>TODO:</p>
 <ul>
 <li>integrate mirror selection and link to the most recent downloads;</li>
 <li>add a link to the archive, where older releases can be found.</li>
 </ul></div>
+      <hr>
       <footer>
         <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
       </footer>

Modified: websites/production/ace/content/get-involved/issue-tracking.html
==============================================================================
--- websites/production/ace/content/get-involved/issue-tracking.html (original)
+++ websites/production/ace/content/get-involved/issue-tracking.html Wed Feb  8 23:45:33 2012
@@ -11,14 +11,23 @@
     <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="/js/prettify.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
+    
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
     <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
     <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-buttons.js"></script>
     <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
     <script src="/js/bootstrap-tabs.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
     
     
     
@@ -29,13 +38,13 @@
   </head>
 
   <body style="padding-top: 50px;">
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="/index.html">Apache ACE</a>
-          <ul class="nav" data-dropdown="dropdown">
+          <ul class="nav">
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">News</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/news.html">News</a>
@@ -49,7 +58,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">User Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -69,7 +78,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Developer Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/architecture.html">Architecture</a>
@@ -86,7 +95,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Get Involved</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
@@ -103,7 +112,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Wiki</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/wiki/board-reports.html">Board Reports</a>
@@ -114,7 +123,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Apache</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/apache/about.html">About</a>
@@ -139,12 +148,13 @@
       </div>
     </div>
     <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <h1>Issue Tracking</h1>
-      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
       <div id="content"><ul>
 <li><a href="https://issues.apache.org/jira/browse/ace">JIRA</a></li>
 </ul></div>
+      <hr>
       <footer>
         <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
       </footer>

Modified: websites/production/ace/content/get-involved/mailing-lists.html
==============================================================================
--- websites/production/ace/content/get-involved/mailing-lists.html (original)
+++ websites/production/ace/content/get-involved/mailing-lists.html Wed Feb  8 23:45:33 2012
@@ -11,14 +11,23 @@
     <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="/js/prettify.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
+    
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
     <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
     <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-buttons.js"></script>
     <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
     <script src="/js/bootstrap-tabs.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
     
     
     
@@ -29,13 +38,13 @@
   </head>
 
   <body style="padding-top: 50px;">
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="/index.html">Apache ACE</a>
-          <ul class="nav" data-dropdown="dropdown">
+          <ul class="nav">
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">News</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/news.html">News</a>
@@ -49,7 +58,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">User Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -69,7 +78,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Developer Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/architecture.html">Architecture</a>
@@ -86,7 +95,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Get Involved</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
@@ -103,7 +112,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Wiki</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/wiki/board-reports.html">Board Reports</a>
@@ -114,7 +123,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Apache</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/apache/about.html">About</a>
@@ -139,8 +148,8 @@
       </div>
     </div>
     <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <h1>Mailing Lists</h1>
-      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
       <div id="content"><h2 id="usersaceapacheorg">users@ace.apache.org</h2>
 <p>This list is for people using Apache ACE. Please note that during incubation, we only had a developer list, which means that you might want to search the archives of the developer list below as well, when searching for answers.</p>
@@ -163,6 +172,7 @@
 <li><a href="mailto:commits-unsubscribe@ace.apache.org">unsubscribe</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/ace-commits/">archive</a></li>
 </ul></div>
+      <hr>
       <footer>
         <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
       </footer>

Modified: websites/production/ace/content/get-involved/project-team.html
==============================================================================
--- websites/production/ace/content/get-involved/project-team.html (original)
+++ websites/production/ace/content/get-involved/project-team.html Wed Feb  8 23:45:33 2012
@@ -11,14 +11,23 @@
     <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="/js/prettify.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
+    
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
     <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
     <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-buttons.js"></script>
     <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
     <script src="/js/bootstrap-tabs.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
     
     
     
@@ -29,13 +38,13 @@
   </head>
 
   <body style="padding-top: 50px;">
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="/index.html">Apache ACE</a>
-          <ul class="nav" data-dropdown="dropdown">
+          <ul class="nav">
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">News</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/news.html">News</a>
@@ -49,7 +58,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">User Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -69,7 +78,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Developer Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/architecture.html">Architecture</a>
@@ -86,7 +95,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Get Involved</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
@@ -103,7 +112,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Wiki</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/wiki/board-reports.html">Board Reports</a>
@@ -114,7 +123,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Apache</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/apache/about.html">About</a>
@@ -139,54 +148,59 @@
       </div>
     </div>
     <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <h1>Project Team</h1>
-      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
       <div id="content"><p>Here's the list of ACE committers and PMC members.</p>
 <p>See the <a href="http://www.apache.org/foundation/how-it-works.html#roles">Apache Roles</a> for more info about what these roles mean.</p>
-<table>
-      <tr><td>id</td><td>name</td><td>roles</td></tr>
-      <tr>
-            <td>angelos</td>
-            <td>Angelo van der Sijpt</td>
-            <td>PMC Member, Committer</td>
-      </tr>
-      <tr>
-            <td>btopping</td>
-            <td>Brian Topping</td>
-            <td>PMC Member, Committer</td>
-            </tr>
-      <tr>
-            <td>clement</td>
-            <td>Clement Escoffier</td>
-            <td>PMC Member, Committer</td>
-      </tr>
-      <tr>
-            <td>cziegeler</td>
-            <td>Carsten Ziegeler</td>
-            <td>PMC Member, Committer</td>
-      </tr>
-      <tr>
-            <td>jbonofre</td>
-            <td>Jean-Baptiste Onofre</td>
-            <td>PMC Member, Committer</td>
-      </tr>
-      <tr>
-            <td>pauls</td>
-            <td>Karl Pauls</td>
-            <td>PMC Member, Committer</td>
-      </tr>
-      <tr>
-            <td>marrs</td>
-            <td>Marcel Offermans</td>
-            <td>Chair, PMC Member, Committer</td>
-      </tr>
-      <tr>
-            <td>tonit</td>
-            <td>Toni Menzel</td>
-            <td>PMC Member, Committer</td>
-      </tr>
+<table class="table table-striped table-condensed">
+  <thead>
+    <tr><th>id</th><th>name</th><th>roles</th></tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>angelos</td>
+      <td>Angelo van der Sijpt</td>
+      <td>PMC Member, Committer</td>
+    </tr>
+    <tr>
+      <td>btopping</td>
+      <td>Brian Topping</td>
+      <td>PMC Member, Committer</td>
+    </tr>
+    <tr>
+      <td>clement</td>
+      <td>Clement Escoffier</td>
+      <td>PMC Member, Committer</td>
+    </tr>
+    <tr>
+      <td>cziegeler</td>
+      <td>Carsten Ziegeler</td>
+      <td>PMC Member, Committer</td>
+      </tr>
+    <tr>
+      <td>jbonofre</td>
+      <td>Jean-Baptiste Onofre</td>
+      <td>PMC Member, Committer</td>
+    </tr>
+    <tr>
+      <td>pauls</td>
+      <td>Karl Pauls</td>
+      <td>PMC Member, Committer</td>
+    </tr>
+    <tr>
+      <td>marrs</td>
+      <td>Marcel Offermans</td>
+      <td>Chair, PMC Member, Committer</td>
+    </tr>
+    <tr>
+      <td>tonit</td>
+      <td>Toni Menzel</td>
+      <td>PMC Member, Committer</td>
+    </tr>
+  </tbody>
 </table></div>
+      <hr>
       <footer>
         <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
       </footer>

Modified: websites/production/ace/content/get-involved/source-code.html
==============================================================================
--- websites/production/ace/content/get-involved/source-code.html (original)
+++ websites/production/ace/content/get-involved/source-code.html Wed Feb  8 23:45:33 2012
@@ -11,14 +11,23 @@
     <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="/js/prettify.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
+    
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
     <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
     <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-buttons.js"></script>
     <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
     <script src="/js/bootstrap-tabs.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
     
     
     
@@ -29,13 +38,13 @@
   </head>
 
   <body style="padding-top: 50px;">
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="/index.html">Apache ACE</a>
-          <ul class="nav" data-dropdown="dropdown">
+          <ul class="nav">
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">News</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/news.html">News</a>
@@ -49,7 +58,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">User Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -69,7 +78,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Developer Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/architecture.html">Architecture</a>
@@ -86,7 +95,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Get Involved</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
@@ -103,7 +112,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Wiki</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/wiki/board-reports.html">Board Reports</a>
@@ -114,7 +123,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Apache</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/apache/about.html">About</a>
@@ -139,8 +148,8 @@
       </div>
     </div>
     <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <h1>Source Code</h1>
-      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
       <div id="content"><h2 id="subversion">Subversion</h2>
 <p>The official ACE repository can be found at:</p>
@@ -150,6 +159,7 @@
 <p>If you're a committer, please use <em>https</em> to checkout the sources. That allows you to also commit changes.</p>
 <h2 id="git">Git</h2>
 <p>Even though Git is not officially supported at Apache yet, we still maintain read-only mirrors to make it more convenient for developers using Git to check out a copy of the sources.</p></div>
+      <hr>
       <footer>
         <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
       </footer>

Modified: websites/production/ace/content/index.html
==============================================================================
--- websites/production/ace/content/index.html (original)
+++ websites/production/ace/content/index.html Wed Feb  8 23:45:33 2012
@@ -11,14 +11,23 @@
     <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
     <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
     <script src="/js/prettify.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
+    
+    <script src="/js/bootstrap-alert.js"></script>
+    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-tooltip.js"></script>
     <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-modal.js"></script>
+    <script src="/js/bootstrap-transition.js"></script>
+    <script src="/js/bootstrap-button.js"></script>
     <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
+    <script src="/js/bootstrap-twipsy.js"></script>
+    <script src="/js/bootstrap-buttons.js"></script>
     <script src="/js/bootstrap-scrollspy.js"></script>
+    <script src="/js/bootstrap-typeahead.js"></script>
+    <script src="/js/bootstrap-carousel.js"></script>
+    <script src="/js/bootstrap-tab.js"></script>
+    <script src="/js/bootstrap-collapse.js"></script>
     <script src="/js/bootstrap-tabs.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
     
     
     
@@ -29,13 +38,13 @@
   </head>
 
   <body style="padding-top: 50px;">
-    <div class="topbar">
-      <div class="fill">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
         <div class="container">
           <a class="brand" href="/index.html">Apache ACE</a>
-          <ul class="nav" data-dropdown="dropdown">
+          <ul class="nav">
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">News</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/news.html">News</a>
@@ -49,7 +58,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">User Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -69,7 +78,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Developer Documentation</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/architecture.html">Architecture</a>
@@ -86,7 +95,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Get Involved</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
@@ -103,7 +112,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Wiki</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/wiki/board-reports.html">Board Reports</a>
@@ -114,7 +123,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle">Apache</a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/apache/about.html">About</a>
@@ -139,14 +148,15 @@
       </div>
     </div>
     <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a></p>
       <h1>Apache ACE</h1>
-      <p><a href="/">Home</a></p>
       <div class="clear"></div>
       <div id="content"><p>Apache ACE is a software distribution framework that allows you to centrally manage and distribute software components, configuration data and other artifacts to target systems. It is built using OSGi and can be deployed in different topologies. The target systems are usually also OSGi based, but don't have to be.</p>
 <h1 id="background">Background</h1>
 <p>When assembling software out of reusable components, the task of deploying software onto an ever increasing number of targets is not trivial to solve. This becomes even harder when these targets require different components based on who's using them.</p>
 <p>Apache ACE allows you to group those components and assign them to a managed set of targets. This allows you to distribute updates and new components easily, while keeping a full history of what was installed where during what period. It also helps you setup an automated development, QA/testing, staging and production environment.</p>
 <p>If you want to learn more about how to use Apache ACE, go to the User Documentation and start with <a href="/user-doc/introduction.html">A brief introduction</a>. If you are interested in becoming involved, check out our <a href="/get-involved/mailing-lists.html">Mailing Lists</a> and finally, to gain a deeper understanding of the software, read the available <a href="/dev-doc.html">Developer Documentation</a> which explains how to build the software and the overall <a href="/dev-doc/software-architecture.html">Software Architecture</a>.</p></div>
+      <hr>
       <footer>
         <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
       </footer>

Modified: websites/production/ace/content/js/bootstrap-dropdown.js
==============================================================================
--- websites/production/ace/content/js/bootstrap-dropdown.js (original)
+++ websites/production/ace/content/js/bootstrap-dropdown.js Wed Feb  8 23:45:33 2012
@@ -1,8 +1,8 @@
 /* ============================================================
- * bootstrap-dropdown.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#dropdown
+ * bootstrap-dropdown.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,34 +22,71 @@
 
   "use strict"
 
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle="dropdown"]'
+    , Dropdown = function ( element ) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
+        , isActive
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.length || ($parent = $this.parent())
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+      !isActive && $parent.toggleClass('open')
+
+      return false
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).parent().removeClass('open')
+  }
+
+
   /* DROPDOWN PLUGIN DEFINITION
    * ========================== */
 
-  $.fn.dropdown = function ( selector ) {
+  $.fn.dropdown = function ( option ) {
     return this.each(function () {
-      $(this).delegate(selector || d, 'click', function (e) {
-        var li = $(this).parent('li')
-          , isActive = li.hasClass('open')
-
-        clearMenus()
-        !isActive && li.toggleClass('open')
-        return false
-      })
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
     })
   }
 
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
+  $.fn.dropdown.Constructor = Dropdown
 
-  var d = 'a.menu, .dropdown-toggle'
 
-  function clearMenus() {
-    $(d).parent('li').removeClass('open')
-  }
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
 
   $(function () {
-    $('html').bind("click", clearMenus)
-    $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery || window.ender );
+}( window.jQuery )

Modified: websites/production/ace/content/js/bootstrap-modal.js
==============================================================================
--- websites/production/ace/content/js/bootstrap-modal.js (original)
+++ websites/production/ace/content/js/bootstrap-modal.js Wed Feb  8 23:45:33 2012
@@ -1,8 +1,8 @@
 /* =========================================================
- * bootstrap-modal.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#modal
+ * bootstrap-modal.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,58 +22,30 @@
 
   "use strict"
 
- /* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
-  * ======================================================= */
-
-  var transitionEnd
-
-  $(document).ready(function () {
-
-    $.support.transition = (function () {
-      var thisBody = document.body || document.documentElement
-        , thisStyle = thisBody.style
-        , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
-      return support
-    })()
-
-    // set CSS transition event type
-    if ( $.support.transition ) {
-      transitionEnd = "TransitionEnd"
-      if ( $.browser.webkit ) {
-      	transitionEnd = "webkitTransitionEnd"
-      } else if ( $.browser.mozilla ) {
-      	transitionEnd = "transitionend"
-      } else if ( $.browser.opera ) {
-      	transitionEnd = "oTransitionEnd"
-      }
-    }
-
-  })
-
-
- /* MODAL PUBLIC CLASS DEFINITION
-  * ============================= */
+ /* MODAL CLASS DEFINITION
+  * ====================== */
 
   var Modal = function ( content, options ) {
-    this.settings = $.extend({}, $.fn.modal.defaults, options)
+    this.options = $.extend({}, $.fn.modal.defaults, options)
     this.$element = $(content)
-      .delegate('.close', 'click.modal', $.proxy(this.hide, this))
-
-    if ( this.settings.show ) {
-      this.show()
-    }
-
-    return this
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
   }
 
   Modal.prototype = {
 
-      toggle: function () {
+      constructor: Modal
+
+    , toggle: function () {
         return this[!this.isShown ? 'show' : 'hide']()
       }
 
     , show: function () {
         var that = this
+
+        if (this.isShown) return
+
+        $('body').addClass('modal-open')
+
         this.isShown = true
         this.$element.trigger('show')
 
@@ -81,8 +53,9 @@
         backdrop.call(this, function () {
           var transition = $.support.transition && that.$element.hasClass('fade')
 
+          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+
           that.$element
-            .appendTo(document.body)
             .show()
 
           if (transition) {
@@ -92,24 +65,22 @@
           that.$element.addClass('in')
 
           transition ?
-            that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) :
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
             that.$element.trigger('shown')
 
         })
-
-        return this
       }
 
-    , hide: function (e) {
+    , hide: function ( e ) {
         e && e.preventDefault()
 
-        if ( !this.isShown ) {
-          return this
-        }
+        if (!this.isShown) return
 
         var that = this
         this.isShown = false
 
+        $('body').removeClass('modal-open')
+
         escape.call(this)
 
         this.$element
@@ -119,8 +90,6 @@
         $.support.transition && this.$element.hasClass('fade') ?
           hideWithTransition.call(this) :
           hideModal.call(this)
-
-        return this
       }
 
   }
@@ -130,20 +99,19 @@
   * ===================== */
 
   function hideWithTransition() {
-    // firefox drops transitionEnd events :{o
     var that = this
       , timeout = setTimeout(function () {
-          that.$element.unbind(transitionEnd)
+          that.$element.off($.support.transition.end)
           hideModal.call(that)
         }, 500)
 
-    this.$element.one(transitionEnd, function () {
+    this.$element.one($.support.transition.end, function () {
       clearTimeout(timeout)
       hideModal.call(that)
     })
   }
 
-  function hideModal (that) {
+  function hideModal( that ) {
     this.$element
       .hide()
       .trigger('hidden')
@@ -151,38 +119,37 @@
     backdrop.call(this)
   }
 
-  function backdrop ( callback ) {
+  function backdrop( callback ) {
     var that = this
       , animate = this.$element.hasClass('fade') ? 'fade' : ''
-    if ( this.isShown && this.settings.backdrop ) {
+
+    if (this.isShown && this.options.backdrop) {
       var doAnimate = $.support.transition && animate
 
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(document.body)
 
-      if ( this.settings.backdrop != 'static' ) {
+      if (this.options.backdrop != 'static') {
         this.$backdrop.click($.proxy(this.hide, this))
       }
 
-      if ( doAnimate ) {
-        this.$backdrop[0].offsetWidth // force reflow
-      }
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 
       this.$backdrop.addClass('in')
 
       doAnimate ?
-        this.$backdrop.one(transitionEnd, callback) :
+        this.$backdrop.one($.support.transition.end, callback) :
         callback()
 
-    } else if ( !this.isShown && this.$backdrop ) {
+    } else if (!this.isShown && this.$backdrop) {
       this.$backdrop.removeClass('in')
 
       $.support.transition && this.$element.hasClass('fade')?
-        this.$backdrop.one(transitionEnd, $.proxy(removeBackdrop, this)) :
+        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
         removeBackdrop.call(this)
 
-    } else if ( callback ) {
-       callback()
+    } else if (callback) {
+      callback()
     }
   }
 
@@ -193,14 +160,12 @@
 
   function escape() {
     var that = this
-    if ( this.isShown && this.settings.keyboard ) {
-      $(document).bind('keyup.modal', function ( e ) {
-        if ( e.which == 27 ) {
-          that.hide()
-        }
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
+        e.which == 27 && that.hide()
       })
-    } else if ( !this.isShown ) {
-      $(document).unbind('keyup.modal')
+    } else if (!this.isShown) {
+      $(document).off('keyup.dismiss.modal')
     }
   }
 
@@ -208,53 +173,37 @@
  /* MODAL PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.modal = function ( options ) {
-    var modal = this.data('modal')
-
-    if (!modal) {
-
-      if (typeof options == 'string') {
-        options = {
-          show: /show|toggle/.test(options)
-        }
-      }
-
-      return this.each(function () {
-        $(this).data('modal', new Modal(this, options))
-      })
-    }
-
-    if ( options === true ) {
-      return modal
-    }
-
-    if ( typeof options == 'string' ) {
-      modal[options]()
-    } else if ( modal ) {
-      modal.toggle()
-    }
-
-    return this
+  $.fn.modal = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else data.show()
+    })
   }
 
-  $.fn.modal.Modal = Modal
-
   $.fn.modal.defaults = {
-    backdrop: false
-  , keyboard: false
-  , show: false
+      backdrop: true
+    , keyboard: true
   }
 
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
 
- /* MODAL DATA- IMPLEMENTATION
-  * ========================== */
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
 
-  $(document).ready(function () {
-    $('body').delegate('[data-controls-modal]', 'click', function (e) {
       e.preventDefault()
-      var $this = $(this).data('show', true)
-      $('#' + $this.attr('data-controls-modal')).modal( $this.data() )
+      $target.modal(option)
     })
   })
 
-}( window.jQuery || window.ender );
+}( window.jQuery )

Modified: websites/production/ace/content/js/bootstrap-popover.js
==============================================================================
--- websites/production/ace/content/js/bootstrap-popover.js (original)
+++ websites/production/ace/content/js/bootstrap-popover.js Wed Feb  8 23:45:33 2012
@@ -1,8 +1,8 @@
 /* ===========================================================
- * bootstrap-popover.js v1.4.0
- * http://twitter.github.com/bootstrap/javascript.html#popover
+ * bootstrap-popover.js v2.0.0
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,22 +23,25 @@
  "use strict"
 
   var Popover = function ( element, options ) {
-    this.$element = $(element)
-    this.options = options
-    this.enabled = true
-    this.fixTitle()
+    this.init('popover', element, options)
   }
 
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TWIPSY.js
-     ========================================= */
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
 
-  Popover.prototype = $.extend({}, $.fn.twipsy.Twipsy.prototype, {
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
 
-    setContent: function () {
+    constructor: Popover
+
+  , setContent: function () {
       var $tip = this.tip()
-      $tip.find('.title')[this.options.html ? 'html' : 'text'](this.getTitle())
-      $tip.find('.content > *')[this.options.html ? 'html' : 'text'](this.getContent())
-      $tip[0].className = 'popover'
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
+      $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
+
+      $tip.removeClass('fade top bottom left right in')
     }
 
   , hasContent: function () {
@@ -47,22 +50,20 @@
 
   , getContent: function () {
       var content
-       , $e = this.$element
-       , o = this.options
+        , $e = this.$element
+        , o = this.options
 
-      if (typeof this.options.content == 'string') {
-        content = $e.attr(this.options.content)
-      } else if (typeof this.options.content == 'function') {
-        content = this.options.content.call(this.$element[0])
-      }
+      content = $e.attr('data-content')
+        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+
+      content = content.toString().replace(/(^\s*|\s*$)/, "")
 
       return content
     }
 
   , tip: function() {
       if (!this.$tip) {
-        this.$tip = $('<div class="popover" />')
-          .html(this.options.template)
+        this.$tip = $(this.options.template)
       }
       return this.$tip
     }
@@ -73,18 +74,22 @@
  /* POPOVER PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.popover = function (options) {
-    if (typeof options == 'object') options = $.extend({}, $.fn.popover.defaults, options)
-    $.fn.twipsy.initWith.call(this, options, Popover, 'popover')
-    return this
+  $.fn.popover = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
   }
 
-  $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
     placement: 'right'
-  , content: 'data-content'
-  , template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
   })
 
-  $.fn.twipsy.rejectAttrOptions.push( 'content' )
-
-}( window.jQuery || window.ender );
+}( window.jQuery )

Modified: websites/production/ace/content/js/bootstrap-scrollspy.js
==============================================================================
--- websites/production/ace/content/js/bootstrap-scrollspy.js (original)
+++ websites/production/ace/content/js/bootstrap-scrollspy.js Wed Feb  8 23:45:33 2012
@@ -1,8 +1,8 @@
 /* =============================================================
- * bootstrap-scrollspy.js v1.4.0
+ * bootstrap-scrollspy.js v2.0.0
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,38 +17,46 @@
  * limitations under the License.
  * ============================================================== */
 
-
 !function ( $ ) {
 
   "use strict"
 
-  var $window = $(window)
+  /* SCROLLSPY CLASS DEFINITION
+   * ========================== */
 
-  function ScrollSpy( topbar, selector ) {
-    var processScroll = $.proxy(this.processScroll, this)
-    this.$topbar = $(topbar)
-    this.selector = selector || 'li > a'
+  function ScrollSpy( element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body').on('click.scroll.data-api', this.selector, process)
     this.refresh()
-    this.$topbar.delegate(this.selector, 'click', processScroll)
-    $window.scroll(processScroll)
-    this.processScroll()
+    this.process()
   }
 
   ScrollSpy.prototype = {
 
-      refresh: function () {
-        this.targets = this.$topbar.find(this.selector).map(function () {
-          var href = $(this).attr('href')
-          return /^#\w/.test(href) && $(href).length ? href : null
-        })
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        this.targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var href = $(this).attr('href')
+            return /^#\w/.test(href) && $(href).length ? href : null
+          })
 
         this.offsets = $.map(this.targets, function (id) {
-          return $(id).offset().top
+          return $(id).position().top
         })
       }
 
-    , processScroll: function () {
-        var scrollTop = $window.scrollTop() + 10
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
           , offsets = this.offsets
           , targets = this.targets
           , activeTarget = this.activeTarget
@@ -58,50 +66,60 @@
           activeTarget != targets[i]
             && scrollTop >= offsets[i]
             && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activateButton( targets[i] )
+            && this.activate( targets[i] )
         }
       }
 
-    , activateButton: function (target) {
+    , activate: function (target) {
+        var active
+
         this.activeTarget = target
 
-        this.$topbar
+        this.$body
           .find(this.selector).parent('.active')
           .removeClass('active')
 
-        this.$topbar
+        active = this.$body
           .find(this.selector + '[href="' + target + '"]')
           .parent('li')
           .addClass('active')
+
+        if ( active.parent('.dropdown-menu') )  {
+          active.closest('li.dropdown').addClass('active')
+        }
       }
 
   }
 
-  /* SCROLLSPY PLUGIN DEFINITION
-   * =========================== */
 
-  $.fn.scrollSpy = function( options ) {
-    var scrollspy = this.data('scrollspy')
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  $.fn.scrollspy = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
 
-    if (!scrollspy) {
-      return this.each(function () {
-        $(this).data('scrollspy', new ScrollSpy( this, options ))
-      })
-    }
-
-    if ( options === true ) {
-      return scrollspy
-    }
-
-    if ( typeof options == 'string' ) {
-      scrollspy[options]()
-    }
+  $.fn.scrollspy.Constructor = ScrollSpy
 
-    return this
+  $.fn.scrollspy.defaults = {
+    offset: 10
   }
 
-  $(document).ready(function () {
-    $('body').scrollSpy('[data-scrollspy] li > a')
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
   })
 
-}( window.jQuery || window.ender );
\ No newline at end of file
+}( window.jQuery )

Modified: websites/production/ace/content/lib/bootstrap.less
==============================================================================
--- websites/production/ace/content/lib/bootstrap.less (original)
+++ websites/production/ace/content/lib/bootstrap.less Wed Feb  8 23:45:33 2012
@@ -1,12 +1,11 @@
 /*!
- * Bootstrap @VERSION
+ * Bootstrap v2.0.0
  *
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
  */
 
 // CSS Reset
@@ -18,9 +17,46 @@
 
 // Grid system and page structure
 @import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
 
-// Styled patterns and elements
+// Base CSS
 @import "type.less";
+@import "code.less";
 @import "forms.less";
 @import "tables.less";
-@import "patterns.less";
\ No newline at end of file
+
+// Components: common
+@import "sprites.less";
+@import "dropdowns.less";
+@import "wells.less";
+@import "component-animations.less";
+@import "close.less";
+
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "navs.less";
+@import "navbar.less";
+@import "breadcrumbs.less";
+@import "pagination.less";
+@import "pager.less";
+
+// Components: Popovers
+@import "modals.less";
+@import "tooltip.less";
+@import "popovers.less";
+
+// Components: Misc
+@import "thumbnails.less";
+@import "labels.less";
+@import "progress-bars.less";
+@import "accordion.less";
+@import "carousel.less";
+@import "hero-unit.less";
+
+// Utility classes
+@import "utilities.less"; // Has to be last to override when necessary

Modified: websites/production/ace/content/lib/forms.less
==============================================================================
--- websites/production/ace/content/lib/forms.less (original)
+++ websites/production/ace/content/lib/forms.less Wed Feb  8 23:45:33 2012
@@ -1,66 +1,51 @@
-/* Forms.less
- * Base styles for various input types, form layouts, and states
- * ------------------------------------------------------------- */
+// Forms.less
+// Base styles for various input types, form layouts, and states
+// -------------------------------------------------------------
 
 
-// FORM STYLES
-// -----------
+// GENERAL STYLES
+// --------------
 
+// Make all forms have space below them
 form {
-  margin-bottom: @baseline;
+  margin: 0 0 @baseLineHeight;
 }
 
-// Groups of fields with labels on top (legends)
 fieldset {
-  margin-bottom: @baseline;
-  padding-top: @baseline;
-  legend {
-    display: block;
-    padding-left: 150px;
-    font-size: @basefont * 1.5;
-    line-height: 1;
-    color: @grayDark;
-    *padding: 0 0 5px 145px; /* IE6-7 */
-    *line-height: 1.5; /* IE6-7 */
-  }
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
 
-// Parent element that clears floats and wraps labels and fields together
-form .clearfix {
-  margin-bottom: @baseline;
-  .clearfix()
+// Groups of fields with labels on top (legends)
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: @baseLineHeight * 1.5;
+  font-size: @baseFontSize * 1.5;
+  line-height: @baseLineHeight * 2;
+  color: @grayDark;
+  border: 0;
+  border-bottom: 1px solid #eee;
 }
 
 // Set font for forms
 label,
 input,
+button,
 select,
 textarea {
-  #font > .sans-serif(normal,13px,normal);
+  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
 }
 
-// Float labels left
+// Identify controls by their labels
 label {
-  padding-top: 6px;
-  font-size: @basefont;
-  line-height: @baseline;
-  float: left;
-  width: 130px;
-  text-align: right;
+  display: block;
+  margin-bottom: 5px;
   color: @grayDark;
 }
 
-// Shift over the inside div to align all label's relevant content
-form .input {
-  margin-left: 150px;
-}
-
-// Checkboxs and radio buttons
-input[type=checkbox],
-input[type=radio] {
-  cursor: pointer;
-}
-
 // Inputs, Textareas, Selects
 input,
 textarea,
@@ -68,104 +53,210 @@ select,
 .uneditable-input {
   display: inline-block;
   width: 210px;
-  height: @baseline;
+  height: @baseLineHeight;
   padding: 4px;
-  font-size: @basefont;
-  line-height: @baseline;
+  margin-bottom: 9px;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
   color: @gray;
   border: 1px solid #ccc;
   .border-radius(3px);
 }
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
 
-// remove padding from select
-select {
-  padding: initial;
+// Inputs within a label
+label input,
+label textarea,
+label select {
+  display: block;
 }
 
-// mini reset for non-html5 file types
-input[type=checkbox],
-input[type=radio] {
+// Mini reset for unique input types
+input[type="image"],
+input[type="checkbox"],
+input[type="radio"] {
   width: auto;
   height: auto;
   padding: 0;
   margin: 3px 0;
-  *margin-top: 0; /* IE6-7 */
+  *margin-top: 0; /* IE7 */
   line-height: normal;
-  border: none;
+  border: 0;
+  cursor: pointer;
+  border-radius: 0 e("\0/"); // Nuke border-radius for IE9 only
 }
 
-input[type=file] {
-  background-color: @white;
+// Reset the file input to browser defaults
+input[type="file"] {
   padding: initial;
-  border: initial;
   line-height: initial;
+  border: initial;
+  background-color: @white;
+  background-color: initial;
   .box-shadow(none);
 }
 
-input[type=button],
-input[type=reset],
-input[type=submit] {
+// Help out input buttons
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
   width: auto;
   height: auto;
 }
 
+// Set the height of select and file controls to match text inputs
 select,
-input[type=file] {
-  height: @baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
-  *height: auto; // Reset for IE7
-  line-height: @baseline * 1.5;
+input[type="file"] {
+  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
+  line-height: 28px;
+}
+
+// Chrome on Linux and Mobile Safari need background-color
+select {
+  width: 220px; // default input width + 10px of padding that doesn't get applied
+  background-color: @white;
 }
 
 // Make multiple select elements height not fixed
-select[multiple] {
-  height: inherit;
-  background-color: @white; // Fixes Chromium bug of unreadable items
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+// Remove shadow from image inputs
+input[type="image"] {
+  .box-shadow(none);
 }
 
+// Make textarea height behave
 textarea {
   height: auto;
 }
 
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  background-color: @white;
-  display: block;
-  border-color: #eee;
-  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
+// Hidden inputs
+input[type="hidden"] {
+  display: none;
 }
 
-// Placeholder text gets special styles; can't be bundled together though for some reason
-:-moz-placeholder {
-  color: @grayLight;
+
+
+// CHECKBOXES & RADIOS
+// -------------------
+
+// Indent the labels to position radios/checkboxes as hanging
+.radio,
+.checkbox {
+  padding-left: 18px;
 }
-::-webkit-input-placeholder {
-  color: @grayLight;
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -18px;
 }
 
-// Focus states
+// Move the options list down to align with labels
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px; // has to be padding because margin collaspes
+}
+
+// Radios and checkboxes on same line
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px; // space out consecutive inline controls
+}
+// But don't forget to remove their padding on first-child
+.controls > .radio.inline:first-child,
+.controls > .checkbox.inline:first-child {
+  padding-top: 0;
+}
+
+
+
+// FOCUS STATE
+// -----------
+
 input,
 textarea {
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
-  .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
 }
 input:focus,
 textarea:focus {
-  outline: 0;
   border-color: rgba(82,168,236,.8);
-  @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
+  @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   .box-shadow(@shadow);
+  outline: 0;
+  outline: thin dotted \9; /* IE6-8 */
 }
-input[type=file]:focus,
-input[type=checkbox]:focus,
+input[type="file"]:focus,
+input[type="checkbox"]:focus,
 select:focus {
   .box-shadow(none); // override for file inputs
-  outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
+  .tab-focus();
+}
+
+
+
+// INPUT SIZES
+// -----------
+
+// General classes for quick sizes
+.input-mini       { width: 60px; }
+.input-small      { width: 90px; }
+.input-medium     { width: 150px; }
+.input-large      { width: 210px; }
+.input-xlarge     { width: 270px; }
+.input-xxlarge    { width: 530px; }
+
+// Grid style input sizes
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input {
+  float: none;
+  margin-left: 0;
+}
+
+
+
+// GRID SIZING FOR INPUTS
+// ----------------------
+
+#inputGridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth);
+
+
+
+
+// DISABLED STATE
+// --------------
+
+// Disabled and read-only inputs
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
+  border-color: #ddd;
+  cursor: not-allowed;
 }
 
 
+
+
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
@@ -179,6 +270,7 @@ select:focus {
   }
   // Style inputs accordingly
   input,
+  select,
   textarea {
     color: @textColor;
     border-color: @borderColor;
@@ -195,177 +287,116 @@ select:focus {
     border-color: @textColor;
   }
 }
-// Error
-form .clearfix.error {
-  .formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%));
-}
 // Warning
-form .clearfix.warning {
-  .formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%));
+.control-group.warning {
+  .formFieldState(@warningText, @warningText, @warningBackground);
+}
+// Error
+.control-group.error {
+  .formFieldState(@errorText, @errorText, @errorBackground);
 }
 // Success
-form .clearfix.success {
-  .formFieldState(#468847, #57a957, lighten(#57a957, 30%));
+.control-group.success {
+  .formFieldState(@successText, @successText, @successBackground);
 }
 
-
-// Form element sizes
-// TODO v2: remove duplication here and just stick to .input-[size] in light of adding .spanN sizes
-.input-mini,
-input.mini,
-textarea.mini,
-select.mini {
-  width: 60px;
-}
-.input-small,
-input.small,
-textarea.small,
-select.small {
-  width: 90px;
-}
-.input-medium,
-input.medium,
-textarea.medium,
-select.medium {
-  width: 150px;
-}
-.input-large,
-input.large,
-textarea.large,
-select.large {
-  width: 210px;
-}
-.input-xlarge,
-input.xlarge,
-textarea.xlarge,
-select.xlarge {
-  width: 270px;
-}
-.input-xxlarge,
-input.xxlarge,
-textarea.xxlarge,
-select.xxlarge {
-  width: 530px;
-}
-textarea.xxlarge {
-  overflow-y: auto;
+// HTML5 invalid states
+// Shares styles with the .control-group.error above
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+  &:focus {
+    border-color: darken(#ee5f5b, 10%);
+    .box-shadow(0 0 6px lighten(#ee5f5b, 20%));    
+  }
 }
 
-// Grid style input sizes
-// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
-.formColumns(@columnSpan: 1) {
-  display: inline-block;
-  float: none;
-  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
-  margin-left: 0;
-}
-input,
-textarea {
-  // Default columns
-  &.span1     { .formColumns(1); }
-  &.span2     { .formColumns(2); }
-  &.span3     { .formColumns(3); }
-  &.span4     { .formColumns(4); }
-  &.span5     { .formColumns(5); }
-  &.span6     { .formColumns(6); }
-  &.span7     { .formColumns(7); }
-  &.span8     { .formColumns(8); }
-  &.span9     { .formColumns(9); }
-  &.span10    { .formColumns(10); }
-  &.span11    { .formColumns(11); }
-  &.span12    { .formColumns(12); }
-  &.span13    { .formColumns(13); }
-  &.span14    { .formColumns(14); }
-  &.span15    { .formColumns(15); }
-  &.span16    { .formColumns(16); }
-}
 
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
+
+// FORM ACTIONS
+// ------------
+
+.form-actions {
+  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
+  margin-top: @baseLineHeight;
+  margin-bottom: @baseLineHeight;
   background-color: #f5f5f5;
-  border-color: #ddd;
-  cursor: not-allowed;
+  border-top: 1px solid #ddd;
 }
 
-// Actions (the buttons)
-.actions {
-  background: #f5f5f5;
-  margin-top: @baseline;
-  margin-bottom: @baseline;
-  padding: (@baseline - 1) 20px @baseline 150px;
-  border-top: 1px solid #ddd;
-  .border-radius(0 0 3px 3px);
-  .secondary-action {
-    float: right;
-    a {
-      line-height: 30px;
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
+// For text that needs to appear as an input but should not be an input
+.uneditable-input {
+  display: block;
+  background-color: @white;
+  border-color: #eee;
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
 }
 
-// Help Text
-// TODO: Do we need to set basefont and baseline here?
-.help-inline,
+// Placeholder text gets special styles; can't be bundled together though for some reason
+.placeholder(@grayLight);
+
+
+
+// HELP TEXT
+// ---------
+
 .help-block {
-  font-size: @basefont;
-  line-height: @baseline;
+  margin-top: 5px;
+  margin-bottom: 0;
   color: @grayLight;
 }
+
 .help-inline {
+  display: inline-block;
+  .ie7-inline-block();
+  margin-bottom: 9px;
+  vertical-align: middle;
   padding-left: 5px;
-  *position: relative; /* IE6-7 */
-  *top: -5px; /* IE6-7 */
 }
 
-// Big blocks of help text
-.help-block {
-  display: block;
-  max-width: 600px;
-}
 
-// Inline Fields (input fields that appear as inline objects
-.inline-inputs {
-  color: @gray;
-  span {
-    padding: 0 2px 0 1px;
-  }
-}
+
+// INPUT GROUPS
+// ------------
 
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
-  input {
+  margin-bottom: 5px;
+  .clearfix(); // Clear the float to prevent wrapping
+  input,
+  .uneditable-input {
     .border-radius(0 3px 3px 0);
+    &:focus {
+      position: relative;
+      z-index: 2;
+    }
+  }
+  .uneditable-input {
+    border-left-color: #ccc;
   }
   .add-on {
-    position: relative;
-    background: #f5f5f5;
-    border: 1px solid #ccc;
-    z-index: 2;
     float: left;
     display: block;
     width: auto;
     min-width: 16px;
-    height: 18px;
-    padding: 4px 4px 4px 5px;
+    height: @baseLineHeight;
     margin-right: -1px;
+    padding: 4px 5px;
     font-weight: normal;
-    line-height: 18px;
+    line-height: @baseLineHeight;
     color: @grayLight;
     text-align: center;
     text-shadow: 0 1px 0 @white;
+    background-color: #f5f5f5;
+    border: 1px solid #ccc;
     .border-radius(3px 0 0 3px);
   }
   .active {
-    background: lighten(@green, 30);
+    background-color: lighten(@green, 30);
     border-color: @green;
   }
 }
@@ -375,105 +406,110 @@ textarea[readonly] {
   }
 }
 .input-append {
-  input {
+  input,
+  .uneditable-input {
     float: left;
     .border-radius(3px 0 0 3px);
   }
+  .uneditable-input {
+    border-right-color: #ccc;    
+  }
   .add-on {
-    .border-radius(0 3px 3px 0);
     margin-right: 0;
     margin-left: -1px;
+    .border-radius(0 3px 3px 0);
   }
-}
+  input:first-child {
+    // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input
+    // inherit the sum of its ancestors' margins.
+    *margin-left: -160px;
 
-// Stacked options for forms (radio buttons or checkboxes)
-.inputs-list {
-  margin: 0 0 5px;
-  width: 100%;
-  li {
-    display: block;
-    padding: 0;
-    width: 100%;
-  }
-  label {
-    display: block;
-    float: none;
-    width: auto;
-    padding: 0;
-    margin-left: 20px;
-    line-height: @baseline;
-    text-align: left;
-    white-space: normal;
-    strong {
-      color: @gray;
-    }
-    small {
-      font-size: @basefont - 2;
-      font-weight: normal;
+    &+.add-on {
+      *margin-left: -21px;
     }
   }
-  .inputs-list {
-    margin-left: 25px;
-    margin-bottom: 10px;
-    padding-top: 0;
-  }
-  &:first-child {
-    padding-top: 6px;
-  }
-  li + li {
-    padding-top: 2px;
-  }
-  input[type=radio],
-  input[type=checkbox] {
+}
+
+
+
+// SEARCH FORM
+// -----------
+
+.search-query {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0; // remove the default margin on all inputs
+  .border-radius(14px);
+}
+
+
+
+// HORIZONTAL & VERTICAL FORMS
+// ---------------------------
+
+// Common properties
+// -----------------
+
+.form-search,
+.form-inline,
+.form-horizontal {
+  input,
+  textarea,
+  select,
+  .help-inline,
+  .uneditable-input {
+    display: inline-block;
     margin-bottom: 0;
-    margin-left: -20px;
-    float: left;
   }
 }
+.form-search label,
+.form-inline label,
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  display: inline-block;
+}
+// Make the prepend and append add-on vertical-align: middle;
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+  vertical-align: middle;
+}
 
-// Stacked forms
-.form-stacked {
-  padding-left: 20px;
-  fieldset {
-    padding-top: @baseline / 2;
-  }
-  legend {
-    padding-left: 0;
-  }
-  label {
-    display: block;
-    float: none;
-    width: auto;
-    font-weight: bold;
-    text-align: left;
-    line-height: 20px;
-    padding-top: 0;
-  }
-  .clearfix {
-    margin-bottom: @baseline / 2;
-    div.input {
-      margin-left: 0;
-    }
-  }
-  .inputs-list {
-    margin-bottom: 0;
-    li {
-      padding-top: 0;
-      label {
-        font-weight: normal;
-        padding-top: 0;
-      }
-    }
+// Margin to space out fieldsets
+.control-group {
+  margin-bottom: @baseLineHeight / 2;
+}
+
+// Horizontal-specific styles
+// --------------------------
+
+.form-horizontal {
+  // Legend collapses margin, so we're relegated to padding
+  legend + .control-group {
+    margin-top: @baseLineHeight;
+    -webkit-margin-top-collapse: separate;
+  }
+  // Increase spacing between groups
+  .control-group {
+    margin-bottom: @baseLineHeight;
+    .clearfix();
   }
-  div.clearfix.error {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 10px;
-    margin-top: 0;
-    margin-left: -10px;
-  }
-  .actions {
-    margin-left: -20px;
-    padding-left: 20px;
+  // Float the labels left
+  .control-group > label {
+    float: left;
+    width: 140px;
+    padding-top: 5px;
+    text-align: right;
+  }
+  // Move over all input controls and content
+  .controls {
+    margin-left: 160px;
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-actions {
+    padding-left: 160px;
   }
 }



Mime
View raw message