github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-29 03:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2182 from rstudio/joe/misc/fontawesome-4-note

Browse Source 
Add note that Font Awesome support is for 4.7.0
This commit is contained in:
Alan Dipert
2018-09-14 13:52:30 -07:00
committed by GitHub
parent 3bdd4af75c 9646c9b0a0
commit d6064636d4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
R/bootstrap.R
View File

@@ -1489,8 +1489,9 @@ downloadLink <- function(outputId, label="Download", class=NULL, ...) {
#' \code{\link{navbarPage}}.
#'
#' @param name Name of icon. Icons are drawn from the
#' \href{http://fontawesome.io/icons/}{Font Awesome} and
#' \href{http://getbootstrap.com/components/#glyphicons}{Glyphicons"}
#' \href{https://fontawesome.com/v4.7.0/}{Font Awesome} (currently icons from
#' the v4.7.0 set are supported) and
#' \href{http://getbootstrap.com/components/#glyphicons}{Glyphicons}
#' libraries. Note that the "fa-" and "glyphicon-" prefixes should not be used
#' in icon names (i.e. the "fa-calendar" icon should be referred to as
#' "calendar")

5
man/icon.Rd
View File

@@ -8,8 +8,9 @@ icon(name, class = NULL, lib = "font-awesome")
}
\arguments{
\item{name}{Name of icon. Icons are drawn from the
\href{http://fontawesome.io/icons/}{Font Awesome} and
\href{http://getbootstrap.com/components/#glyphicons}{Glyphicons"}
\href{https://fontawesome.com/v4.7.0/}{Font Awesome} (currently icons from
the v4.7.0 set are supported) and
\href{http://getbootstrap.com/components/#glyphicons}{Glyphicons}
libraries. Note that the "fa-" and "glyphicon-" prefixes should not be used
in icon names (i.e. the "fa-calendar" icon should be referred to as
"calendar")}