summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2017-10-23 21:13:17 +0200
committerGitHub <noreply@github.com>2017-10-23 21:13:17 +0200
commit59598b8a27e8a65f75b4c7e295146078dd6bd3e1 (patch)
tree2de98cdc497b3202606528e1d2fd6b2e4a8d8d84
parentc68a44d5f0eafb3c30b03e5786164a8918f2c7e3 (diff)
parentc2004afb4f8443e8245bc44245076589d3b56ab9 (diff)
downloadnextcloud-server-59598b8a27e8a65f75b4c7e295146078dd6bd3e1.tar.gz
nextcloud-server-59598b8a27e8a65f75b4c7e295146078dd6bd3e1.zip
Merge pull request #6916 from nextcloud/css-box-sizing
Box-sizing does not need vendor prefix anymore
-rw-r--r--apps/files/css/upload.scss4
-rw-r--r--core/css/jquery.ocdialog.scss2
-rw-r--r--settings/css/settings.scss2
3 files changed, 0 insertions, 8 deletions
diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss
index 4685b20d43a..5263a4b0e03 100644
--- a/apps/files/css/upload.scss
+++ b/apps/files/css/upload.scss
@@ -1,6 +1,4 @@
#upload {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
box-sizing: border-box;
height: 36px;
width: 39px;
@@ -26,8 +24,6 @@
.file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
#uploadprogresswrapper, #uploadprogresswrapper * {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
box-sizing: border-box;
}
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index efb2cc2f2e3..414443a5d3c 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -6,8 +6,6 @@
padding: 15px;
z-index: 10000;
font-size: 100%;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
box-sizing: border-box;
min-width: 200px;
top: 50%;
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index b21f052a15f..85ca66542a3 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -1084,8 +1084,6 @@ table.grid td.date {
}
#selectGroups select {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
box-sizing: border-box;
display: inline-block;
height: 36px;