Merge pull request #4476 from WebsiteDeveloper/less-upgrade

redmunds · redmunds · commit 939d97f9a5de · 2013-09-16T07:30:30.000-07:00
[OPEN] Update Less to 1.4.2
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -100,7 +100,7 @@ module.exports = function (grunt) {
                     'src/thirdparty/CodeMirror2/addon/selection/active-line.js',
                     'src/thirdparty/mustache/mustache.js',
                     'src/thirdparty/path-utils/path-utils.min',
-                    'src/thirdparty/less-1.3.3.min.js'
+                    'src/thirdparty/less-1.4.2.min.js'
                 ],
                 helpers : [
                     'test/spec/PhantomHelper.js'
diff --git a/src/index.html b/src/index.html
@@ -1,24 +1,24 @@
 <!doctype html>
 
-<!-- 
+<!--
   Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
    
   Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"), 
-  to deal in the Software without restriction, including without limitation 
-  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-  and/or sell copies of the Software, and to permit persons to whom the 
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
   Software is furnished to do so, subject to the following conditions:
    
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
    
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.
 -->
 
@@ -37,7 +37,7 @@
 
     <!-- TODO (Issue #278): switch between runtime LESS compilation in dev mode and precompiled version -->
     <link rel="stylesheet/less" href="styles/brackets.less">
-    <script src="thirdparty/less-1.3.3.min.js"></script>
+    <script src="thirdparty/less-1.4.2.min.js"></script>
     <script src="thirdparty/mustache/mustache.js"></script>
     <!-- <link rel="stylesheet" href="brackets.min.css"> -->
 
@@ -60,7 +60,7 @@
 <body>
 
     <!-- HTML content is dynamically loaded and rendered by brackets.js.
-         Any modules that depend on or modify HTML during load should 
+         Any modules that depend on or modify HTML during load should
          require the "utils/AppInit" module and install a callback for
          "htmlReady" (e.g. AppInit.htmlReady(handler)) before touching the DOM.
     -->
diff --git a/src/styles/bootstrap/mixins.less b/src/styles/bootstrap/mixins.less
@@ -384,7 +384,7 @@
 
 // Opacity
 .opacity(@opacity) {
-  opacity: @opacity / 100;
+  opacity: (@opacity / 100);
   filter: ~"alpha(opacity=@{opacity})";
 }
 
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
@@ -271,8 +271,8 @@ a, img {
         background-color: @tc-gray-panel-top-bar;
         border-bottom: @tc-gray-panel-top-bar-shadow;
         height: auto;
-        padding-top: @base-padding / 2;
-        padding-bottom: @base-padding / 2;
+        padding-top: (@base-padding / 2);
+        padding-bottom: (@base-padding / 2);
         z-index: @z-index-brackets-results-panel;
         box-shadow: @tc-gray-panel-bevel, @tc-small-shadow-top;
         .title {
@@ -500,7 +500,7 @@ a, img {
     .box-flex(1);
 
     .jstree-brackets li > a {
-        padding-right: @sidebar-triangle-size * 2;
+        padding-right: (@sidebar-triangle-size * 2);
     }
 
     ul {
diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
@@ -201,7 +201,7 @@
     }
     
     .CodeMirror-focused .CodeMirror-activeline-background {
-        background: darken(@activeline-bgcolor, @bc-color-step-size / 2);
+        background: darken(@activeline-bgcolor, (@bc-color-step-size / 2)); 
     }
     .CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt {
         background: darken(@activeline-bgcolor, @bc-color-step-size / 2);
diff --git a/src/styles/brackets_patterns_override.less b/src/styles/brackets_patterns_override.less
@@ -800,7 +800,7 @@ input[type="color"],
     background-color: @tc-input-background;
     border: 1px solid @tc-input-border;
     color: @tc-text;
-    font-size: @baseFontSize + 1px;
+    font-size: (@baseFontSize + 1px);
     .border-radius(@tc-control-border-radius);
     .box-shadow(@tc-input-inner-shadow);
     .transition(~"border linear 0s, box-shadow linear 0s");
@@ -879,8 +879,8 @@ input[type="color"],
     background-color: @tc-button-background;
     text-shadow: @tc-text-shadow;
     color: @tc-text;
-    cursor: default;
-    font-size: @baseFontSize + 1;
+    cursor: default;    
+    font-size: (@baseFontSize + 1);
     font-weight: @font-weight-semibold;
     line-height: normal;
     border: 1px solid @tc-gray-component-border;
@@ -938,11 +938,11 @@ input[type="color"],
 
     // Button Sizes
     &.large {
-        font-size: @baseFontSize + 1px;
+        font-size: (@baseFontSize + 1px);
         .border-radius(@tc-control-border-radius);
     }
     &.small {
-        font-size: @baseFontSize - 1px;
+        font-size: (@baseFontSize - 1px);
     }
 }
 
diff --git a/src/styles/brackets_shared.less b/src/styles/brackets_shared.less
@@ -1,22 +1,22 @@
 
 // Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
-//  
+//
 // Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"), 
-// to deal in the Software without restriction, including without limitation 
-// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-// and/or sell copies of the Software, and to permit persons to whom the 
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
 // Software is furnished to do so, subject to the following conditions:
-//  
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-//  
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
 
@@ -25,9 +25,9 @@
  * IMPORTANT: Importing this file should be the first step in creating a
  * version-specific LESS file.
  *
- * ALSO IMPORTANT: All CSS imports should occur first in this file. This is 
- * because LESS puts all CSS imports at the top of the file anyway (because 
- * this is required by CSS2). So, we don't want to be misleading about the 
+ * ALSO IMPORTANT: All CSS imports should occur first in this file. This is
+ * because LESS puts all CSS imports at the top of the file anyway (because
+ * this is required by CSS2). So, we don't want to be misleading about the
  * processing order.
  */
 
@@ -40,26 +40,26 @@
 /* LESS imports */
 
 // Bootstrap @ v.2.3.1
-@import url(bootstrap/bootstrap.less);
+@import url("bootstrap/bootstrap.less");
 
 // Brackets-specific variables, mixins and overrides
-@import url(brackets_variables.less);
-@import url(brackets_mixins.less);
-@import url(brackets_patterns_override.less);
+@import url("brackets_variables.less");
+@import url("brackets_mixins.less");
+@import url("brackets_patterns_override.less");
 
 // Brackets-specific default font and color definitions
-@import url(brackets_fonts.less);
-@import url(brackets_colors.less);
+@import url("brackets_fonts.less");
+@import url("brackets_colors.less");
 
 // Default theme -- all UI styling comes from variables in a theme
 // Themes can rely on variables defined above
-@import url(brackets_theme_default.less);
+@import url("brackets_theme_default.less");
 
 // Codemirror styling overrides
-@import url(brackets_codemirror_override.less);
+@import url("brackets_codemirror_override.less");
 
 // Styling for file tree
-@import url(jsTreeTheme.less);
+@import url("jsTreeTheme.less");
 
 // Styling for scrollbars
-@import url(brackets_scrollbars.less);
+@import url("brackets_scrollbars.less");
diff --git a/src/styles/brackets_variables.less b/src/styles/brackets_variables.less
@@ -42,17 +42,17 @@
 @z-index-cm-dialog: 15;
 @z-index-cm-max: @z-index-cm-dialog;
 
-@z-index-brackets-ui: @z-index-cm-max + 1;
+@z-index-brackets-ui: (@z-index-cm-max + 1);
 @z-index-brackets-results-panel: @z-index-brackets-ui;
-@z-index-brackets-selection-triangle: @z-index-brackets-ui + 1;
-@z-index-brackets-scroller-shadow: @z-index-brackets-selection-triangle + 1;
+@z-index-brackets-selection-triangle: (@z-index-brackets-ui + 1);
+@z-index-brackets-scroller-shadow: (@z-index-brackets-selection-triangle + 1);
 @z-index-brackets-inline-editor-shadow: @z-index-brackets-ui;
 @z-index-brackets-toolbar: @z-index-brackets-ui;
 @z-index-brackets-max: @z-index-brackets-toolbar;
 @z-index-brackets-modalbar: @z-index-brackets-toolbar - 1;
 
-@z-index-brackets-sidebar-resizer: @z-index-brackets-ui + 2;
-@z-index-brackets-resizer-div: @z-index-brackets-sidebar-resizer + 1;
-@z-index-brackets-panel-resizer: @z-index-brackets-ui + 2;
+@z-index-brackets-sidebar-resizer: (@z-index-brackets-ui + 2);
+@z-index-brackets-resizer-div: (@z-index-brackets-sidebar-resizer + 1);
+@z-index-brackets-panel-resizer: (@z-index-brackets-ui + 2);
 
 @z-index-brackets-context-menu-base:    1000;
diff --git a/src/styles/jsTreeTheme.less b/src/styles/jsTreeTheme.less
@@ -44,7 +44,7 @@
  */
 .jstree-brackets li > a {
     @jstree-icon-text-overlap: 2px;
-    padding-left: (@jstree-sprite-size - @jstree-icon-backindent - @jstree-icon-text-overlap) + 10000px;
+    padding-left: (@jstree-sprite-size - @jstree-icon-backindent - @jstree-icon-text-overlap + 10000px);
     margin-left: -10000px;
     display: block;
 }
diff --git a/src/thirdparty/less-1.3.3.min.js b/src/thirdparty/less-1.3.3.min.js
diff --git a/src/thirdparty/less-1.4.2.min.js b/src/thirdparty/less-1.4.2.min.js
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
@@ -1,25 +1,25 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
   "https://www.w3.org/TR/html4/loose.dtd">
 
-<!-- 
+<!--
   Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
    
   Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"), 
-  to deal in the Software without restriction, including without limitation 
-  the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-  and/or sell copies of the Software, and to permit persons to whom the 
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
   Software is furnished to do so, subject to the following conditions:
    
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
    
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.
 -->
 
@@ -40,13 +40,13 @@
   <script src="../src/thirdparty/CodeMirror2/addon/search/searchcursor.js"></script>
   <script src="../src/thirdparty/CodeMirror2/addon/edit/closetag.js"></script>
   <script src="../src/thirdparty/CodeMirror2/addon/edit/closebrackets.js"></script>
-  <script src="../src/thirdparty/CodeMirror2/addon/selection/active-line.js"></script> 
+  <script src="../src/thirdparty/CodeMirror2/addon/selection/active-line.js"></script>
   <script src="../src/thirdparty/mustache/mustache.js"></script>
   <script src="../src/thirdparty/path-utils/path-utils.js"></script>
-  <script src="../src/thirdparty/less-1.3.3.min.js"></script>
+  <script src="../src/thirdparty/less-1.4.2.min.js"></script>
   <script src="thirdparty/bootstrap2/js/bootstrap.min.js"></script>
     
-  <!-- All other scripts are loaded through require. -->  
+  <!-- All other scripts are loaded through require. -->
   <script src="../src/thirdparty/requirejs/require.js" data-main="SpecRunner"></script>
 
 </head>
diff --git a/test/spec/ExtensionUtils-test-files/basic.less b/test/spec/ExtensionUtils-test-files/basic.less
@@ -1,5 +1,5 @@
 /* basic.less */
-@import "sub dir/fourth.less";
+@import url("sub dir/fourth.less");
 @size: 33px;
 
 #project-title {

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@`
`384`	`384`
`385`	`385`	`// Opacity`
`386`	`386`	`.opacity(@opacity) {`
`387`		`- opacity: @opacity / 100;`
	`387`	`+ opacity: (@opacity / 100);`
`388`	`388`	`filter: ~"alpha(opacity=@{opacity})";`
`389`	`389`	`}`
`390`	`390`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`.CodeMirror-focused .CodeMirror-activeline-background {`
`204`		`- background: darken(@activeline-bgcolor, @bc-color-step-size / 2);`
	`204`	`+ background: darken(@activeline-bgcolor, (@bc-color-step-size / 2));`
`205`	`205`	`}`
`206`	`206`	`.CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt {`
`207`	`207`	`background: darken(@activeline-bgcolor, @bc-color-step-size / 2);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`*/`
`45`	`45`	`.jstree-brackets li > a {`
`46`	`46`	`@jstree-icon-text-overlap: 2px;`
`47`		`- padding-left: (@jstree-sprite-size - @jstree-icon-backindent - @jstree-icon-text-overlap) + 10000px;`
	`47`	`+ padding-left: (@jstree-sprite-size - @jstree-icon-backindent - @jstree-icon-text-overlap + 10000px);`
`48`	`48`	`margin-left: -10000px;`
`49`	`49`	`display: block;`
`50`	`50`	`}`