Merge pull request #6688 from nextcloud/more-variables

Add variable for border-radius and box-shadow

10 files changed, 22 insertions, 21 deletions

diff --git a/apps/comments/css/autocomplete.scss b/apps/comments/css/autocomplete.scss
index 10e56f15420..41695e08301 100644
--- a/apps/comments/css/autocomplete.scss
+++ b/apps/comments/css/autocomplete.scss
@@ -12,7 +12,7 @@
 	background: $color-main-background;
 	color: $color-main-text;
 	border: 1px solid $color-border;
-	border-radius: 3px;
+	border-radius: $border-radius;
 	box-shadow: 0 0 5px $color-box-shadow;
 	min-width: 120px;
 	z-index: 11110 !important;
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index ef73f0800cb..a3beac152ce 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -752,7 +752,7 @@ table.dragshadow td.size {
 
 	.quota-container {
 		height: 5px;
-		border-radius: 3px;
+		border-radius: $border-radius;
 
 		div {
 			height: 100%;
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 159982e0bf1..06a105971bb 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -58,7 +58,7 @@ kbd {
 	padding: 4px 10px;
 	border: 1px solid #ccc;
 	box-shadow: 0 1px 0 rgba(0, 0, 0, .2);
-	border-radius: 3px;
+	border-radius: $border-radius;
 	display: inline-block;
 	white-space: nowrap;
 }
@@ -767,7 +767,7 @@ kbd {
 	position: absolute;
 	background-color: $color-main-background;
 	color: $color-main-text;
-	border-radius: 3px;
+	border-radius: $border-radius;
 	z-index: 110;
 	margin: 5px;
 	margin-top: -5px;
diff --git a/core/css/header.scss b/core/css/header.scss
index 1e5e2846723..530e78186a8 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -481,7 +481,7 @@ nav {
 		background-color: rgba($color-main-background, .97);
 		white-space: nowrap;
 		border: none;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		border-top-left-radius: 0;
 		border-top-right-radius: 0;
 		margin-top: 0;
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 5143ec518ed..20e8cbf08e0 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -45,7 +45,7 @@ div[contenteditable=true],
 	color: nc-lighten($color-main-text, 33%);
 	border: 1px solid nc-darken($color-main-background, 14%);
 	outline: none;
-	border-radius: 3px;
+	border-radius: $border-radius;
 	cursor: text;
 	&:not(:disabled):not(.primary) {
 		&:hover,
@@ -372,7 +372,7 @@ input {
 		background: $color-main-background;
 		color: nc-lighten($color-main-text, 33%);
 		box-sizing: content-box;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		border: 1px solid nc-darken($color-main-background, 14%);
 		margin: 0;
 		padding: 2px 0;
@@ -417,7 +417,7 @@ input {
 		background: $color-main-background;
 		color: nc-lighten($color-main-text, 33%);
 		box-sizing: content-box;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		border: 1px solid nc-darken($color-main-background, 14%);
 		margin: 0;
 		padding: 2px 0;
@@ -465,7 +465,7 @@ progress {
 	padding: 0;
 	border: 0 none;
 	background-color: nc-darken($color-main-background, 10%);
-	border-radius: 3px;
+	border-radius: $border-radius;
 	flex-basis: 100%;
 	height: 5px;
 	overflow: hidden;
@@ -481,12 +481,12 @@ progress {
 		background: transparent;
 	}
 	&::-moz-progress-bar {
-		border-radius: 3px;
+		border-radius: $border-radius;
 		background: $color-primary;
 		transition: 250ms all ease-in-out;
 	}
 	&::-webkit-progress-value {
-		border-radius: 3px;
+		border-radius: $border-radius;
 		background: $color-primary;
 		transition: 250ms all ease-in-out;
 	}
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index 414443a5d3c..fa2d9772658 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -1,7 +1,7 @@
 .oc-dialog {
 	background: $color-main-background;
 	color: nc-darken($color-main-text, 20%);
-	border-radius: 3px;
+	border-radius: $border-radius;
 	box-shadow: 0 0 7px $color-box-shadow;
 	padding: 15px;
 	z-index: 10000;
diff --git a/core/css/styles.scss b/core/css/styles.scss
index d74840fe444..d88a00a82f5 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -166,7 +166,7 @@ body {
 
 ::-webkit-scrollbar-thumb {
 	background: nc-darken($color-main-background, 14%);
-	border-radius: 3px;
+	border-radius: $border-radius;
 }
 
 /* Searchbox */
@@ -181,7 +181,7 @@ body {
 		background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center;
 		color: $color-primary-text;
 		border: 0;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		margin-top: 3px;
 		width: 0;
 		cursor: pointer;
@@ -648,7 +648,7 @@ label.infield {
 		background-color: rgba($color-main-text, 0.3);
 		color: $color-primary-text;
 		text-align: left;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		cursor: default;
 	}
 	.update {
@@ -675,7 +675,7 @@ label.infield {
 	margin-top: 8px;
 	padding: 5px;
 	background: rgba($color-error, .15);
-	border-radius: 3px;
+	border-radius: $border-radius;
 }
 
 .warning {
@@ -991,7 +991,7 @@ code {
 	margin-top: 10px;
 	padding: 4px 8px;
 	width: auto;
-	border-radius: 3px;
+	border-radius: $border-radius;
 	border: none;
 
 	.ui-state-default,
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
index 05ff4b5d0f9..e9982b580ca 100644
--- a/core/css/tooltip.scss
+++ b/core/css/tooltip.scss
@@ -117,7 +117,7 @@
 	color: $color-main-text;
 	box-shadow: 0 1px 10px $color-box-shadow;
 	text-align: center;
-	border-radius: 3px;
+	border-radius: $border-radius;
 }
 
 .tooltip-arrow {
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 26fd11a07d7..86a348c24f7 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -22,3 +22,4 @@ $color-loading: #969696;
 $color-loading-dark: #bbbbbb;
 $color-box-shadow: rgba(nc-darken($color-main-background, 30%), 0.75);
 $color-border: nc-darken($color-main-background, 8%);
+$border-radius: 3px;
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index a610b7d2df5..a5d7eab6a30 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -85,7 +85,7 @@ input {
 		transform: translate(-50%, -50%);
 		background: #fff;
 		color: #333;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		box-shadow: 0 0 7px #888;
 		padding: 15px;
 		.jcrop-holder {
@@ -716,7 +716,7 @@ span.version {
 		color: #555;
 		background-color: transparent;
 		border: 1px solid #555;
-		border-radius: 3px;
+		border-radius: $border-radius;
 		padding: 3px 6px;
 	}
 	a {
@@ -1103,7 +1103,7 @@ table.grid td.date {
 span {
 	&.success {
 		background: #37ce02;
-		border-radius: 3px;
+		border-radius: $border-radius;
 	}
 	&.error {
 		background: #ce3702;