From 3ce7623994d6061481101ce44768b2b750e79faf Mon Sep 17 00:00:00 2001
From: Dave Pisek <dpisek@gitlab.com>
Date: Tue, 30 Jul 2019 17:38:34 +1000
Subject: [PATCH 1/2] feat(GILoadingIcon): change default size

BREAKING CHANGE: This commit changes the default size of GILoadingIcon
to "md", which is 24x24.
---
 src/components/base/button/button.vue                      | 7 ++++++-
 src/components/base/dropdown/dropdown.vue                  | 2 +-
 .../loading_icon/examples/loading_icon.inline.example.vue  | 2 +-
 .../loading_icon/examples/loading_icon.small.example.vue   | 2 +-
 src/components/base/loading_icon/loading_icon.stories.js   | 2 +-
 src/components/base/loading_icon/loading_icon.vue          | 2 +-
 .../base/search_box_by_type/search_box_by_type.vue         | 2 +-
 src/components/base/toggle/toggle.vue                      | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/base/button/button.vue b/src/components/base/button/button.vue
index ea31a9c96e..dc80e7c039 100644
--- a/src/components/base/button/button.vue
+++ b/src/components/base/button/button.vue
@@ -128,7 +128,12 @@ export default {
     :class="buttonClasses"
     v-on="$listeners"
   >
-    <gl-loading-icon v-if="loading" inline class="gl-button-icon gl-button-loading-indicator" />
+    <gl-loading-icon
+      v-if="loading"
+      size="sm"
+      inline
+      class="gl-button-icon gl-button-loading-indicator"
+    />
     <gl-icon v-if="hasIcon && !(hasIconOnly && loading)" class="gl-button-icon" :name="icon" />
     <slot name="emoji"></slot>
     <span v-if="!hasIconOnly" :class="buttonTextClasses" class="gl-button-text"><slot></slot></span>
diff --git a/src/components/base/dropdown/dropdown.vue b/src/components/base/dropdown/dropdown.vue
index 4b1caddd56..785c725a7a 100644
--- a/src/components/base/dropdown/dropdown.vue
+++ b/src/components/base/dropdown/dropdown.vue
@@ -202,7 +202,7 @@ export default {
     </div>
     <template #button-content>
       <slot name="button-content">
-        <gl-loading-icon v-if="loading" class="gl-mr-2" />
+        <gl-loading-icon v-if="loading" size="sm" class="gl-mr-2" />
         <gl-icon v-if="icon" class="dropdown-icon" :name="icon" />
         <span class="gl-new-dropdown-button-text" :class="{ 'gl-sr-only': textSrOnly }">
           <slot name="button-text">{{ buttonText }}</slot>
diff --git a/src/components/base/loading_icon/examples/loading_icon.inline.example.vue b/src/components/base/loading_icon/examples/loading_icon.inline.example.vue
index 96c2c387cf..f9ea974ff4 100644
--- a/src/components/base/loading_icon/examples/loading_icon.inline.example.vue
+++ b/src/components/base/loading_icon/examples/loading_icon.inline.example.vue
@@ -1,3 +1,3 @@
 <template>
-  <div><gl-loading-icon inline /> Testing Inline Icon</div>
+  <div><gl-loading-icon inline size="sm" /> Testing Inline Icon</div>
 </template>
diff --git a/src/components/base/loading_icon/examples/loading_icon.small.example.vue b/src/components/base/loading_icon/examples/loading_icon.small.example.vue
index 0ad27ccd85..4071a76904 100644
--- a/src/components/base/loading_icon/examples/loading_icon.small.example.vue
+++ b/src/components/base/loading_icon/examples/loading_icon.small.example.vue
@@ -1,3 +1,3 @@
 <template>
-  <gl-loading-icon />
+  <gl-loading-icon size="sm" />
 </template>
diff --git a/src/components/base/loading_icon/loading_icon.stories.js b/src/components/base/loading_icon/loading_icon.stories.js
index c7be553942..3f3ab79a52 100644
--- a/src/components/base/loading_icon/loading_icon.stories.js
+++ b/src/components/base/loading_icon/loading_icon.stories.js
@@ -34,7 +34,7 @@ function generateProps({ inline } = {}) {
           'lg (32x32)': 'lg',
           'xl (64x64)': 'xl',
         },
-        'sm'
+        'md'
       ),
     },
     color: {
diff --git a/src/components/base/loading_icon/loading_icon.vue b/src/components/base/loading_icon/loading_icon.vue
index 435ac122fa..804a4618e5 100644
--- a/src/components/base/loading_icon/loading_icon.vue
+++ b/src/components/base/loading_icon/loading_icon.vue
@@ -23,7 +23,7 @@ export default {
     size: {
       type: String,
       required: false,
-      default: 'sm',
+      default: 'md',
       validator(value) {
         return sizes.indexOf(value) !== -1;
       },
diff --git a/src/components/base/search_box_by_type/search_box_by_type.vue b/src/components/base/search_box_by_type/search_box_by_type.vue
index 0704d33fed..303763288b 100644
--- a/src/components/base/search_box_by_type/search_box_by_type.vue
+++ b/src/components/base/search_box_by_type/search_box_by_type.vue
@@ -99,7 +99,7 @@ export default {
       v-on="inputListeners"
     />
     <div class="gl-search-box-by-type-right-icons">
-      <gl-loading-icon v-if="isLoading" class="gl-search-box-by-type-loading-icon" />
+      <gl-loading-icon v-if="isLoading" size="sm" class="gl-search-box-by-type-loading-icon" />
       <gl-clear-icon-button
         v-if="showClearButton"
         :title="clearButtonTitle"
diff --git a/src/components/base/toggle/toggle.vue b/src/components/base/toggle/toggle.vue
index 78ec425486..e127303c2e 100644
--- a/src/components/base/toggle/toggle.vue
+++ b/src/components/base/toggle/toggle.vue
@@ -103,7 +103,7 @@ export default {
         type="button"
         @click.prevent="toggleFeature"
       >
-        <gl-loading-icon v-if="isLoading" color="light" class="toggle-loading" />
+        <gl-loading-icon v-if="isLoading" size="sm" color="light" class="toggle-loading" />
         <span v-else :class="{ 'toggle-icon': true, disabled: disabled }">
           <gl-icon :name="icon" :size="16" />
         </span>
-- 
GitLab


From 19febea5f78ba7f5566b267418a3d0b57d399add Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 15 Jul 2021 09:03:06 +0000
Subject: [PATCH 2/2] chore: update snapshots

---
 ...shots-base-loading-icon-default-1-snap.png | Bin 3766 -> 4009 bytes
 ...yshots-base-loading-icon-inline-1-snap.png | Bin 3766 -> 4009 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-loading-icon-default-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-loading-icon-default-1-snap.png
index 533d108b529d2ae59b122257f01192408254bd61..b7bbb977b3a35fad0ed0e44ad0597a22d3584fa7 100644
GIT binary patch
literal 4009
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>iV_;yIRn}C%z`(#*9OUlAu<o49O9lr1
zWKS2zkcv5P@9xb?eJXe0;r^3_5<JE!vl@IPMBeBeIV9*^oxT3hwR5LGh~>Q5!<4;z
zyI>%vFjJ<GkxQGdrw*I>#{vaw`9FNs&ngoRM$O)P|LeO?$A4Aa-?d}M4haT^h6Bg`
zS2Hm%9GLCgz`(#D$;iaOkix>jz%W5jfq}un4I%iic(%N}oZPw1>F1x_+?-xqRb^HG
z=i~7+XZC!*SG{@bR#X4^c5|2e&p&tW+_||vVhjus`T2KK6b~IfeE8?T-|wFvm#>d`
z`Fno-zn?WfpH6pTVPLpdaGh_${JLM6`~H5r{qysA`}L)Z%I{UC@B8&?_0KPt{nvlB
zW?*>mwQw!N&$rv}KYP7?|G(?$@^wER7FGZM`#nAF+4uYP^XJ$9tK1p;?X3CzGsorY
zYuJO?85pjeJ;hj5QeyJ^_wUcA_4l7CzhArklW6bha38y$PbU9-)UE&Q<Ye{FA08gI
z{>jY1aNt*jrh{1b(LcXluP?5vvokhkXJ`L>(OrJ+AD`n7A3pr^;V}Q_o9Xk<o;h>u
z*s+=q2ic3?-`gAQBg?=LVXn=3;`8(K&wu==NXwJs|1WEJ`}Xb4yLVSNYcex1ync16
z6lAiIU0PaMd3k=x(?|FAR)2oC`@LR&e}8}a#)z0|83u-g+E_^ib#?XAf7h;E8*RJ$
z<BN-nZ{E7~Yko2_1H=0L+RRUmc8j0>d-`KR@bu$5Y|I!KKKzP)DYmBmPHDrOxpVJU
z*?`Q5kyNPv`}KO!|9^jfZ?}8+)G%&eP37y43=9ol3sXVycxS3M^OLvR@5jBne^j*l
zbn=~}qM}fZ)8ltmS5;NL7LJokE-wCj?J*+*!|TVV7%D$JI9T+59rKe<Hy9WWyncU*
zVdtKA$6vmDx%S#S3oEN%;SG1vd<7X868^3!;lB3m+qX|Yetv##9(Ay0W5k(*2M>O#
zsILC)ro9Rj7THU;C%k?0MrZzY3w!(dd-v|mc0G}_amL=gdoAtl=g$m3U-#zCn>z`+
z7#I#%Rlk1p=uy&C{dsfdoVj=J-lvM><m9sQ^7VUqU%hyd!N<op?W3Xb=O-tHx5qOw
z9FWd<$}qE1RQUJr-~WH*WM^mZ{QEiT?sWb5b1z@MEZY6%<KyF>UtC;lJ;REDVME?J
zQ3d1m>ssEte}Dew&6`{Ow(Q(#*)MNj_LP}{;a<XZz6mqK&zH!^$({T7@uS!M`}gk6
zn>$yQe=ak_0qJ*cjGy|CCK;-$tABoUwA<3!I(l7E-T!}oZ{E2xhn-*U%;9$aR(1vk
z1LN&H0t^fduOnWX?qOhHD0c*fKc38mHOGw#q7^}-0WumO_$#T=6f&AZMpFo`CfsQ5
p7|k7{xnneUV0P|Ca>?+IEylyy_;3FoNd^W622WQ%mvv4FO#nk(U19(L

literal 3766
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>iV_;yIRn}C%z`(#*9OUlAu<o49O9lqM
z0#6smkcv5P?;2)L^^|US=)SqbP=iw?LG_5$+Pz|B+a8@iJ%7XI3&&2Gt(8ksmGCf-
zNm`tzC@5BDe*EvI@9j5VXWgHfcx$$0@v~do^Y8EDWngf4@aumyGXukc`gR6J1_mQ0
z76yhB90Cjs3d#-)3=KU9!9U+N3yXCh-BbBFjgOBnZDYilGiTntd-vw;+q2E={AuOo
z-!GYSGBCvOUaxzmc<A~0`RD)r`xjrgzx4Gro9b^l^K2@MG-oq2Fsz$4)!!j*f8AeY
zJ2|@=i+(xVUxl|eM(8|ydV2cjS65fxynlcG=FOWce|>qme{(Ve!-MHtFL9o@c=2M*
zj}M9W_EwvJe}8}e-o1P6Wy=c+4D{pn%sAdJfBx?7^7QKJ-<QmJ7#RNS(&L!`GUE5Q
zw`XehzuvfU<HzmXdecuw>WCHp{q^<c-Me$Ye*Jp-wk`w12k+e<;y3vD`=_U+6&HU#
z^kc@%n>TLEID7W&&tG3(_wQt2U@+EZIZ?E8&dix>*RGu^ZYy7HC(gi-kk-mzX>C1w
z=FHjV`Rn$)_<7?qOzqa}>;FDJ`hPlxf#Jccodyo){EhAE|Lys-=y`JevnwnN3_E`5
z@l5#K{rvdx<J$UFc4bq&UxOmxcq?Pk?{9A-qoZd}o;-P~-c<eRr!6flXKvlP_2!*B
zd#3m@F))N5Ze`rGZ=apDwY9NvaYe<C?Sh+P^qznCP>_~ZR#x`xSg-W-Exrs4540j)
zs(zU{^ZWbz=a>7>PkZ)zwnB7tbo~zbqM8~Tb#--P<KpM%=I$(ie{cVmR0f6z;aiIu
z&YY2vl|6gBU;g>&>H77*YIAdQ%gV~qK*4Ip!N3qBYcHx`eE<G83tQW{Pm6xG*YCEf
zXS{oU9Rowd{!f<~nHU&8_{Uao$}%uK*n~9+jS8aWsnGx#4G{dL?q~`bO(CNx1Xr76
uG<S^Vj?vsPnmaIiE2AX?6-tIP?=PG>Xg536z=45*fx*+&&t;ucLK6TVL*|VD

diff --git a/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-loading-icon-inline-1-snap.png b/tests/__image_snapshots__/storyshots-spec-js-image-storyshots-base-loading-icon-inline-1-snap.png
index 533d108b529d2ae59b122257f01192408254bd61..b7bbb977b3a35fad0ed0e44ad0597a22d3584fa7 100644
GIT binary patch
literal 4009
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>iV_;yIRn}C%z`(#*9OUlAu<o49O9lr1
zWKS2zkcv5P@9xb?eJXe0;r^3_5<JE!vl@IPMBeBeIV9*^oxT3hwR5LGh~>Q5!<4;z
zyI>%vFjJ<GkxQGdrw*I>#{vaw`9FNs&ngoRM$O)P|LeO?$A4Aa-?d}M4haT^h6Bg`
zS2Hm%9GLCgz`(#D$;iaOkix>jz%W5jfq}un4I%iic(%N}oZPw1>F1x_+?-xqRb^HG
z=i~7+XZC!*SG{@bR#X4^c5|2e&p&tW+_||vVhjus`T2KK6b~IfeE8?T-|wFvm#>d`
z`Fno-zn?WfpH6pTVPLpdaGh_${JLM6`~H5r{qysA`}L)Z%I{UC@B8&?_0KPt{nvlB
zW?*>mwQw!N&$rv}KYP7?|G(?$@^wER7FGZM`#nAF+4uYP^XJ$9tK1p;?X3CzGsorY
zYuJO?85pjeJ;hj5QeyJ^_wUcA_4l7CzhArklW6bha38y$PbU9-)UE&Q<Ye{FA08gI
z{>jY1aNt*jrh{1b(LcXluP?5vvokhkXJ`L>(OrJ+AD`n7A3pr^;V}Q_o9Xk<o;h>u
z*s+=q2ic3?-`gAQBg?=LVXn=3;`8(K&wu==NXwJs|1WEJ`}Xb4yLVSNYcex1ync16
z6lAiIU0PaMd3k=x(?|FAR)2oC`@LR&e}8}a#)z0|83u-g+E_^ib#?XAf7h;E8*RJ$
z<BN-nZ{E7~Yko2_1H=0L+RRUmc8j0>d-`KR@bu$5Y|I!KKKzP)DYmBmPHDrOxpVJU
z*?`Q5kyNPv`}KO!|9^jfZ?}8+)G%&eP37y43=9ol3sXVycxS3M^OLvR@5jBne^j*l
zbn=~}qM}fZ)8ltmS5;NL7LJokE-wCj?J*+*!|TVV7%D$JI9T+59rKe<Hy9WWyncU*
zVdtKA$6vmDx%S#S3oEN%;SG1vd<7X868^3!;lB3m+qX|Yetv##9(Ay0W5k(*2M>O#
zsILC)ro9Rj7THU;C%k?0MrZzY3w!(dd-v|mc0G}_amL=gdoAtl=g$m3U-#zCn>z`+
z7#I#%Rlk1p=uy&C{dsfdoVj=J-lvM><m9sQ^7VUqU%hyd!N<op?W3Xb=O-tHx5qOw
z9FWd<$}qE1RQUJr-~WH*WM^mZ{QEiT?sWb5b1z@MEZY6%<KyF>UtC;lJ;REDVME?J
zQ3d1m>ssEte}Dew&6`{Ow(Q(#*)MNj_LP}{;a<XZz6mqK&zH!^$({T7@uS!M`}gk6
zn>$yQe=ak_0qJ*cjGy|CCK;-$tABoUwA<3!I(l7E-T!}oZ{E2xhn-*U%;9$aR(1vk
z1LN&H0t^fduOnWX?qOhHD0c*fKc38mHOGw#q7^}-0WumO_$#T=6f&AZMpFo`CfsQ5
p7|k7{xnneUV0P|Ca>?+IEylyy_;3FoNd^W622WQ%mvv4FO#nk(U19(L

literal 3766
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV2a>iV_;yIRn}C%z`(#*9OUlAu<o49O9lqM
z0#6smkcv5P?;2)L^^|US=)SqbP=iw?LG_5$+Pz|B+a8@iJ%7XI3&&2Gt(8ksmGCf-
zNm`tzC@5BDe*EvI@9j5VXWgHfcx$$0@v~do^Y8EDWngf4@aumyGXukc`gR6J1_mQ0
z76yhB90Cjs3d#-)3=KU9!9U+N3yXCh-BbBFjgOBnZDYilGiTntd-vw;+q2E={AuOo
z-!GYSGBCvOUaxzmc<A~0`RD)r`xjrgzx4Gro9b^l^K2@MG-oq2Fsz$4)!!j*f8AeY
zJ2|@=i+(xVUxl|eM(8|ydV2cjS65fxynlcG=FOWce|>qme{(Ve!-MHtFL9o@c=2M*
zj}M9W_EwvJe}8}e-o1P6Wy=c+4D{pn%sAdJfBx?7^7QKJ-<QmJ7#RNS(&L!`GUE5Q
zw`XehzuvfU<HzmXdecuw>WCHp{q^<c-Me$Ye*Jp-wk`w12k+e<;y3vD`=_U+6&HU#
z^kc@%n>TLEID7W&&tG3(_wQt2U@+EZIZ?E8&dix>*RGu^ZYy7HC(gi-kk-mzX>C1w
z=FHjV`Rn$)_<7?qOzqa}>;FDJ`hPlxf#Jccodyo){EhAE|Lys-=y`JevnwnN3_E`5
z@l5#K{rvdx<J$UFc4bq&UxOmxcq?Pk?{9A-qoZd}o;-P~-c<eRr!6flXKvlP_2!*B
zd#3m@F))N5Ze`rGZ=apDwY9NvaYe<C?Sh+P^qznCP>_~ZR#x`xSg-W-Exrs4540j)
zs(zU{^ZWbz=a>7>PkZ)zwnB7tbo~zbqM8~Tb#--P<KpM%=I$(ie{cVmR0f6z;aiIu
z&YY2vl|6gBU;g>&>H77*YIAdQ%gV~qK*4Ip!N3qBYcHx`eE<G83tQW{Pm6xG*YCEf
zXS{oU9Rowd{!f<~nHU&8_{Uao$}%uK*n~9+jS8aWsnGx#4G{dL?q~`bO(CNx1Xr76
uG<S^Vj?vsPnmaIiE2AX?6-tIP?=PG>Xg536z=45*fx*+&&t;ucLK6TVL*|VD

-- 
GitLab