Skip to content

Commit a54cbb4

Browse files
now on CRAN v0.1
Merge branch 'master' of https://github.com/ThinkR-open/shinytemplate # Conflicts: # README.md
2 parents 52caa3a + aaf88a3 commit a54cbb4

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

README.Rmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ _Building Big Shiny Apps_
5656
### Video
5757

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

6061
## Installation
6162

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ This package is part of a series of tools for Shiny, which includes:
5353

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

5759
## Installation
5860

inst/utils/golem_utils_ui.R

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,10 @@ enurl <- function(url, text){
164164
}
165165

166166

167-
# Columns 12, 6 and 4
167+
# Columns wrappers
168168
#
169-
# Most shiny columns are 12, 6 or 4 of width.
170169
# These are convenient wrappers around
171-
# `column(12, ...)`, `column(6, ...)` and `column(4, ...)`.
170+
# `column(12, ...)`, `column(6, ...)`, `column(4, ...)`...
172171
#
173172
# @export
174173
# @rdname columns
@@ -177,6 +176,16 @@ col_12 <- function(...){
177176
column(12, ...)
178177
}
179178

179+
#' @importFrom shiny column
180+
col_10 <- function(...){
181+
column(10, ...)
182+
}
183+
184+
#' @importFrom shiny column
185+
col_8 <- function(...){
186+
column(8, ...)
187+
}
188+
180189
#' @importFrom shiny column
181190
col_6 <- function(...){
182191
column(6, ...)
@@ -186,3 +195,19 @@ col_6 <- function(...){
186195
col_4 <- function(...){
187196
column(4, ...)
188197
}
198+
199+
#' @importFrom shiny column
200+
col_3 <- function(...){
201+
column(3, ...)
202+
}
203+
204+
#' @importFrom shiny column
205+
col_2 <- function(...){
206+
column(2, ...)
207+
}
208+
209+
#' @importFrom shiny column
210+
col_1 <- function(...){
211+
column(1, ...)
212+
}
213+

0 commit comments

Comments
 (0)