diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
| commit | 6081bfa2bcbe121e373486273ecce58a49e6fa97 (patch) | |
| tree | f2504800c66919a53eff9323724b493079569495 /core/css/styles.css | |
| parent | c2b4e534534e083147bbad9b564179832cfa2912 (diff) | |
| parent | 44287d680bd0e8799724a7595db43c0fafcaff40 (diff) | |
| download | nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.tar.gz nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.zip | |
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
Diffstat (limited to 'core/css/styles.css')
| -rw-r--r-- | core/css/styles.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 7d855556c84..35ef8c36ddf 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -160,7 +160,7 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd #categoryform .bottombuttons * { float: left;} /*#categorylist { border:1px solid #ddd;}*/ #categorylist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } -#categorylist li:hover, li:active { background:#eee; } +#categorylist li:hover, #categorylist li:active { background:#eee; } #category_addinput { width: 10em; } /* ---- APP SETTINGS ---- */ |