grafana/public/sass/_variables.light.generated.scss.rej

diff a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss	(rejected hunks)
@@ -86,2 +86,2 @@ $text-shadow-faint: none;
-$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%);
-$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%);
+$brand-gradient-horizontal: linear-gradient(to right, #F05A28 30%, #FBCA0A 99%);
+$brand-gradient-vertical: linear-gradient(#F05A28 30%, #FBCA0A 99%);
grafana/ui: Add Time of day picker (#18894) * Adding DashboardPicker component * fix prop names * fix prop names pt2 * add component and modify utils * add showHour prop * add minuteStep to TimeOfDayPicker, add value to DashboardPicker * fix for dashboard picker, missed adding file * Adding story * add another story for hiding hour and style fixes * fix these generated files * fixes after review * rename current value * fix type issue on onChange * fix story 2019-09-11 02:00:14 -05:00			`diff a/public/sass/_variables.light.generated.scss b/public/sass/_variables.light.generated.scss (rejected hunks)`
			`@@ -86,2 +86,2 @@ $text-shadow-faint: none;`
			`-$brand-gradient-horizontal: linear-gradient(to right, #f05a28 30%, #fbca0a 99%);`
			`-$brand-gradient-vertical: linear-gradient(#f05a28 30%, #fbca0a 99%);`
			`+$brand-gradient-horizontal: linear-gradient(to right, #F05A28 30%, #FBCA0A 99%);`
			`+$brand-gradient-vertical: linear-gradient(#F05A28 30%, #FBCA0A 99%);`