Skip to content

Commit

Permalink
Merge pull request #13 from tomirons/develop
Browse files Browse the repository at this point in the history
Merge recent changes into master
  • Loading branch information
tomirons authored Mar 17, 2017
2 parents 267dc4d + b03e7f0 commit 11ea57c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 24 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/.idea
/vendor
composer.lock
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ There are currently 3 different types of classes you can extend. `ActionMailable

#### General Methods
These methods are currently only available in `ActionMailable` and `AlertMailable`.
- `gretting($gretting)` - Sets the greeting for the message.
- `greeting($greeting)` - Sets the greeting for the message.
- `line($line)` - Add a line of text to the message.

### ActionMailable
Expand Down Expand Up @@ -204,4 +204,4 @@ class InvoiceMail extends InvoiceMailable
````

## License
Tuxedo is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
Tuxedo is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)
12 changes: 3 additions & 9 deletions src/Mailables/ActionMailable.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ class ActionMailable extends Mailable
*/
public function info()
{
$this->color = 'blue';

return $this;
return $this->color('blue');
}

/**
Expand All @@ -56,9 +54,7 @@ public function info()
*/
public function success()
{
$this->color = 'green';

return $this;
return $this->color('green');
}

/**
Expand All @@ -68,9 +64,7 @@ public function success()
*/
public function error()
{
$this->color = 'red';

return $this;
return $this->color('red');
}

/**
Expand Down
16 changes: 4 additions & 12 deletions src/Mailables/AlertMailable.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ public function message($text)
*/
public function info()
{
$this->type = 'info';

return $this;
return $this->type('info');
}

/**
Expand All @@ -77,9 +75,7 @@ public function info()
*/
public function warning()
{
$this->type = 'warning';

return $this;
return $this->type('warning');
}

/**
Expand All @@ -89,9 +85,7 @@ public function warning()
*/
public function success()
{
$this->type = 'success';

return $this;
return $this->type('success');
}

/**
Expand All @@ -101,8 +95,6 @@ public function success()
*/
public function error()
{
$this->type = 'error';

return $this;
return $this->type('error');
}
}

0 comments on commit 11ea57c

Please sign in to comment.