Skip to content

Commit

Permalink
now on CRAN v0.1
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/ThinkR-open/shinytemplate

# Conflicts:
#	README.md
  • Loading branch information
VincentGuyader committed Aug 5, 2019
2 parents 52caa3a + aaf88a3 commit a54cbb4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ _Building Big Shiny Apps_
### Video

- [{golem} and Effective Shiny Development Methods](https://www.youtube.com/watch?v=OU1-CkSVdTI)
- [Hands-on demonstration of {golem}](https://shinydevseries.com/post/golem-demo/)

## Installation

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ This package is part of a series of tools for Shiny, which includes:

- [{golem} and Effective Shiny Development
Methods](https://www.youtube.com/watch?v=OU1-CkSVdTI)
- [Hands-on demonstration of
{golem}](https://shinydevseries.com/post/golem-demo/)

## Installation

Expand Down
31 changes: 28 additions & 3 deletions inst/utils/golem_utils_ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,10 @@ enurl <- function(url, text){
}


# Columns 12, 6 and 4
# Columns wrappers
#
# Most shiny columns are 12, 6 or 4 of width.
# These are convenient wrappers around
# `column(12, ...)`, `column(6, ...)` and `column(4, ...)`.
# `column(12, ...)`, `column(6, ...)`, `column(4, ...)`...
#
# @export
# @rdname columns
Expand All @@ -177,6 +176,16 @@ col_12 <- function(...){
column(12, ...)
}

#' @importFrom shiny column
col_10 <- function(...){
column(10, ...)
}

#' @importFrom shiny column
col_8 <- function(...){
column(8, ...)
}

#' @importFrom shiny column
col_6 <- function(...){
column(6, ...)
Expand All @@ -186,3 +195,19 @@ col_6 <- function(...){
col_4 <- function(...){
column(4, ...)
}

#' @importFrom shiny column
col_3 <- function(...){
column(3, ...)
}

#' @importFrom shiny column
col_2 <- function(...){
column(2, ...)
}

#' @importFrom shiny column
col_1 <- function(...){
column(1, ...)
}

0 comments on commit a54cbb4

Please sign in to comment.