diff options
author | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
commit | 6b061c236dd5730837b567f2c39a19af1617d33c (patch) | |
tree | 27de0d46deae2987ea398f2f2aee4e26786c6f48 /settings/css | |
parent | 8951328a87c16e5ebfe4d3e5c392347db1e54f92 (diff) | |
parent | ab696edba685cd6d2a64c2e48907f03197aae53f (diff) | |
download | nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.tar.gz nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.zip |
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Diffstat (limited to 'settings/css')
-rw-r--r-- | settings/css/settings.css | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index a47e7bf6563..2cb18670875 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -152,7 +152,6 @@ table.grid td.date{ /* ADMIN */ span.securitywarning {color:#C33; font-weight:bold; } span.connectionwarning {color:#933; font-weight:bold; } -input[type=radio] { width:1em; } table.shareAPI td { padding-bottom: 0.8em; } #mail_settings p label:first-child { @@ -167,6 +166,26 @@ table.shareAPI td { padding-bottom: 0.8em; } width: 40px; } +.cronlog { + margin-left: 10px; +} + +.cronstatus { + display: inline-block; + height: 16px; + width: 16px; + vertical-align: text-bottom; +} + +span.success { + background: #37ce02; + border-radius: 8px; +} + +span.error { + background: #ce3702; +} + /* HELP */ .pressed {background-color:#DDD;} |