#706 - Using Bootstrap and Font-Awesome icons together, removed "no-i…

…cons" css for Bootstrap, changed logic for icons in widgets
clevertech · Dec 15, 2013 · 4fc6472 · 4fc6472
1 parent b0847d9
commit 4fc6472
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 12,137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Thank you all
 Antonio Ramirez.
 
 ## YiiBooster latest development alpha
+- **(enh)** Using Bootstrap and Font-Awesome icons together, removed "no-icons" css for Bootstrap, changed logic for icons in widgets #706 (fromYukki)
 - **(enh)** Font Awesome updated to 4.0.3 including CDN #706 (fromYukki)
 - **(fix)** Resolve conflicts between jQuery UI and Bootstrap (fromYukki)
 - **(enh)** Tooltip for `TbButton` and `TbButtonGroup` #724 (fromYukki)