Permalink
Browse files

Added assetic use, and assets minification

  • Loading branch information...
yohang committed Oct 7, 2012
1 parent 159c54b commit 835be0133a7403377bb35c4f2ce619693ca6752f
Showing with 9,716 additions and 5,971 deletions.
  1. +3 −0 .gitignore
  2. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-affix.js
  3. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-alert.js
  4. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-button.js
  5. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-carousel.js
  6. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-collapse.js
  7. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-dropdown.js
  8. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-modal.js
  9. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-popover.js
  10. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-scrollspy.js
  11. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-tab.js
  12. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-tooltip.js
  13. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-transition.js
  14. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/js/bootstrap-typeahead.js
  15. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/accordion.less
  16. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/alerts.less
  17. +1 −1 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/bootstrap.less
  18. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/breadcrumbs.less
  19. +2 −3 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/button-groups.less
  20. +4 −24 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/buttons.less
  21. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/carousel.less
  22. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/close.less
  23. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/code.less
  24. +1 −0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/component-animations.less
  25. +2 −2 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/dropdowns.less
  26. +15 −30 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/forms.less
  27. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/grid.less
  28. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/hero-unit.less
  29. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/labels-badges.less
  30. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/layouts.less
  31. +11 −21 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/mixins.less
  32. +2 −3 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/modals.less
  33. +16 −22 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/navbar.less
  34. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/navs.less
  35. +3 −6 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/pager.less
  36. +17 −17 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/pagination.less
  37. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/popovers.less
  38. +1 −1 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/progress-bars.less
  39. +2 −5 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/reset.less
  40. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/responsive-1200px-min.less
  41. +20 −27 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/responsive-767px-max.less
  42. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/responsive-768px-979px.less
  43. +1 −12 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/responsive-navbar.less
  44. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/responsive-utilities.less
  45. +1 −1 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/responsive.less
  46. +4 −5 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/scaffolding.less
  47. +2 −8 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/sprites.less
  48. +6 −26 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/tables.less
  49. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/tests/css-tests.css
  50. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/tests/css-tests.html
  51. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/tests/forms.html
  52. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/tests/navbar.html
  53. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/thumbnails.less
  54. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/tooltip.less
  55. +3 −18 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/type.less
  56. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/utilities.less
  57. +10 −12 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/variables.less
  58. 0 {web/assets/bootstrap-2.1.1 → app/Resources/bootstrap}/less/wells.less
  59. BIN app/Resources/java/yuicompressor-2.4.7.jar
  60. +9,440 −0 app/Resources/js/jquery-1.8.2.js
  61. +28 −0 app/config/assetic.yml
  62. +16 −28 app/config/config.yml
  63. +1 −1 app/config/config_dev.yml
  64. +3 −1 app/config/parameters.yml-dist
  65. +2 −1 composer.json
  66. +78 −42 composer.lock
  67. 0 {web/css → src/Bricks/SiteBundle/Resources/less}/footer-bottom.less
  68. 0 {web/css → src/Bricks/SiteBundle/Resources/less}/layout.less
  69. 0 {web/css → src/Bricks/SiteBundle/Resources/less}/section-contribute.less
  70. 0 {web/css → src/Bricks/SiteBundle/Resources/less}/security.less
  71. +21 −31 src/Bricks/SiteBundle/Resources/views/layout.html.twig
  72. +0 −37 web/assets/bootstrap-2.1.1/.gitignore
  73. +0 −85 web/assets/bootstrap-2.1.1/.issue-guidelines.js
  74. +0 −3 web/assets/bootstrap-2.1.1/.travis.yml
  75. +0 −176 web/assets/bootstrap-2.1.1/LICENSE
  76. +0 −108 web/assets/bootstrap-2.1.1/Makefile
  77. +0 −139 web/assets/bootstrap-2.1.1/README.md
  78. +0 −12 web/assets/bootstrap-2.1.1/js/.jshintrc
  79. +0 −2,027 web/assets/bootstrap-2.1.1/js/bootstrap.js
  80. +0 −6 web/assets/bootstrap-2.1.1/js/bootstrap.min.js
  81. +0 −56 web/assets/bootstrap-2.1.1/js/tests/index.html
  82. +0 −63 web/assets/bootstrap-2.1.1/js/tests/phantom.js
  83. +0 −14 web/assets/bootstrap-2.1.1/js/tests/server.js
  84. +0 −19 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-affix.js
  85. +0 −56 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-alert.js
  86. +0 −96 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-button.js
  87. +0 −42 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-carousel.js
  88. +0 −88 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-collapse.js
  89. +0 −105 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-dropdown.js
  90. +0 −114 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-modal.js
  91. +0 −21 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-phantom.js
  92. +0 −107 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-popover.js
  93. +0 −31 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-scrollspy.js
  94. +0 −61 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-tab.js
  95. +0 −144 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-tooltip.js
  96. +0 −13 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-transition.js
  97. +0 −204 web/assets/bootstrap-2.1.1/js/tests/unit/bootstrap-typeahead.js
  98. +0 −4 web/assets/bootstrap-2.1.1/js/tests/vendor/jquery.js
  99. +0 −232 web/assets/bootstrap-2.1.1/js/tests/vendor/qunit.css
  100. +0 −1,510 web/assets/bootstrap-2.1.1/js/tests/vendor/qunit.js
  101. +0 −25 web/assets/bootstrap-2.1.1/package.json
  102. +0 −2 web/assets/jquery-1.8.2/jquery-1.8.2.min.js
  103. +0 −9 web/assets/less/less-1.3.0.min.js
  104. +0 −14 web/css/main.less
  105. BIN web/{assets/bootstrap-2.1.1 → }/img/glyphicons-halflings-white.png
  106. BIN web/{assets/bootstrap-2.1.1 → }/img/glyphicons-halflings.png
View
@@ -11,6 +11,9 @@ app/logs/*
app/cache/*
web/uploads/*
web/bundles/*
+web/assetic/*
+web/js/*
+web/css/*
vendor/*
build/*
composer.phar
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.1.1
+ * Bootstrap v2.1.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -7,7 +7,6 @@
.btn-group {
position: relative;
font-size: 0; // remove as part 1 of font-size inline-block hack
- vertical-align: middle; // match .btn alignment given font-size hack above
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
.ie7-restore-left-whitespace();
}
@@ -120,7 +119,7 @@
.btn-group > .btn + .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
- .box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
+ .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top: 5px;
*padding-bottom: 5px;
}
@@ -147,7 +146,7 @@
// Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle {
background-image: none;
- .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
}
// Keep the hover's background when dropdown is open
@@ -24,7 +24,7 @@
border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px);
.ie7-restore-left-whitespace(); // Give IE7 some love
- .box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
+ .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
// Hover state
&:hover {
@@ -51,7 +51,7 @@
background-color: darken(@white, 15%) e("\9");
background-image: none;
outline: 0;
- .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
}
// Disabled state
@@ -96,36 +96,21 @@
.btn-mini {
padding: 2px 6px;
font-size: @baseFontSize - 3px;
- line-height: @baseLineHeight - 3px;
+ line-height: @baseLineHeight - 4px;
}
-
// Block button
-// -------------------------
-
.btn-block {
display: block;
width: 100%;
padding-left: 0;
padding-right: 0;
.box-sizing(border-box);
}
-
-// Vertically space out multiple block buttons
.btn-block + .btn-block {
margin-top: 5px;
}
-// Specificity overrides
-input[type="submit"],
-input[type="reset"],
-input[type="button"] {
- &.btn-block {
- width: 100%;
- }
-}
-
-
// Alternate buttons
// --------------------------------------------------
@@ -208,8 +193,7 @@ input[type="submit"].btn {
// Make a button look and behave like a link
.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
+.btn-link:active {
background-color: transparent;
background-image: none;
.box-shadow(none);
@@ -225,7 +209,3 @@ input[type="submit"].btn {
text-decoration: underline;
background-color: transparent;
}
-.btn-link[disabled]:hover {
- color: @grayDark;
- text-decoration: none;
-}
@@ -15,6 +15,7 @@
position: relative;
height: 0;
overflow: hidden;
+ overflow: visible \9;
.transition(height .35s ease);
&.in {
height: auto;
@@ -148,7 +148,7 @@
.caret {
border-top: 0;
border-bottom: 4px solid @black;
- content: "";
+ content: "\2191";
}
// Different positioning for bottom up menu
.dropdown-menu {
@@ -172,7 +172,7 @@
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
}
-.dropdown-submenu:hover > .dropdown-menu {
+.dropdown-submenu:hover .dropdown-menu {
display: block;
}
@@ -91,9 +91,8 @@ input[type="color"],
// Reset appearance properties for textual inputs and textarea
// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
input,
-textarea,
-.uneditable-input {
- width: 206px; // plus 12px padding and 2px border
+textarea {
+ width: 210px;
}
// Reset height since textareas have rows
textarea {
@@ -126,7 +125,7 @@ input[type="color"],
border-color: rgba(82,168,236,.8);
outline: 0;
outline: thin dotted \9; /* IE6-9 */
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6));
+ .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
}
}
@@ -162,7 +161,7 @@ input[type="file"] {
// Make select elements obey height by applying a border
select {
width: 220px; // default input width + 10px of padding that doesn't get applied
- border: 1px solid @inputBorder;
+ border: 1px solid #bbb;
background-color: @inputBackground; // Chrome on Linux and Mobile Safari need background-color
}
@@ -210,7 +209,7 @@ input[type="checkbox"]:focus {
// Placeholder
// -------------------------
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector
+// Placeholder text gets special styles; can't be bundled together though for some reason
input,
textarea {
.placeholder();
@@ -350,10 +349,6 @@ input[type="checkbox"][readonly] {
.control-group.success {
.formFieldState(@successText, @successText, @successBackground);
}
-// Success
-.control-group.info {
- .formFieldState(@infoText, @infoText, @infoBackground);
-}
// HTML5 invalid states
// Shares styles with the .control-group.error above
@@ -446,6 +441,7 @@ select:focus:required:invalid {
}
.add-on,
.btn {
+ margin-left: -1px;
vertical-align: top;
.border-radius(0);
}
@@ -470,10 +466,6 @@ select:focus:required:invalid {
.uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
- .add-on,
- .btn {
- margin-left: -1px;
- }
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
@@ -518,16 +510,16 @@ input.search-query {
.border-radius(0); // Override due to specificity
}
.form-search .input-append .search-query {
- .border-radius(14px 0 0 14px);
+ .border-radius(14px 0 0 14px)
}
.form-search .input-append .btn {
- .border-radius(0 14px 14px 0);
+ .border-radius(0 14px 14px 0)
}
.form-search .input-prepend .search-query {
- .border-radius(0 14px 14px 0);
+ .border-radius(0 14px 14px 0)
}
.form-search .input-prepend .btn {
- .border-radius(14px 0 0 14px);
+ .border-radius(14px 0 0 14px)
}
@@ -615,7 +607,7 @@ legend + .control-group {
// Float the labels left
.control-label {
float: left;
- width: @horizontalComponentOffset - 20;
+ width: 140px;
padding-top: 5px;
text-align: right;
}
@@ -625,26 +617,19 @@ legend + .control-group {
// don't inherit the margin of the parent, in this case .controls
*display: inline-block;
*padding-left: 20px;
- margin-left: @horizontalComponentOffset;
+ margin-left: 160px;
*margin-left: 0;
&:first-child {
- *padding-left: @horizontalComponentOffset;
+ *padding-left: 160px;
}
}
// Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block {
+ margin-top: @baseLineHeight / 2;
margin-bottom: 0;
}
- // And apply it only to .help-block instances that follow a form control
- input,
- select,
- textarea {
- + .help-block {
- margin-top: @baseLineHeight / 2;
- }
- }
// Move over buttons in .form-actions to align with .controls
.form-actions {
- padding-left: @horizontalComponentOffset;
+ padding-left: 160px;
}
}
@@ -175,15 +175,14 @@
select,
textarea {
color: @textColor;
- }
- input,
- select,
- textarea {
border-color: @borderColor;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
border-color: darken(@borderColor, 10%);
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%));
+ // Write out in full since the lighten() function isn't easily escaped
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
}
}
// Give a small background color for input-prepend/-append
@@ -248,12 +247,10 @@
}
// Drop shadows
-.box-shadow(@shadowA, @shadowB:X, ...){
- // Multiple shadow solution from http://toekneestuck.com/blog/2012/05/15/less-css-arguments-variable/
- @props: ~`"@{arguments}".replace(/[\[\]]|\,\sX/g, '')`;
- -webkit-box-shadow: @props;
- -moz-box-shadow: @props;
- box-shadow: @props;
+.box-shadow(@shadow) {
+ -webkit-box-shadow: @shadow;
+ -moz-box-shadow: @shadow;
+ box-shadow: @shadow;
}
// Transitions
@@ -263,12 +260,6 @@
-o-transition: @transition;
transition: @transition;
}
-.transition-delay(@transition-delay) {
- -webkit-transition-delay: @transition-delay;
- -moz-transition-delay: @transition-delay;
- -o-transition-delay: @transition-delay;
- transition-delay: @transition-delay;
-}
// Transformations
.rotate(@degrees) {
@@ -295,7 +286,7 @@
.skew(@x, @y) {
-webkit-transform: skew(@x, @y);
-moz-transform: skew(@x, @y);
- -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twitter/bootstrap/issues/4885
+ -ms-transform: skew(@x, @y);
-o-transform: skew(@x, @y);
transform: skew(@x, @y);
}
@@ -441,7 +432,7 @@
background-color: mix(@midColor, @endColor, 80%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
- background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
+ background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop*100%, @endColor);
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-repeat: no-repeat;
@@ -455,7 +446,7 @@
background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
background-repeat: no-repeat;
}
- .striped(@color: #555, @angle: 45deg) {
+ .striped(@color, @angle: 45deg) {
background-color: @color;
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
@@ -584,7 +575,6 @@
[class*="span"] {
float: left;
- min-height: 1px; // prevent collapsing columns
margin-left: @gridGutterWidth;
}
@@ -3,9 +3,8 @@
// --------------------------------------------------
-// Recalculate z-index where appropriate,
-// but only apply to elements within modal
-.modal-open .modal {
+// Recalculate z-index where appropriate
+.modal-open {
.dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
.dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
.popover { z-index: @zindexPopover + @zindexModal; }
Oops, something went wrong.

0 comments on commit 835be01

Please sign in to comment.