From ef98dec79e2dd55239aeb230d587a4878a26693e Mon Sep 17 00:00:00 2001
From: Eric Nantz <thercast@gmail.com>
Date: Fri, 26 Jul 2019 23:18:11 -0400
Subject: [PATCH 1/2] add Colin's screencast demo of golem to video section

---
 README.Rmd | 1 +
 README.md  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/README.Rmd b/README.Rmd
index 85ef2792..b66dc2df 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -55,6 +55,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
 
diff --git a/README.md b/README.md
index 118624af..39a6e018 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,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
 

From 3822780d5a4b1fbbaed8909edac50375553c5c30 Mon Sep 17 00:00:00 2001
From: colin <colin@thinkr.fr>
Date: Tue, 30 Jul 2019 09:52:15 +0200
Subject: [PATCH 2/2] more col_ wrappers

---
 inst/utils/golem_utils_ui.R | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/inst/utils/golem_utils_ui.R b/inst/utils/golem_utils_ui.R
index 42efdbab..1d626d0f 100644
--- a/inst/utils/golem_utils_ui.R
+++ b/inst/utils/golem_utils_ui.R
@@ -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
@@ -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, ...)
@@ -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, ...)
+}
+