projects / bootswatch / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 13418ac b1f9c0d)
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
authorFrancesco Pontillo <francescopontillo@gmail.com>
Mon, 18 Mar 2013 22:32:44 +0000 (23:32 +0100)
committerFrancesco Pontillo <francescopontillo@gmail.com>
Mon, 18 Mar 2013 22:32:44 +0000 (23:32 +0100)
Conflicts:
shamrock/index.html

14 files changed:
1  2 
amelia/index.html patch | diff1 | diff2 | blob | history
cerulean/index.html patch | diff1 | diff2 | blob | history
cosmo/index.html patch | diff1 | diff2 | blob | history
cyborg/index.html patch | diff1 | diff2 | blob | history
default/index.html patch | diff1 | diff2 | blob | history
index.html patch | diff1 | diff2 | blob | history
journal/index.html patch | diff1 | diff2 | blob | history
readable/index.html patch | diff1 | diff2 | blob | history
simplex/index.html patch | diff1 | diff2 | blob | history
slate/index.html patch | diff1 | diff2 | blob | history
spacelab/index.html patch | diff1 | diff2 | blob | history
spruce/index.html patch | diff1 | diff2 | blob | history
superhero/index.html patch | diff1 | diff2 | blob | history
united/index.html patch | diff1 | diff2 | blob | history

diff --combined amelia/index.html
index 689589b,e1de4ef..71708c7
--- 1/amelia/index.html
--- 2/amelia/index.html
+++ b/amelia/index.html
@@@ -35,7 -35,7 +35,7 @@@
    </head>
  
    <body class="preview" id="top" data-spy="scroll" data-target=".subnav" data-offset="80">
-     <script src="../js/bsa.js"></script>
+     <!-- <script src="../js/bsa.js"></script> -->
  
  
    <!-- Navbar
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -104,9 -103,21 +104,21 @@@
        <h1>Amelia</h1>
        <p class="lead">Sweet and cheery.</p>
      </div>
-     <div class="span6">
-       <div class="bsa well">
+     <div class="span4 offset2">
+ <!--       <div class="bsa well">
            <div id="bsap_1277971" class="bsarocks bsap_c466df00a3cd5ee8568b5c4983b6bb19"></div>
+       </div> -->
+       <div class="well" style="padding: 15px 15px 0 15px;">
+         <a href="http://carboncostume.com" target="_blank">
+           <span style="float: left; margin: 0 15px 15px 0;">
+             <img src="../img/carboncostume.png" width="175" height="135" style="border-radius: 5px;">
+           </span>
+         </a>
+         <a href="http://carboncostume.com" target="_blank">
+           <h4 style="margin-bottom: 0.4em; color: #fff;">Carbon Costume</h4>
+           <span style="display: block; margin-bottom: 1em; color: #fff;">DIY costumes using everyday gear.</span>
+         </a>
+         <div style="clear:both"></div>
        </div>
      </div>
    </div>
@@@ -891,6 -902,7 +903,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined cerulean/index.html
index 72f22dd,1b82cd3..cee8c89
--- 1/cerulean/index.html
--- 2/cerulean/index.html
+++ b/cerulean/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined cosmo/index.html
index 9dec0d5,0cb4c97..592bcf3
--- 1/cosmo/index.html
--- 2/cosmo/index.html
+++ b/cosmo/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined cyborg/index.html
index 1d572d8,fa88319..f484398
--- 1/cyborg/index.html
--- 2/cyborg/index.html
+++ b/cyborg/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined default/index.html
index 5691df5,b8ad0ac..746974f
--- 1/default/index.html
--- 2/default/index.html
+++ b/default/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -890,6 -889,7 +890,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined index.html
index 0aafc5e,d5a1726..abc7414
--- 1/index.html
--- 2/index.html
+++ b/index.html
@@@ -60,7 -60,6 +60,7 @@@
                                                                <li><a href="cyborg">Cyborg</a></li>
                                                                <li><a href="journal">Journal</a></li>
                                                                <li><a href="readable">Readable</a></li>
 +                                <li><a href="shamrock">Shamrock</a></li>
                                                                <li><a href="simplex">Simplex</a></li>
                                                                <li><a href="slate">Slate</a></li>
                                                                <li><a href="spacelab">Spacelab</a></li>
@@@ -139,40 -138,6 +139,6 @@@
  
                <div class="row" id="gallery">
  
-                       <div class="offset4 span4">
-                               <div class="thumbnail">
-                                       <a href="shamrock"><img src="shamrock/thumbnail.png" alt="Shamrock"></a>
-                                       <div class="caption">
-                                               <h3>Shamrock</h3>
-                                               <p>Limited edition for St. Patty's Day.</p>
-                                               <div class="btn-toolbar">
-                                                       <div class="btn-group"><a class="btn btn-large" href="shamrock">Preview</a></div>
-                                                       <div class="btn-group">
-                                                               <a class="btn btn-large btn-primary" target="_blank" href="shamrock/bootstrap.min.css" onClick="_gaq.push(['_trackEvent', 'bootswatch', 'shamrock', 'bootstrap.min.css']);">Download</a>
-                                                               <a class="btn btn-large btn-primary dropdown-toggle" data-toggle="dropdown" href="#">
-                                                                       <span class="caret"></span>
-                                                               </a>
-                                                               <ul class="dropdown-menu">
-                                                                       <li><a target="_blank" href="shamrock/bootstrap.min.css"
-                                                                               onClick="_gaq.push(['_trackEvent', 'bootswatch', 'shamrock', 'bootstrap.min.css']);">bootstrap.min.css</a></li>
-                                                                       <li><a target="_blank" href="shamrock/bootstrap.css"
-                                                                               onClick="_gaq.push(['_trackEvent', 'bootswatch', 'shamrock', 'bootstrap.css']);">bootstrap.css</a></li>
-                                                                       <li class="divider"></li>
-                                                                       <li><a target="_blank" href="shamrock/variables.less"
-                                                                               onClick="_gaq.push(['_trackEvent', 'bootswatch', 'shamrock', 'variables.less']);">variables.less</a></li>
-                                                                       <li><a target="_blank" href="shamrock/bootswatch.less"
-                                                                               onClick="_gaq.push(['_trackEvent', 'bootswatch', 'shamrock', 'bootswatch.less']);">bootswatch.less</a></li>
-                                                               </ul>
-                                                       </div>
-                                               </div>
-                                       </div>
-                               </div>
-                       </div>
- 
-               </div>
- 
-               <div class="row">
- 
                        <div class="span4">
                                <div class="thumbnail">
                                        <a href="amelia"><img src="amelia/thumbnail.png" alt="Amelia"></a>
@@@ -510,6 -475,24 +476,24 @@@
                </div>
  
                <div class="row">
+       
+                       <div class="span4">
+                               <div class="thumbnail">
+                                       <a target="_blank" href="http://wrapbootstrap.com/preview/WB0135486?ref=bsw"><img src="https://s3.amazonaws.com/wrapbootstrap/live/products/600x375/WB0135486.png" alt="Core Admin"></a>
+                                       <div class="caption">
+                                               <h3>Core Admin</h3>
+                                               <p>A polished template for an admin dashboard.</p>
+                                               <div class="btn-toolbar">
+                                                       <div class="btn-group"><a class="btn btn-large" target="_blank" href="http://wrapbootstrap.com/preview/WB0135486?ref=bsw">Preview</a></div>
+                                                       <div class="btn-group">
+                                                               <a class="btn btn-large btn-info" target="_blank" href="https://wrapbootstrap.com/theme/core-admin-WB0135486?ref=bsw"
+                                                               onClick="_gaq.push(['_trackEvent', 'click', 'outbound', 'wrapbootstrap-baseadmin']);">Info</a>
+                                                       </div>
+                                               </div>
+                                       </div>
+                               </div>
+                       </div>
+ 
                        
                        <div class="span4">
                                <div class="thumbnail">
@@@ -546,24 -529,6 +530,6 @@@
                                </div>
                        </div>
  
-                       
-                       <div class="span4">
-                               <div class="thumbnail">
-                                       <a target="_blank" href="http://wrapbootstrap.com/preview/WB00U99JJ?ref=bsw"><img src="https://s3.amazonaws.com/wrapbootstrap/live/products/600x375/WB00U99JJ.png" alt="Clean Canvas"></a>
-                                       <div class="caption">
-                                               <h3>Base Admin</h3>
-                                               <p>A polished template for an admin dashboard.</p>
-                                               <div class="btn-toolbar">
-                                                       <div class="btn-group"><a class="btn btn-large" target="_blank" href="http://wrapbootstrap.com/preview/WB00U99JJ?ref=bsw">Preview</a></div>
-                                                       <div class="btn-group">
-                                                               <a class="btn btn-large btn-info" target="_blank" href="https://wrapbootstrap.com/theme/base-admin-WB00U99JJ?ref=bsw"
-                                                               onClick="_gaq.push(['_trackEvent', 'click', 'outbound', 'wrapbootstrap-baseadmin']);">Info</a>
-                                                       </div>
-                                               </div>
-                                       </div>
-                               </div>
-                       </div>
- 
                </div>
  
                <hr>
@@@ -589,6 -554,7 +555,7 @@@
  
  
        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="js/jquery.smooth-scroll.min.js"></script>
        <script src="js/bootstrap.min.js"></script>
        <script src="js/bootswatch.js"></script>
        <script type="text/javascript">
diff --combined journal/index.html
index cfe99a0,2d96293..104e61c
--- 1/journal/index.html
--- 2/journal/index.html
+++ b/journal/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined readable/index.html
index e371f06,c72410e..6dc76ee
--- 1/readable/index.html
--- 2/readable/index.html
+++ b/readable/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined simplex/index.html
index ad5bec5,aa31d2f..b2e2e42
--- 1/simplex/index.html
--- 2/simplex/index.html
+++ b/simplex/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined slate/index.html
index b575a46,188fcd5..66c9c17
--- 1/slate/index.html
--- 2/slate/index.html
+++ b/slate/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined spacelab/index.html
index 16cf29e,da214ef..5884936
--- 1/spacelab/index.html
--- 2/spacelab/index.html
+++ b/spacelab/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined spruce/index.html
index 6edd379,775bd8e..8372fde
--- 1/spruce/index.html
--- 2/spruce/index.html
+++ b/spruce/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined superhero/index.html
index 11dd412,baf9157..2d66311
--- 1/superhero/index.html
--- 2/superhero/index.html
+++ b/superhero/index.html
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -891,6 -890,7 +891,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
diff --combined united/index.html
index e65c839,22f4b59..d402758
--- 1/united/index.html
--- 2/united/index.html
+++ b/united/index.html
@@@ -35,7 -35,7 +35,7 @@@
    </head>
  
    <body class="preview" id="top" data-spy="scroll" data-target=".subnav" data-offset="80">
-     <script src="../js/bsa.js"></script>
+   <!--  <script src="../js/bsa.js"></script> -->
  
  
    <!-- Navbar
@@@ -64,7 -64,6 +64,7 @@@
                <li><a href="../cyborg">Cyborg</a></li>
                <li><a href="../journal">Journal</a></li>
                <li><a href="../readable">Readable</a></li>
 +              <li><a href="../shamrock">Shamrock</a></li>
                <li><a href="../simplex">Simplex</a></li>
                <li><a href="../slate">Slate</a></li>
                <li><a href="../spacelab">Spacelab</a></li>
@@@ -105,8 -104,20 +105,20 @@@
        <p class="lead">Ubuntu orange and unique font.</p>
      </div>
      <div class="span6">
-       <div class="bsa well">
+ <!--       <div class="bsa well">
            <div id="bsap_1277971" class="bsarocks bsap_c466df00a3cd5ee8568b5c4983b6bb19"></div>
+       </div> -->
+       <div class="well" style="padding: 25px 25px 15px 25px;">
+         <a href="http://www.maxcdn.com" target="_blank">
+           <span style="float: left; margin: 0 15px 10px 0;">
+             <img src="../img/maxcdn.gif" width="175" height="135">
+           </span>
+         </a>
+         <a href="http://www.maxcdn.com" target="_blank">
+           <span style="display: block; font-weight: bold; margin-bottom: 1em;">Make Your Site Fast!</span>
+           <span style="display: block;">When your hosting is far from your visitors your website becomes slow for them. A CDN allows you to be close to everyone. Click to see how a CDN works.</span>
+         </a>
+         <div style="clear:both"></div>
        </div>
      </div>
    </div>
@@@ -891,6 -902,7 +903,7 @@@
      ================================================== -->
      <!-- Placed at the end of the document so the pages load faster -->
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+     <script src="../js/jquery.smooth-scroll.min.js"></script>
      <script src="../js/bootstrap.min.js"></script>
      <script src="../js/bootswatch.js"></script>
  
Bootstrap watch themes