diff options
author | Sem <sembrestels@riseup.net> | 2012-08-04 01:50:01 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-08-04 01:50:01 +0200 |
commit | 18df06b9cd34c62dd8e9b1dfffd2f75e2815d859 (patch) | |
tree | e880bce8a7b10a6b3bc8c60168bc5ab35acf40f8 /views/default/css/admin.php | |
parent | 71edfd80a0baf95b86a29547252b01973511828f (diff) | |
parent | 4dd2ca9d54b64ebbf5eba3e3036f747cadb40825 (diff) | |
download | elgg-18df06b9cd34c62dd8e9b1dfffd2f75e2815d859.tar.gz elgg-18df06b9cd34c62dd8e9b1dfffd2f75e2815d859.tar.bz2 |
Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into lorea-preprod
Conflicts:
mod/developers/views/default/theme_preview/grid.php
Diffstat (limited to 'views/default/css/admin.php')
-rw-r--r-- | views/default/css/admin.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 78ec95c26..b996e5636 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -1460,7 +1460,8 @@ a.elgg-widget-collapsed:before { padding: 5px 10px; margin: 4px 0; } -ul.elgg-plugin-categories, ul.elgg-plugin-categories > li { +ul.elgg-plugin-categories, ul.elgg-plugin-categories > li, +ul.elgg-plugin-resources, ul.elgg-plugin-resources > li { display: inline; } .elgg-plugin-category-bundled { @@ -1510,6 +1511,12 @@ ul.elgg-plugin-categories, ul.elgg-plugin-categories > li { margin-bottom: 5px; } +.elgg-text-help { + display: block; + font-size: 85%; + font-style: italic; +} + .elgg-longtext-control { margin-left: 14px; font-size: 80%; |