builds distro and adjusts jquery version to 2.0.0-pre for a while.

jejacks0n · Apr 7, 2013 · 691b438 · 691b438
1 parent d4dc648
commit 691b438
Show file tree

Hide file tree

Showing 20 changed files with 14,083 additions and 5,327 deletions.
diff --git a/lib/dependencies/jquery/jquery-2.0.0.js → distro/dependencies/jquery-2.0.0.js b/lib/dependencies/jquery/jquery-2.0.0.js → distro/dependencies/jquery-2.0.0.js
diff --git a/distro/dependencies/marked-0.2.8.js b/distro/dependencies/marked-0.2.8.js
diff --git a/distro/dependencies/showdown-1.0.js b/distro/dependencies/showdown-1.0.js
diff --git a/distro/mercury.bundle.css b/distro/mercury.bundle.css
diff --git a/distro/mercury.css b/distro/mercury.css
@@ -64,31 +64,8 @@ Copyright (c) 2013 Jeremy Jackson
   *zoom: 1;
 }
 
-/* Mercury.Interface
+/* Mercury.BaseInterface
  *----------------------------------------------------------------------------*/
-/* line 3, ../../lib/stylesheets/mercury/views/_base_interface.scss */
-mercury .mercury-developer-toolbar {
-  position: fixed;
-  z-index: 10000;
-  right: 10px;
-  bottom: 30px;
-  border: 1px solid white;
-  border-radius: 5px;
-  color: #fff;
-  background: rgba(0, 0, 0, 0.7);
-  padding: 10px;
-  margin: 0;
-  list-style: none;
-}
-/* line 15, ../../lib/stylesheets/mercury/views/_base_interface.scss */
-mercury .mercury-developer-toolbar li {
-  cursor: pointer;
-}
-/* line 17, ../../lib/stylesheets/mercury/views/_base_interface.scss */
-mercury .mercury-developer-toolbar li:hover {
-  color: #00bce5;
-}
-
 /* Mercury.FrameInterface
  *----------------------------------------------------------------------------*/
 /* line 3, ../../lib/stylesheets/mercury/views/_frame_interface.scss */