From 80601f75ed6cc705b59fb9f69903538bff05f030 Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <venomgfx@gmail.com>
Date: Wed, 2 Nov 2016 16:36:47 +0100
Subject: [PATCH] Remove deprecated +button-rounded-filled mixin

We now use just 'button', as roundness and filled are configurable
---
 src/styles/_comments.sass          |  6 ++---
 src/styles/_error.sass             |  4 ++--
 src/styles/_homepage.sass          | 16 ++++++-------
 src/styles/_pages.sass             |  6 ++---
 src/styles/_project-dashboard.sass |  2 +-
 src/styles/_project.sass           | 28 +++++++++++-----------
 src/styles/_user.sass              | 10 ++++----
 src/styles/_utils.sass             | 37 +-----------------------------
 src/styles/base.sass               |  2 +-
 src/styles/blog.sass               | 12 +++++-----
 10 files changed, 44 insertions(+), 79 deletions(-)

diff --git a/src/styles/_comments.sass b/src/styles/_comments.sass
index 6d712bbe..5bb42b07 100644
--- a/src/styles/_comments.sass
+++ b/src/styles/_comments.sass
@@ -520,7 +520,7 @@ $comments-width-max: 710px
 						min-height: 30px
 						transition: all 200ms ease-in-out
 
-						@include button-rounded($color-success, 6px)
+						+button($color-success, 6px)
 						position: relative
 
 						span.hint
@@ -550,7 +550,7 @@ $comments-width-max: 710px
 
 
 						&.button-field-error
-							@include button-rounded($color-danger, 6px)
+							+button($color-danger, 6px)
 							background: transparent
 
 							pointer-events: none
@@ -567,7 +567,7 @@ $comments-width-max: 710px
 							left: 15px
 							right: 15px
 
-						@include button-rounded($color-text-dark-secondary, 6px)
+						+button($color-text-dark-secondary, 6px)
 						border-color: transparent
 
 						i
diff --git a/src/styles/_error.sass b/src/styles/_error.sass
index 72f79df2..6e341e02 100644
--- a/src/styles/_error.sass
+++ b/src/styles/_error.sass
@@ -92,9 +92,9 @@ body.error
 				font-size: 1.2em
 				margin: 0 15px
 				&.sign-up
-					@include button-rounded-filled($color-primary, 999em)
+					+button($color-primary, 999em, true)
 				&.sign-in
-					@include button-rounded($color-background, 999em)
+					+button($color-background, 999em)
 					border-color: transparent
 
 
diff --git a/src/styles/_homepage.sass b/src/styles/_homepage.sass
index fe6b3057..20a69ae8 100644
--- a/src/styles/_homepage.sass
+++ b/src/styles/_homepage.sass
@@ -603,7 +603,7 @@ $node-type-post: #647bce
 				flex-wrap: wrap
 
 				a
-					@include button-rounded($color-text-light, 3px)
+					+button($color-text-light, 3px)
 					padding: 5px 0
 					margin:
 						bottom: 5px
@@ -621,14 +621,14 @@ $node-type-post: #647bce
 						margin-right: 15px
 
 					&.blue
-						@include button-rounded(hsl(hue($color-info), 60%, 45%), 3px)
+						+button(hsl(hue($color-info), 60%, 45%), 3px)
 
 					&.orange
-						@include button-rounded(hsl(hue($color-secondary), 50%, 50%), 3px)
+						+button(hsl(hue($color-secondary), 50%, 50%), 3px)
 						padding: 5px 15px
 
 					&.green
-						@include button-rounded-filled(hsl(hue($color-success), 60%, 40%), 3px)
+						+button(hsl(hue($color-success), 60%, 40%), 3px, true)
 
 	section#random-asset
 
@@ -810,10 +810,10 @@ section.pricing
 				transform: scale(1)
 
 			a.sign-up-now
-				+button-rounded-filled($color-primary, 999em)
+				+button($color-primary, 999em, true)
 
 				&:hover
-					+button-rounded-filled($color-success, 999em)
+					+button($color-success, 999em, true)
 
 		&.education
 			.pricing-caption
@@ -878,14 +878,14 @@ section.pricing
 			transform: translateX(-50%)
 			font-size: 1.2em
 
-			+button-rounded($color-primary, 999em)
+			+button($color-primary, 999em)
 			padding: 5px 25px
 			white-space: nowrap
 			text-align: center
 
 		&:hover
 			.sign-up-now
-				+button-rounded-filled($color-success, 999em)
+				+button($color-success, 999em, true)
 
 
 section.supported-by
diff --git a/src/styles/_pages.sass b/src/styles/_pages.sass
index 24dabd35..56ba0282 100644
--- a/src/styles/_pages.sass
+++ b/src/styles/_pages.sass
@@ -63,7 +63,7 @@
 		margin: 30px auto
 
 	a.page-header-cta
-		+button-rounded-filled($color-info, 3px)
+		+button($color-info, 3px, true)
 		font:
 			size: 1.3em
 			weight: 500
@@ -352,7 +352,7 @@ $page-card-icon-size: 75px
 			margin-right: initial
 
 a.page-card-cta
-	+button-rounded-filled($color-primary, 3px)
+	+button($color-primary, 3px, true)
 	padding: 5px 30px
 	margin-right: 25px
 	font-size: 1em
@@ -367,7 +367,7 @@ a.page-card-cta
 		margin-right: 0
 
 	&.download
-		+button-rounded-filled($color-success, 3px)
+		+button($color-success, 3px, true)
 		opacity: 1
 
 		i
diff --git a/src/styles/_project-dashboard.sass b/src/styles/_project-dashboard.sass
index 20bc17a9..2d6348ed 100644
--- a/src/styles/_project-dashboard.sass
+++ b/src/styles/_project-dashboard.sass
@@ -194,7 +194,7 @@
 						display: block
 						margin: 15px auto 0 auto
 						width: 200px
-						@include button-rounded($color-success, 3px)
+						+button($color-success, 3px)
 						padding: 5px 10px
 				.blender_sync-main-last
 					text-align: right
diff --git a/src/styles/_project.sass b/src/styles/_project.sass
index f930f9c9..3f3f6a73 100644
--- a/src/styles/_project.sass
+++ b/src/styles/_project.sass
@@ -1161,7 +1161,7 @@ section.node-preview.group
 				display: inline-block
 
 				.btn-browsetoggle
-					+button-rounded(lighten($color-background-nav, 20%), 3px)
+					+button(lighten($color-background-nav, 20%), 3px)
 					width: 48px
 					text-align: center
 					padding: 2px 4px
@@ -1350,7 +1350,7 @@ section.node-preview.group
 
 					/* Actual button */
 					button
-						@include button-rounded($color-primary, 3px)
+						+button($color-primary, 3px)
 						position: relative
 
 						padding:
@@ -1375,7 +1375,7 @@ section.node-preview.group
 
 					&.file.download
 						button
-							@include button-rounded-filled($color-primary, 3px)
+							+button($color-primary, 3px, true)
 							padding:
 								left: 15px
 								right: 15px
@@ -2359,7 +2359,7 @@ section.node-children
 			width: 100%
 
 		#files-action-add
-			+button-rounded-filled($color-success, 3px)
+			+button($color-success, 3px, true)
 			width: 200px
 			padding: 5px 10px
 			margin-bottom: 10px
@@ -2486,10 +2486,10 @@ section.node-children
 
 
 			button.cancel
-				+button-rounded($color-text-dark-primary, 3px)
+				+button($color-text-dark-primary, 3px)
 
 			button.move
-				+button-rounded-filled($color-success, 3px)
+				+button($color-success, 3px, true)
 
 				&.disabled
 					pointer-events: none
@@ -2511,27 +2511,27 @@ section.node-children
 	.fileupload-buttonbar
 		padding: 10px 0
 		.fileinput-button
-			@include button-rounded($color-success, 3px)
+			+button($color-success, 3px)
 		.start
-			@include button-rounded($color-info, 3px)
+			+button($color-info, 3px)
 		.cancel
-			@include button-rounded($color-warning, 3px)
+			+button($color-warning, 3px)
 		.delete
-			@include button-rounded($color-danger, 3px)
+			+button($color-danger, 3px)
 		.toggle
 			margin: 0 20px
 
 	.files
 		.btn
 			&.start
-				@include button-rounded($color-info, 3px)
+				+button($color-info, 3px)
 			&.cancel
-				@include button-rounded($color-warning, 3px)
+				+button($color-warning, 3px)
 			&.delete
-				@include button-rounded($color-danger, 3px)
+				+button($color-danger, 3px)
 
 			&.create
-				@include button-rounded($color-success, 3px)
+				+button($color-success, 3px)
 
 	.template-upload,
 	.template-download
diff --git a/src/styles/_user.sass b/src/styles/_user.sass
index 87869ef3..acd2b8d3 100644
--- a/src/styles/_user.sass
+++ b/src/styles/_user.sass
@@ -48,11 +48,11 @@
 		.button-login,
 		.button-submit
 			min-width: 200px
-			@include button-rounded-filled($color-primary, 999em)
+			+button($color-primary, 999em, true)
 
 		.button-register
 			min-width: 150px
-			@include button-rounded($color-primary, 999em)
+			+button($color-primary, 999em)
 
 #settings
 	display: flex
@@ -133,7 +133,7 @@
 		clear: both
 		min-width: 200px
 		margin: 0 auto
-		@include button-rounded-filled($color-primary, 999em)
+		+button($color-primary, 999em, true)
 
 
 #settings-container
@@ -182,10 +182,10 @@
 		padding: 10px 0
 
 		#submit_edit_user
-			+button-rounded-filled($color-success, 999em)
+			+button($color-success, 999em, true)
 
 		#button-cancel
-			+button-rounded(#aaa, 999em)
+			+button(#aaa, 999em)
 			margin: 0 10px
 
 		#user-edit-notification
diff --git a/src/styles/_utils.sass b/src/styles/_utils.sass
index bf880303..c9a736da 100644
--- a/src/styles/_utils.sass
+++ b/src/styles/_utils.sass
@@ -21,7 +21,7 @@
 
 		+clearfix
 
-@mixin button-rounded($mixin-color, $roundness, $filled: false)
+@mixin button($mixin-color, $roundness, $filled: false)
 	font-family: $font-body
 	text-transform: uppercase
 	opacity: .9
@@ -68,41 +68,6 @@
 	small
 		font-size: .6em
 
-@mixin button-rounded-filled($mixin-color, $roundness)
-	font-family: $font-body
-	text-transform: uppercase
-	opacity: .9
-	padding:
-		left: 20px
-		right: 20px
-	color: white
-	border: thin solid darken($mixin-color, 5%)
-	border-radius: $roundness
-	background: linear-gradient(lighten($mixin-color, 2%), $mixin-color)
-	text-shadow: 1px 1px 0 rgba(black, .15)
-
-	transition: color 150ms ease-out, opacity 100ms ease-in-out, background 100ms ease-out
-
-
-	&:hover
-		opacity: 1
-		cursor: pointer
-		color: white
-		border-color: lighten($mixin-color, 5%)
-		background: linear-gradient(lighten($mixin-color, 5%), lighten($mixin-color, 5%))
-		text-decoration: none
-
-	&:active, &:focus
-		outline: none
-		box-shadow: none
-		border-color: lighten($mixin-color, 5%)
-		background: $mixin-color
-		color: white
-
-	i
-		margin-right: 10px
-	small
-		font-size: .6em
 
 @mixin overlay($from-color, $from-percentage, $to-color, $to-percentage)
 	position: absolute
diff --git a/src/styles/base.sass b/src/styles/base.sass
index 9f21da6b..86d41818 100644
--- a/src/styles/base.sass
+++ b/src/styles/base.sass
@@ -796,7 +796,7 @@ label, label.control-label
 				margin-right: 10px
 
 		.fieldlist-action-button
-			@include button-rounded($color-success, 3px)
+			+button($color-success, 3px)
 			margin: 0 0 0 10px
 			padding: 5px 10px
 			text-transform: initial
diff --git a/src/styles/blog.sass b/src/styles/blog.sass
index d0e933b4..9152adaa 100644
--- a/src/styles/blog.sass
+++ b/src/styles/blog.sass
@@ -292,7 +292,7 @@
 			z-index: 2
 			top: 20px
 			right: 20px
-			+button-rounded-filled($color-success, 6px)
+			+button($color-success, 6px, true)
 
 		.button-edit
 			right: 170px
@@ -383,13 +383,13 @@
 	.button-create
 		display: block
 		width: 100%
-		+button-rounded($color-success, 6px)
+		+button($color-success, 6px)
 		margin: 0
 
 	.button-back
 		display: block
 		width: 100%
-		+button-rounded($color-info, 6px)
+		+button($color-info, 6px)
 		margin: 15px 0 0 0
 
 	#blog_post-edit-form
@@ -489,19 +489,19 @@
 
 #blog_post-container
 	.button-create
-		+button-rounded($color-success, 6px)
+		+button($color-success, 6px)
 	.button-back
 		position: absolute
 		top: 15px
 		right: 15px
 		z-index: 2
-		+button-rounded-filled($color-info, 6px)
+		+button($color-info, 6px, true)
 	.button-create, .button-edit
 		position: absolute
 		z-index: 2
 		top: 15px
 		right: 15px
-		+button-rounded-filled($color-success, 6px)
+		+button($color-success, 6px, true)
 
 	.button-edit
 		right: 170px