summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-09 18:45:12 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-09 18:45:12 +0200
commita636e4ff28b25797d6cc7750bc1efe52437ec67f (patch)
treeef385b9ef924088b6d6c1404d659e6be450aaf1f /core/css
parent28193732ea24094335cccddf5fe03aeeeb6f5894 (diff)
parent6ba18934e6f095de08bec7bdc10c45485eeb5cc7 (diff)
downloadnextcloud-server-a636e4ff28b25797d6cc7750bc1efe52437ec67f.tar.gz
nextcloud-server-a636e4ff28b25797d6cc7750bc1efe52437ec67f.zip
Downstream 2016-06-09
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
Diffstat (limited to 'core/css')
-rw-r--r--core/css/styles.css4
-rw-r--r--core/css/tooltip.css2
2 files changed, 5 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index df9509baa19..475c4fa3fb3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -38,6 +38,10 @@ body {
display: inline-block;
}
+a.two-factor-cancel {
+ color: #fff;
+}
+
.float-spinner {
height: 32px;
display: none;
diff --git a/core/css/tooltip.css b/core/css/tooltip.css
index 34d0ec6c70f..af25fd5533d 100644
--- a/core/css/tooltip.css
+++ b/core/css/tooltip.css
@@ -47,7 +47,7 @@
padding: 0 5px;
}
.tooltip-inner {
- max-width: 200px;
+ max-width: 350px;
padding: 3px 8px;
color: #ffffff;
text-align: center;