Permalink
Browse files

merge

  • Loading branch information...
2 parents 953f2e2 + 004a87f commit ca6c87542ea6a0e8cdc80776897f26233a396ff8 @adamjgrant committed Mar 25, 2013
Showing with 5,758 additions and 5,487 deletions.
  1. +6 −8 .gitignore
  2. +0 −1 Kickstrap/apps/jquerylint/config.ks
  3. +0 −1 Kickstrap/apps/jquerylint/jquery.lint.min.js
  4. +0 −2 Kickstrap/apps/pinesnotify/config.ks
  5. +0 −83 Kickstrap/apps/pinesnotify/jquery.pnotify.default.css
  6. +0 −912 Kickstrap/apps/pinesnotify/jquery.pnotify.js
  7. +0 −40 Kickstrap/apps/pinesnotify/jquery.pnotify.min.js
  8. +0 −21 Kickstrap/apps/pinesnotify/use for pines style icons/jquery.pnotify.default.icons.css
  9. +102 −0 Kickstrap/apps/tinygrowl/README.md
  10. +1 −0 Kickstrap/apps/tinygrowl/config.ks
  11. +12 −0 Kickstrap/apps/tinygrowl/index.html
  12. +61 −0 Kickstrap/apps/tinygrowl/tinygrowl.js
  13. +1 −0 Kickstrap/apps/tinygrowl/tinygrowl.min.js
  14. +56 −0 Kickstrap/bootstrap/js/tests/index.html
  15. +63 −0 Kickstrap/bootstrap/js/tests/phantom.js
  16. +14 −0 Kickstrap/bootstrap/js/tests/server.js
  17. +25 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-affix.js
  18. +62 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-alert.js
  19. +102 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-button.js
  20. +81 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-carousel.js
  21. +94 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-collapse.js
  22. +151 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-dropdown.js
  23. +120 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-modal.js
  24. +21 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-phantom.js
  25. +113 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-popover.js
  26. +37 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-scrollspy.js
  27. +86 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-tab.js
  28. +294 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-tooltip.js
  29. +13 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-transition.js
  30. +236 −0 Kickstrap/bootstrap/js/tests/unit/bootstrap-typeahead.js
  31. +5 −0 Kickstrap/bootstrap/js/tests/vendor/jquery.js
  32. +232 −0 Kickstrap/bootstrap/js/tests/vendor/qunit.css
  33. +1,510 −0 Kickstrap/bootstrap/js/tests/vendor/qunit.js
  34. +139 −0 Kickstrap/bootstrap/less/tests/buttons.html
  35. +150 −0 Kickstrap/bootstrap/less/tests/css-tests.css
  36. +1,399 −0 Kickstrap/bootstrap/less/tests/css-tests.html
  37. +71 −0 Kickstrap/bootstrap/less/tests/forms-responsive.html
  38. +179 −0 Kickstrap/bootstrap/less/tests/forms.html
  39. +104 −0 Kickstrap/bootstrap/less/tests/navbar-fixed-top.html
  40. +107 −0 Kickstrap/bootstrap/less/tests/navbar-static-top.html
  41. +107 −0 Kickstrap/bootstrap/less/tests/navbar.html
  42. +1 −3 Kickstrap/css/readme.txt
  43. +1 −1 Kickstrap/js/kickstrap.min.js
  44. +0 −4,413 Kickstrap/js/less-1.3.3.js
  45. +1 −1 index.html
  46. +1 −1 kickstrap.less
View
@@ -1,9 +1,7 @@
-product
-tests
.DS_Store
-
-assets/Kickstrap/bootstrap/.git
-assets/Kickstrap/bootstrap/.[a-z]*
-
-assets/Kickstrap/qunit/.git
-assets/Kickstrap/qunit/.[a-z]*
+UglifyJS
+node_modules
+Kickstrap/bootstrap/docs
+Kickstrap/extras/fontawesome/docs
+/product
+/tests
@@ -1 +0,0 @@
-http://netdna.getkickstrap.com/Kickstrap/apps/jQueryLint/jquery.lint.min.js, //jquery.lint.min.js
Oops, something went wrong.
@@ -1,2 +0,0 @@
-http://netdna.getkickstrap.com/Kickstrap/apps/pinesnotify/jquery.pnotify.default.css, //jquery.pnotify.default.css, http://netdna.getkickstrap.com/Kickstrap/apps/pinesnotify/jquery.pnotify.js, //jquery.pnotify.js
-
@@ -1,83 +0,0 @@
-/*
-Document : jquery.pnotify.default.css
-Created on : Nov 23, 2009, 3:14:10 PM
-Author : Hunter Perrin
-Version : 1.2.0
-Link : http://pinesframework.org/pnotify/
-Description:
- Default styling for Pines Notify jQuery plugin.
-*/
-/* -- Notice */
-.ui-pnotify {
-top: 25px;
-right: 25px;
-position: absolute;
-height: auto;
-/* Ensures notices are above everything */
-z-index: 9999;
-}
-/* Hides position: fixed from IE6 */
-html > body .ui-pnotify {
-position: fixed;
-}
-.ui-pnotify .ui-pnotify-shadow {
--webkit-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5);
--moz-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5);
-box-shadow: 0px 2px 10px rgba(50, 50, 50, 0.5);
-}
-.ui-pnotify-container {
-background-position: 0 0;
-padding: .8em;
-height: 100%;
-margin: 0;
-}
-.ui-pnotify-sharp {
--webkit-border-radius: 0;
--moz-border-radius: 0;
-border-radius: 0;
-}
-.ui-pnotify-closer, .ui-pnotify-sticker {
-float: right;
-margin-left: .2em;
-}
-.ui-pnotify-title {
-display: block;
-margin-bottom: .4em;
-}
-.ui-pnotify-text {
-display: block;
-}
-.ui-pnotify-icon, .ui-pnotify-icon span {
-display: block;
-float: left;
-margin-right: .2em;
-}
-/* -- History Pulldown */
-.ui-pnotify-history-container {
-position: absolute;
-top: 0;
-right: 18px;
-width: 70px;
-border-top: none;
-padding: 0;
--webkit-border-top-left-radius: 0;
--moz-border-top-left-radius: 0;
-border-top-left-radius: 0;
--webkit-border-top-right-radius: 0;
--moz-border-top-right-radius: 0;
-border-top-right-radius: 0;
-/* Ensures history container is above notices. */
-z-index: 10000;
-}
-.ui-pnotify-history-container .ui-pnotify-history-header {
-padding: 2px;
-}
-.ui-pnotify-history-container button {
-cursor: pointer;
-display: block;
-width: 100%;
-}
-.ui-pnotify-history-container .ui-pnotify-history-pulldown {
-display: block;
-margin: 0 auto;
-}
Oops, something went wrong.

0 comments on commit ca6c875

Please sign in to comment.