Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim trailing whitespace #2093

Merged
merged 1 commit into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/code/core/Mage/Catalog/Model/Category/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
4 changes: 2 additions & 2 deletions dev/openmage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions skin/adminhtml/default/default/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand All @@ -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 */
Expand Down
10 changes: 5 additions & 5 deletions skin/frontend/default/blue/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion skin/frontend/rwd/default/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions skin/frontend/rwd/default/scss/mixin/_breakpoint.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}

Expand Down