From 2aa5af9694436c716e51eab149a649301d9ec8e2 Mon Sep 17 00:00:00 2001
From: Paul Gascou-Vaillancourt <paul.gascvail@gmail.com>
Date: Mon, 10 Feb 2020 08:18:17 -0500
Subject: [PATCH 1/4] chore(storybook): set font-size globally

---
 src/scss/storybook.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/scss/storybook.scss b/src/scss/storybook.scss
index f386ef150f..5ed1204d08 100644
--- a/src/scss/storybook.scss
+++ b/src/scss/storybook.scss
@@ -13,3 +13,8 @@
 @import 'utilities';
 
 @import 'components';
+
+// Storybook-specific styles
+.story-container {
+  @include gl-font-base;
+}
-- 
GitLab


From 53310a8bab874fcd8bdce646ae5ff816eacb45e3 Mon Sep 17 00:00:00 2001
From: Paul Gascou-Vaillancourt <paul.gascvail@gmail.com>
Date: Mon, 10 Feb 2020 08:18:48 -0500
Subject: [PATCH 2/4] chore(token): remove story's line-height fix

---
 src/components/base/token/token.stories.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/base/token/token.stories.js b/src/components/base/token/token.stories.js
index 51557934b3..55c4e76da1 100644
--- a/src/components/base/token/token.stories.js
+++ b/src/components/base/token/token.stories.js
@@ -22,5 +22,5 @@ documentedStoriesOf('base|token', readme)
     props: generateProps(),
     components,
     template: `
-      <div class="gl-display-flex"><gl-token :view-only="viewOnly">Token</gl-token></div>`,
+      <gl-token :view-only="viewOnly">Token</gl-token>`,
   }));
-- 
GitLab


From 04069c27725ee342ec1f7cdad5eefcc1330d30f3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 10 Feb 2020 14:00:20 +0000
Subject: [PATCH 3/4] chore: update snapshots

---
 ...e-storyshots-base-token-default-1-snap.png | Bin 4253 -> 4259 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-token-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-token-default-1-snap.png
index 67e4530a5204f205cef48e31e1e6152f2d8b2965..8d50033e978a915d44238554033476f271344a8b 100644
GIT binary patch
literal 4259
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>iV_;yIRn}C%z`(#*9OUlAu<o49O9lpk
zSWg$nkcv5P@19>h_3OR^AN!vji%+!fU=s}F<tm*JIMcUe%H<QD#qLfSlMgtCxGZK<
zU(vBi;g=)t8-5P1CIyeI1j!7O4UtP7BQ;aH?j78Dyn4xD+wF7r+LpwxzZjKW|NV2#
zJkzNBZ{H)UZ~pxJ{5(GcgG0j6mBGuO9qAM<es*T&Y1`AO+c#`5=<e>`T=w?XX<IG^
zhCiyh;`09=pP6Y~{OCyMX<If1hCivg;_~93>lhdg%uoOMRE~jx;m3dH1_lNONk%3H
zh7=YK28IcdAK#1F{Ccst_{D{V^*=XnzgP7-zAp9c#l`N=S1zA7tM>P|zaKdn85;KY
z)JrS)+x>jfdfdAF-JHGE-_Nbxe(%?EzO5nb{Bm>V*Z-^BmUp-6;%oVu4+qyoZ_mry
z|M%Nz6G;XJgU|IG6aJrVm#?$P-}m!b&HumOi$9+=Ki|x6XK_8g{;zBHxp}tM{kGq3
z+^Kv%cXRUbzMnrH_dnlyJ#KdL@xHUazP^6`uw8!M>UF!a`s8e_&fEQdlXH7p?!CI-
zZzH#6U43(J@9%Qg!!Iu{fBxWLbMdb)FL!>wSDl{r>~8t}xytT+XYQ8Y|Ld+N%D}LL
zWm*mYiI0zuKi~O$-t5@jWoK8f-)ALlo;N3bUgb0M*Ku_}pYD9O>vh`kKH1_oH#Yvf
zegB^s$g}46Dw6Ydy<ArLuvI)Q?OB)hx*7TVex{w9Yi+)M&!<y4_xII)dw>7`?zCH*
zQctgm-(SZkZ)fv<@ArGHKO*+m{mr?#DRt#^E(V4eC2zh7{`P-M%yMoRY`<G}drjQl
zs<JmX4CCv5KAmG#`s&cE@_Uu(`~LlUeRFH}^)qK`zTHgUT=)0a&c}V$X<uJm{d|C#
z|BU+l8l&{{^XAT+`T6<z^MAkJw_hE$cGm89yR!HFez*I+?e%YOZ|l39uz!^N``cUZ
zy*>;K4}_vViLIGm_bc<-+UW9!KWCX{rzIvP*8TZ-eCABc!beB;{QLEKbLHn}ksBYq
zUv63X>4}U@MZvq>@Aq~0eeJ)$^V2Eq^q-&hn_uh_)qZwoXR){J`=->>)BZk8W?*2L
zerytRN?~E4-TyzIxzGF0wK7dVH)rP2qep*!yPcn&n3y=P?$^u8KOc`jU)*mutNPu}
z^mY4wy}G%l^0UpS6UzH7@12~iKHch+>%Yp|SI?Yzc(^@1P4A8{69Yqxo%g+_t(ljX
z{e0A||LpU5`}y&8KU2TGzi$tUGSlp9XU?3twKe<st?c!4@9r)?->tvTLfvo94By#i
zXD2GVKfAEd`Sa`b`_KJ;zu(^9=Hn67-7}ck`C_)beKmi3vaChHgGqDQ85kmFss3ku
zGAn!COxx;jXFi{|x3~ZE;qaZJ)4H3}&(FKR=Jtlf!#Q_%m417B+r0YwySeRhRT*(r
zFPB=@{rPdH;4rWFJN}&_Ve4WnXPf2D%DufUwj%fUx3`;%o}P-_S@cxZnxBDTgURWA
zzh15WJiWT(zlr(1ipNjo7#SG;O`5icm79U#!FM4A1_lQ=^nAH*!-j&L=|B1({bgWi
zus{Fl=uubsUH@+%I&?@!PcQDBAp^q${cKSA@K;`dfkEM+9EenQU|?wIVPIrnFk)h1
zU^u}sDmWS-qlsZOBPfiP45OvuXpO+YFq#oYn+Ky!qtRyJ;A|G2sb}=K?eN9kFjbs^
Pfq}u()z4*}Q$iB}-JBlv

literal 4253
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>iV_;yIRn}C%z`(#*9OUlAu<o49O9lpk
za8DP<kcv5P@9yoM`*hcVhqqr$;8*Qa5K~$tc1opH(Dazv$~j>^$@9G?9C6zqAi8l=
zK!9Lx(~m~6kNg56ERF^lg1!oZ+;6XFyjUUF!+BEk+s&KSJ1l=&9E&%5_j=W}sLyA9
z-+RC6T7Ts|Q*jyVvNvB&ojNtgqA=;-ZCxFmGmjoUimCZ{^m(-i1H%vRC}q2U507*T
zZ{D=2Xy0)LhKBuXOdmbYxyR4I@Z<9u%lpg>3=IEmSvVLNCI~7pFgUn1FfcI8?EZJR
zsa>urgHO)phkpIHW77G5POo3{_s{3^&p#fQpTD>I`@fHzj0_F?d+MbX`fb16n0b76
z+1pv{auo@AJ07;#m#(;KRq)`zpD&mFH`o6DwmGi;{oe0skB{{hU-mVhyZj^rL&MDf
z?hSw9@74eRTlx3v_2;|a@0<O4-R``1d%xe?`D)ebb5X^go}8@w@v!~*wCKE<bFItI
zwaeF8tl#tLl#Fdv$+T(Hp8fm%e!jQ<-V(e2e?C|KdbvFPc%SU&XS4Iq?J9kp_Wj-6
z{n}D}^7eM@d@?g0AMZaeTYksT*f@Xx-)}OOMJai^-)^%nTFJn0z;eT@YKMJ4pUtj(
zHZ%R%yy|x|r^nY-n&scK@wfeYCI8yqACJ0=pH2-wcW$or^A{Hve?B7Ye`a0m?q^%C
z$IZ@Ozqf2&^}C%jXYTxPi2M2K_4{T8FZVm^t-sgg^y$-^^Y8DwZ+dxK?(MY9%uGIc
zJDc}=KA)TUBO)qlR_^U>Yrh3CGBgyYTxI<9@woi?WxlhY9h1(V^Y!)h^B}u6pSPPm
zzy9CPGqbketIFQ@=hNw(&*xRAr9GSMZ#Q%4(xp3pKAWBX_t)3r?{~}3yUW*_sQb^G
zGjrzU<^Jbm%kP@LzP5IDbpGDbeSg2*zHfW|)2B}}Ieu2x=;-UO|7HZTH{)vbhPpo=
zkKf!;_;}`XX|tRet*xy;AGXV<rKP2&rpDENy?S$3>Fb!1i}(GC-`v<}S@7V%oyzBP
z(`8@3-(P%Eb^4iEruEs2y7hKt_|3K2dh6r49S@qg|9voIU}z{#zRI|1#}12jK3S{J
zf1b~;pC_#D2TGbXf4^SeykUcZzunI#HlI!?e?G`Af9CD>`*zb~%Wme}-Bl`A^Worq
znfEs~Ca;!#s`G!(+pM%_A08eyHco%X$;iNPZhmO~!CRYBPuKi<xxDzrg@r$#PLEH!
zzpr+4<>zNNHzXcDa|V?9i;s$ipLut8_w%36=g*%yb?VJcsi#5F&L?MMvH#z%*L!}y
z+x_{);{JJ?yKnBV{~vjK-M>ofYybZKK7X^4fuZ4Q<kxryz5Rba-Q1jh-sbn4&7c2%
zzkmMg^?3X0Z*P8{-Q_#m?CiI<x6|L>+xz(dGyj>|?|04h_k1{1^ZBfK@z<;2^LN@m
ziHX=<_BQ9{rqr@GHwvF^efsoi<nFS!YhrhQn=_Z4fgxfp_r4#Gx-UPk?)YzVJ*N2V
zPdP>ghJTa7_Ofy_Fg*A!1ka6<j7$s+Dc~#`xp~8ef_>>f`XBveU}&&EKkMjGSNUE4
zuOB*eNJmd^-g`p^h6nnun=UW+|7{P_f5;X@g7Y+zDTs_dDhLkN(EtIJ`lE?qG%<`8
z7YqyxqZwf|BaCK*(To6Vb&WO;Mw<ulCis9QhJWm-dbXc(-DJNoFfcH9y85}Sb4q9e
E0OvOJ)&Kwi

-- 
GitLab


From bc0aa03073c42c1bba61d486658a05560e37351d Mon Sep 17 00:00:00 2001
From: Paul Gascou-Vaillancourt <paul.gascvail@gmail.com>
Date: Mon, 10 Feb 2020 13:22:52 -0500
Subject: [PATCH 4/4] chore(storybook): set line-height globally

---
 src/scss/storybook.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/scss/storybook.scss b/src/scss/storybook.scss
index 5ed1204d08..75ec0af2f7 100644
--- a/src/scss/storybook.scss
+++ b/src/scss/storybook.scss
@@ -17,4 +17,5 @@
 // Storybook-specific styles
 .story-container {
   @include gl-font-base;
+  @include gl-line-height-normal;
 }
-- 
GitLab