Permalink
Browse files

Merge branch 'unstable'

  • Loading branch information...
2 parents 4ec1280 + 250df52 commit d36af0dc9ef7ede678b9c68974fd854c1eaf2aae @adamjgrant adamjgrant committed Apr 3, 2012
Showing with 1,502 additions and 1,979 deletions.
  1. +640 −3 css/bootstrap.css
  2. +310 −1 extras/settings/overrides.less
  3. +46 −0 extras/settings/theme.less
  4. BIN extras/themes/sandra/img/pencils.jpg
  5. BIN extras/themes/sandra/img/weirdguy.jpg
  6. BIN extras/themes/sandra/img/weirdguy2.jpg
  7. BIN extras/themes/sandra/img/weirdguy3.jpg
  8. BIN extras/themes/sandra/img/weirdguy4.jpg
  9. +23 −2 extras/themes/sandra/less/sandra.less
  10. +0 −46 extras/themes/settings.less
  11. +112 −707 index.html
  12. +0 −2 intermediate/js/bootstrap-alert.js
  13. +0 −1 intermediate/js/bootstrap-alert.min.js
  14. +0 −2 intermediate/js/bootstrap-button.js
  15. +0 −1 intermediate/js/bootstrap-button.min.js
  16. +0 −4 intermediate/js/bootstrap-carousel.js
  17. +0 −1 intermediate/js/bootstrap-carousel.min.js
  18. +0 −4 intermediate/js/bootstrap-collapse.js
  19. +0 −1 intermediate/js/bootstrap-collapse.min.js
  20. +0 −2 intermediate/js/bootstrap-dropdown.js
  21. +0 −1 intermediate/js/bootstrap-dropdown.min.js
  22. +0 −6 intermediate/js/bootstrap-modal.js
  23. +0 −1 intermediate/js/bootstrap-modal.min.js
  24. +0 −3 intermediate/js/bootstrap-popover.js
  25. +0 −1 intermediate/js/bootstrap-popover.min.js
  26. +0 −3 intermediate/js/bootstrap-scrollspy.js
  27. +0 −1 intermediate/js/bootstrap-scrollspy.min.js
  28. +0 −3 intermediate/js/bootstrap-tab.js
  29. +0 −1 intermediate/js/bootstrap-tab.min.js
  30. +0 −8 intermediate/js/bootstrap-tooltip.js
  31. +0 −1 intermediate/js/bootstrap-tooltip.min.js
  32. +0 −1 intermediate/js/bootstrap-transition.js
  33. +0 −1 intermediate/js/bootstrap-transition.min.js
  34. +0 −7 intermediate/js/bootstrap-typeahead.js
  35. +0 −1 intermediate/js/bootstrap-typeahead.min.js
  36. +0 −1 intermediate/js/bootstrap.min.js
  37. +0 −301 intermediate/js/otherscripts-concat.js
  38. +0 −1 intermediate/js/scripts-concat.js
  39. +0 −302 intermediate/js/scripts-concat.min.js
  40. +0 −3 intermediate/js/tests/unit/bootstrap-alert.js
  41. +0 −5 intermediate/js/tests/unit/bootstrap-button.js
  42. +0 −2 intermediate/js/tests/unit/bootstrap-collapse.js
  43. +0 −3 intermediate/js/tests/unit/bootstrap-dropdown.js
  44. +0 −4 intermediate/js/tests/unit/bootstrap-modal.js
  45. +0 −5 intermediate/js/tests/unit/bootstrap-popover.js
  46. +0 −2 intermediate/js/tests/unit/bootstrap-scrollspy.js
  47. +0 −3 intermediate/js/tests/unit/bootstrap-tab.js
  48. +0 −4 intermediate/js/tests/unit/bootstrap-tooltip.js
  49. +0 −1 intermediate/js/tests/unit/bootstrap-transition.js
  50. +0 −6 intermediate/js/tests/unit/bootstrap-typeahead.js
  51. +0 −183 intermediate/js/tests/vendor/jquery.js
  52. +0 −35 intermediate/js/tests/vendor/qunit.js
  53. +371 −0 less/responsive.less
  54. +0 −302 publish/js/f07b60b.js
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -263,7 +263,316 @@ ol.linenums li {
text-shadow: 0 1px 0 #fff;
}
- @import "../../extras/themes/settings.less"; // Kickstrap themes
+// RESPONSIVENESS
+// --------------
+
+// Responsive.less
+// For phone and tablet devices
+// -------------------------------------------------------------
+
+// Hide from screenreaders and browsers
+// Credit: HTML5 Boilerplate
+.hidden {
+ display: none;
+ visibility: hidden;
+}
+
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+ // Smooth out the collapsing/expanding nav
+ .nav-collapse {
+ -webkit-transform: translate3d(0, 0, 0); // activate the GPU
+ }
+
+ // Block level the page header small tag for readability
+ .page-header h1 small {
+ display: block;
+ line-height: @baseLineHeight;
+ }
+
+ // Make span* classes full width
+ input[class*="span"],
+ select[class*="span"],
+ textarea[class*="span"],
+ .uneditable-input {
+ display: block;
+ width: 100%;
+ min-height: 28px; /* Make inputs at least the height of their button counterpart */
+ /* Makes inputs behave like true block-level elements */
+ -webkit-box-sizing: border-box; /* Older Webkit */
+ -moz-box-sizing: border-box; /* Older FF */
+ -ms-box-sizing: border-box; /* IE8 */
+ box-sizing: border-box; /* CSS3 spec*/
+ }
+ // But don't let it screw up prepend/append inputs
+ .input-prepend input[class*="span"],
+ .input-append input[class*="span"] {
+ width: auto;
+ }
+
+ // Update checkboxes for iOS
+ input[type="checkbox"],
+ input[type="radio"] {
+ border: 1px solid #ccc;
+ }
+
+ // Remove the horizontal form styles
+ .form-horizontal .control-group > label {
+ float: none;
+ width: auto;
+ padding-top: 0;
+ text-align: left;
+ }
+ // Move over all input controls and content
+ .form-horizontal .controls {
+ margin-left: 0;
+ }
+ // Move the options list down to align with labels
+ .form-horizontal .control-list {
+ padding-top: 0; // has to be padding because margin collaspes
+ }
+ // Move over buttons in .form-actions to align with .controls
+ .form-horizontal .form-actions {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+
+ // Modals
+ .modal {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ right: 10px;
+ width: auto;
+ margin: 0;
+ &.fade.in { top: auto; }
+ }
+ .modal-header .close {
+ padding: 10px;
+ margin: -10px;
+ }
+
+ // Carousel
+ .carousel-caption {
+ position: static;
+ }
+
+}
+
+
+
+// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
+// --------------------------------------------------
+
+@media (max-width: 767px) {
+ // GRID & CONTAINERS
+ // -----------------
+ // Remove width from containers
+ .container {
+ width: auto;
+ padding: 0 20px;
+ }
+ // Fluid rows
+ .row-fluid {
+ width: 100%;
+ }
+ // Undo negative margin on rows
+ .row {
+ margin-left: 0;
+ }
+ // Make all columns even
+ .row > [class*="span"],
+ .row-fluid > [class*="span"] {
+ float: none;
+ display: block;
+ width: auto;
+ margin: 0;
+ }
+}
+
+
+
+// PORTRAIT TABLET TO DEFAULT DESKTOP
+// ----------------------------------
+
+@media (min-width: 768px) and (max-width: 979px) {
+
+ // Fixed grid
+ #gridSystem > .generate(12, 42px, 20px);
+
+ // Fluid grid
+ #fluidGridSystem > .generate(12, 5.801104972%, 2.762430939%);
+
+ // Input grid
+ #inputGridSystem > .generate(12, 42px, 20px);
+
+}
+
+
+
+// TABLETS AND BELOW
+// -----------------
+@media (max-width: 979px) {
+
+ // UNFIX THE TOPBAR
+ // ----------------
+ // Remove any padding from the body
+ body {
+ padding-top: 0;
+ }
+ // Unfix the navbar
+ .navbar-fixed-top {
+ position: static;
+ margin-bottom: @baseLineHeight;
+ }
+ .navbar-fixed-top .navbar-inner {
+ padding: 5px;
+ }
+ .navbar .container {
+ width: auto;
+ padding: 0;
+ }
+ // Account for brand name
+ .navbar .brand {
+ padding-left: 10px;
+ padding-right: 10px;
+ margin: 0 0 0 -5px;
+ }
+ // Nav collapse clears brand
+ .navbar .nav-collapse {
+ clear: left;
+ }
+ // Block-level the nav
+ .navbar .nav {
+ float: none;
+ margin: 0 0 (@baseLineHeight / 2);
+ }
+ .navbar .nav > li {
+ float: none;
+ }
+ .navbar .nav > li > a {
+ margin-bottom: 2px;
+ }
+ .navbar .nav > .divider-vertical {
+ display: none;
+ }
+ .navbar .nav .nav-header {
+ color: @navbarText;
+ text-shadow: none;
+ }
+ // Nav and dropdown links in navbar
+ .navbar .nav > li > a,
+ .navbar .dropdown-menu a {
+ padding: 6px 15px;
+ font-weight: bold;
+ color: @navbarLinkColor;
+ .border-radius(3px);
+ }
+ .navbar .dropdown-menu li + li a {
+ margin-bottom: 2px;
+ }
+ .navbar .nav > li > a:hover,
+ .navbar .dropdown-menu a:hover {
+ background-color: @navbarBackground;
+ }
+ // Dropdowns in the navbar
+ .navbar .dropdown-menu {
+ position: static;
+ top: auto;
+ left: auto;
+ float: none;
+ display: block;
+ max-width: none;
+ margin: 0 15px;
+ padding: 0;
+ background-color: transparent;
+ border: none;
+ .border-radius(0);
+ .box-shadow(none);
+ }
+ .navbar .dropdown-menu:before,
+ .navbar .dropdown-menu:after {
+ display: none;
+ }
+ .navbar .dropdown-menu .divider {
+ display: none;
+ }
+ // Forms in navbar
+ .navbar-form,
+ .navbar-search {
+ float: none;
+ padding: (@baseLineHeight / 2) 15px;
+ margin: (@baseLineHeight / 2) 0;
+ border-top: 1px solid @navbarBackground;
+ border-bottom: 1px solid @navbarBackground;
+ @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+ .box-shadow(@shadow);
+ }
+ // Pull right (secondary) nav content
+ .navbar .nav.pull-right {
+ float: none;
+ margin-left: 0;
+ }
+ // Static navbar
+ .navbar-static .navbar-inner {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ // Navbar button
+ .btn-navbar {
+ display: block;
+ }
+
+ // Hide everything in the navbar save .brand and toggle button */
+ .nav-collapse {
+ overflow: hidden;
+ height: 0;
+ }
+}
+
+
+
+// DEFAULT DESKTOP
+// ---------------
+
+@media (min-width: 980px) {
+ .nav-collapse.collapse {
+ height: auto !important;
+ }
+}
+
+
+
+// LARGE DESKTOP & UP
+// ------------------
+
+@media (min-width: 1200px) {
+
+ // Fixed grid
+ #gridSystem > .generate(12, 70px, 30px);
+
+ // Fluid grid
+ #fluidGridSystem > .generate(12, 5.982905983%, 2.564102564%);
+
+ // Input grid
+ #inputGridSystem > .generate(12, 70px, 30px);
+
+ // Thumbnails
+ .thumbnails {
+ margin-left: -30px;
+ }
+ .thumbnails > li {
+ margin-left: 30px;
+ }
+
+}
+
+ @import "theme.less"; // Kickstrap themes
@import "../../extras/fontawesome/font-awesome.less"; // Using awesomefont instead of an image sprite.
@import "../../extras/icomoon/icomoon.less"; // Turn this on if you want even more fonts from IcoMoon.
@import "../../extras/chosen/chosen.less"; // Chosen for select boxes
View
@@ -0,0 +1,46 @@
+ //THEME
+ //-----
+
+ // Switch to a theme by uncommenting [remove the '/'s from] the @import lines.
+ // (one and only one line!)
+ // A more user-friendly way to do this is coming :)
+ // Thanks to bootswatch for the themes: http://bootswatch.com/
+
+ // CERULEAN
+ // @import "../themes/cerulean/less/cerulean.less";
+
+ // SLATE
+ // @import "../themes/slate/less/slate.less";
+
+ // SPRUCE
+ // @import "../themes/spruce/less/spruce.less";
+
+ // CYBORG
+ // @import "../themes/cyborg/less/cyborg.less";
+
+ // AMELIA
+ // @import "../themes/amelia/less/amelia.less";
+
+ // SIMPLEX
+ // @import "../themes/simplex/less/simplex.less";
+
+ // JOURNAL
+ // @import "../themes/journal/less/journal.less";
+
+ // READABLE
+ // @import "../themes/readable/less/readable.less";
+
+ // SANDRA
+ @import "../themes/sandra/less/sandra.less";
+
+ // SPACELAB
+ // @import "../themes/spacelab/less/spacelab.less";
+
+ // SUPERHERO
+ // @import "../themes/superhero/less/superhero.less";
+
+ // UNITED
+ // @import "../themes/united/less/united.less";
+
+ //--------
+ //END THEME
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit d36af0d

Please sign in to comment.