Skip to content

Commit

Permalink
Updating to FA v4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinkhill committed Oct 10, 2015
1 parent caf95e1 commit c419c0c
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 53 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 Kevin Hill
Copyright (c) 2015 Kevin Hill

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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"dev-master": "1.0.x-dev"
}
},
"minimum-stability": "dev"
"minimum-stability": "stable"
}
4 changes: 2 additions & 2 deletions public/css/font-awesome.min.css
100644 → 100755

Large diffs are not rendered by default.

Binary file modified public/fonts/FontAwesome.otf
100644 → 100755
Binary file not shown.
Binary file modified public/fonts/fontawesome-webfont.eot
100644 → 100755
Binary file not shown.
105 changes: 90 additions & 15 deletions public/fonts/fontawesome-webfont.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/fonts/fontawesome-webfont.ttf
100644 → 100755
Binary file not shown.
Binary file modified public/fonts/fontawesome-webfont.woff
100644 → 100755
Binary file not shown.
Binary file modified public/fonts/fontawesome-webfont.woff2
100644 → 100755
Binary file not shown.
68 changes: 34 additions & 34 deletions src/Khill/Fontawesome/FontAwesome.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package FontAwesomePHP
* @author Kevin Hill <[email protected]>
* @version 1.0b1
* @version 1.0.3
* @access public
* @see http://kevinkhill.github.io/FontAwesomePHP
*/
Expand All @@ -20,7 +20,7 @@ class FontAwesome {
/**
* HTML Link tag to the FontAwesome CDN
*/
const CDN_LINK = '<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">';
const CDN_LINK = '<link href="//netdna.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">';

/**
* Html string template to build the icon
Expand Down Expand Up @@ -114,13 +114,13 @@ public function __toString()
}

$this->_reset();

return $output;
}

/**
* Stores icon to be rendered later
*
*
* @access public
* @param string $label Label of icon to save in collection
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $label is not a string
Expand Down Expand Up @@ -149,7 +149,7 @@ public function store($label)

/**
* Retrieve icon from collection
*
*
* @access public
* @param string $label Icon label used in store method
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $label is not a string
Expand All @@ -173,7 +173,7 @@ public function collection($label)

/**
* Sets which icon to use
*
*
* @access public
* @param string $icon Icon label, ommiting fa- prefix
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -182,13 +182,13 @@ public function collection($label)
public function icon($icon)
{
$this->_setIcon($icon);

return $this;
}

/**
* Adds extra classes to icon or stack
*
*
* @access public
* @param string $class CSS class
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $class is not a string
Expand All @@ -210,7 +210,7 @@ public function addClass($class)

/**
* Sets the icon or stack to be a fixed width
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -226,7 +226,7 @@ public function fixedWidth($icon = '')

/**
* Sets the icon or stack to be larger
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -236,13 +236,13 @@ public function lg($icon = '')
{
$this->_setIcon($icon);
$this->_addClass('fa-lg');

return $this;
}

/**
* Sets the icon or stack to be 2 times larger
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -258,7 +258,7 @@ public function x2($icon = '')

/**
* Sets the icon or stack to be 3 times larger
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -274,7 +274,7 @@ public function x3($icon = '')

/**
* Sets the icon or stack to be 4 times larger
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -290,7 +290,7 @@ public function x4($icon = '')

/**
* Sets the icon or stack to be 5 times larger
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -306,7 +306,7 @@ public function x5($icon = '')

/**
* Sets the icon or stack to be inverted in color
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -322,7 +322,7 @@ public function inverse($icon = '')

/**
* Sets the icon or stack to be rotated 90 degrees
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -338,7 +338,7 @@ public function rotate90($icon = '')

/**
* Sets the icon or stack to be rotated 180 degrees
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -354,7 +354,7 @@ public function rotate180($icon = '')

/**
* Sets the icon or stack to be rotated 270 degrees
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -370,7 +370,7 @@ public function rotate270($icon = '')

/**
* Sets the icon or stack to be flipped horizontally
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -386,7 +386,7 @@ public function flipHorizontal($icon = '')

/**
* Sets the icon or stack to be flipped vertically
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -402,7 +402,7 @@ public function flipVertical($icon = '')

/**
* Sets the icon to spin
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -418,7 +418,7 @@ public function spin($icon = '')

/**
* Sets a border around the icon
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -434,7 +434,7 @@ public function border($icon = '')

/**
* Pulls the icon to the left
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -450,7 +450,7 @@ public function left($icon = '')

/**
* Pulls the icon to the left
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a string
Expand All @@ -466,7 +466,7 @@ public function right($icon = '')

/**
* Builds unordered list with icons
*
*
* @param string $iconLabel Default icon used in list (optional)
* @return Khill\Fontawesome\FontAwesome FontAwesome object
*/
Expand All @@ -476,7 +476,7 @@ public function ul($iconLabel = '')

if(is_string($iconLabel) && ! empty($iconLabel))
{
$this->list->setDefaultIcon($iconLabel);
$this->list->setDefaultIcon($iconLabel);
} elseif(is_array($iconLabel) && count($iconLabel) > 0) {
$this->list->setListItems($iconLabel);
} else {
Expand All @@ -488,7 +488,7 @@ public function ul($iconLabel = '')

/**
* Adds items to unordered list with icons
*
*
* @param string|array $iconLine Adds a line or lines to the unordered list
* @return Khill\Fontawesome\FontAwesome FontAwesome object
*/
Expand All @@ -508,7 +508,7 @@ public function li($iconLine = '')

/**
* Sets the top icon to be used in a stack
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a non empty string
Expand All @@ -530,7 +530,7 @@ public function stack($icon)

/**
* Sets the bottom icon to be used in a stack
*
*
* @access public
* @param string $icon Icon label
* @throws Khill\Fontawesome\Exceptions\BadLabelException If $icon is not a non empty string
Expand All @@ -557,7 +557,7 @@ public function on($icon)

/**
* Sets icon label
*
*
* @access private
* @param string $icon Icon label
* @return void
Expand All @@ -577,7 +577,7 @@ private function _setIcon($icon)

/**
* Builds the icon from the template
*
*
* @access private
* @return void
*/
Expand All @@ -598,7 +598,7 @@ private function _buildIcon()

/**
* Adds classes to icon or stack object
*
*
* @access private
* @return void
*/
Expand All @@ -619,7 +619,7 @@ private function _addClass($class)

/**
* Resets the FontAwesome class
*
*
* @access private
* @return void
*/
Expand Down

0 comments on commit c419c0c

Please sign in to comment.