Merge pull request #2093 from luigifab/trim-whitespace

Trim trailing whitespace
OpenMage · May 18, 2022 · f0c14a0 · f0c14a0
2 parents 0a30133 + 94cda1a
commit f0c14a0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php
@@ -460,7 +460,6 @@ public function assignedProducts($categoryId, $store = null)
      * @param int $productId
      * @param int $position
      * @param null|string $identifierType Should be 'sku' when working with SKU's. Leave null when using ID's
-     
      * @return boolean
      * @throws Mage_Api_Exception
      */

diff --git a/dev/openmage/README.md b/dev/openmage/README.md
@@ -46,7 +46,7 @@ You can override some defaults using environment variables defined in a file tha
 - `HOST_NAME=your-preferred-hostname`
   - `openmage-7f000001.nip.io` is used by default to resolve to `127.0.0.1`. See [nip.io](https://nip.io) for more info.
 - `HOST_PORT=8888`
-   - `80` is used by default 
+   - `80` is used by default
 - `ADMIN_EMAIL`
 - `ADMIN_USERNAME`
 - `ADMIN_PASSWORD`
@@ -66,7 +66,7 @@ Building
 ===
 
 The Docker images are built using the [meanbee/docker-magento](https://github.com/meanbee/docker-magento) source files so to build new images first
-clone the source files into this directory and then run `docker-compose build`. 
+clone the source files into this directory and then run `docker-compose build`.
 
 ```
 $ git clone https://github.com/meanbee/docker-magento.git

diff --git a/skin/adminhtml/default/default/reset.css b/skin/adminhtml/default/default/reset.css
@@ -42,8 +42,8 @@ h3                      { margin-bottom:.5em; color:#253033; font-size:1.25em; }
 h4                      { margin-bottom:.6em; color:#494848; font-size:1.05em; }
 h5                      { font-size:1.05em; }
 h6                      { font-size:1em; }
-h1 a, h1 a:hover, 
-h2 a, h2 a:hover, 
+h1 a, h1 a:hover,
+h2 a, h2 a:hover,
 h3 a, h3 a:hover,
 h4 a, h4 a:hover        { font-weight:normal; }
 
@@ -55,7 +55,7 @@ td                      { padding:0; vertical-align:top; }
 p, address              { margin-bottom:.5em; }
 address                 { font-style:normal; }
 cite                    { font-style:normal; font-size:10px; }
-q:before, 
+q:before,
 q:after                 { content:'';}
 
 /* Form */

diff --git a/skin/frontend/default/blue/css/styles.css b/skin/frontend/default/blue/css/styles.css
@@ -188,11 +188,11 @@ input.input-text:focus,select:focus,textarea:focus { background-color:#fafaec; }
 .form-list li.additional-row .btn-remove { float:right; margin:5px 0 0; }
 .form-list .input-range input.input-text { width:74px; }
 
-.form-list-narrow li  { margin-bottom:0; } 
-.form-list-narrow li .input-box { margin-bottom:6px; } 
-.form-list-narrow li.wide .input-box { width:260px; } 
-.form-list-narrow li.wide input.input-text, 
-.form-list-narrow li.wide textarea { width:254px } 
+.form-list-narrow li  { margin-bottom:0; }
+.form-list-narrow li .input-box { margin-bottom:6px; }
+.form-list-narrow li.wide .input-box { width:260px; }
+.form-list-narrow li.wide input.input-text,
+.form-list-narrow li.wide textarea { width:254px }
 .form-list-narrow li.wide select { width:260px; }
 
 /* Customer */

diff --git a/skin/frontend/rwd/default/js/app.js b/skin/frontend/rwd/default/js/app.js
@@ -873,7 +873,7 @@ $j(document).ready(function () {
     // ==============================================
     // UI Pattern - Toggle Content (tabs and accordions in one setup)
     // ==============================================
-    
+
     $j('.toggle-content').each(function () {
         var wrapper = jQuery(this);
 

diff --git a/skin/frontend/rwd/default/scss/mixin/_breakpoint.scss b/skin/frontend/rwd/default/scss/mixin/_breakpoint.scss
@@ -69,22 +69,22 @@ $mq-support: false;
 $mq-fixed-value: 1024;
 
 // Renders at fixed value
-@include bp (min-width, 300px) { 
+@include bp (min-width, 300px) {
     div { color:#000; }
 }
 
 // Doesn't render without MQ support
-@include bp (min-width, 1200px) { 
+@include bp (min-width, 1200px) {
     div { color:#FFF; }
 }
 
 // Doesn't render without MQ support
-@include bp (max-width, 300px) { 
+@include bp (max-width, 300px) {
     div { color:#444; }
 }
 
 // Renders at fixed value
-@include bp (max-width, 1200px) { 
+@include bp (max-width, 1200px) {
     div { color:#888; }
 }