diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-10 15:02:37 -0700 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-10 15:02:37 -0700 |
commit | a028ba930a5d18ee83d60b164f45f2a83b4f22b1 (patch) | |
tree | d0a8ace1abd430762f28d82e1e7294c64e031ce6 /core | |
parent | 121c8bd3030a8a16a100e3630b908b9bd9f8abbf (diff) | |
parent | da882b1320477c981b0a0160275c0ad228f28526 (diff) | |
download | nextcloud-server-a028ba930a5d18ee83d60b164f45f2a83b4f22b1.tar.gz nextcloud-server-a028ba930a5d18ee83d60b164f45f2a83b4f22b1.zip |
Merge pull request #2853 from owncloud/long-file-names
Application Names Ellipsise when the name length exceeds the width of the navigation.
Diffstat (limited to 'core')
-rw-r--r-- | core/css/styles.css | 11 | ||||
-rw-r--r-- | core/templates/layout.user.php | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index e0a5bd37c52..56ecd81895a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -266,16 +266,19 @@ fieldset.warning a { color:#b94a48 !important; font-weight:bold; } overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box; } #navigation:hover { overflow-y:auto; } -#navigation a { - display:block; padding:8px 0 4px; +#navigation a span { + display:block; text-decoration:none; font-size:10px; text-align:center; color:#fff; text-shadow:#000 0 -1px 0; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */ } #navigation a:hover, #navigation a:focus { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } - #navigation a.active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } - #navigation .icon { display:block; width:32px; height:32px; margin:0 16px 0; } + #navigation a.active .icon, #navigation a.active span { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } + #navigation .icon { + display:block; width:32px; height:32px; margin:0 16px 0; padding:8px 0 4px; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; + } #navigation li:first-child a { padding-top:16px; } diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 9af56b72c33..cfe0a551943 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -75,7 +75,9 @@ <a href="<?php print_unescaped($entry['href']); ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> <img class="icon svg" src="<?php print_unescaped($entry['icon']); ?>"/> - <?php p($entry['name']); ?> + <span> + <?php p($entry['name']); ?> + </span> </a> </li> <?php endforeach; ?> |