Skip to content

Commit

Permalink
Merge pull request #16 from Rias500/analysis-8LKM3k
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
Rias committed Feb 1, 2019
2 parents 1928368 + e3ea306 commit dc7561b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions src/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
// Predefined colours
'colours' => [
[
'label' => 'red',
'color' => '#ff0000',
'label' => 'red',
'color' => '#ff0000',
'default' => false,
],
[
'label' => 'green',
'color' => '#00ff00',
'label' => 'green',
'color' => '#00ff00',
'default' => false,
],
[
'label' => 'blue',
'color' => '#0000ff',
'label' => 'blue',
'color' => '#0000ff',
'default' => false,
],
[
'label' => 'pink',
'color' => '#ff00ff',
'label' => 'pink',
'color' => '#ff00ff',
'default' => false,
]
],
],
];
4 changes: 2 additions & 2 deletions src/fields/ColourSwatches.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ public function getSettingsHtml()
return Craft::$app->getView()->renderTemplate(
'colour-swatches/settings',
[
'field' => $this,
'config' => $config,
'field' => $this,
'config' => $config,
'configOptions' => Plugin::$plugin->settings->colours,
]
);
Expand Down
2 changes: 1 addition & 1 deletion src/models/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
class Settings extends Model
{
public $colours = [];
}
}

0 comments on commit dc7561b

Please sign in to comment.