aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2017-12-21 21:08:04 +0100
committerGitHub2017-12-21 21:08:04 +0100
commit8cd9b9ee5fc127b2f39a9c89c71327ab8d5e9cec (patch)
treecf51ffdb4db8a529d2ff5df04d08bacf42001a11
parente722b3de7928eabba8ecc3f66b9275bfd0438904 (diff)
parent7d830c881c49fb703bafae7c49f03197c7a3bf16 (diff)
downloadchouette-core-8cd9b9ee5fc127b2f39a9c89c71327ab8d5e9cec.tar.bz2
Merge pull request #171 from af83/5253-truncate-breadcrumb
Truncate long breadcrumbs. Refs #5354
-rw-r--r--app/assets/stylesheets/components/_breadcrumb.sass5
-rw-r--r--app/assets/stylesheets/components/_main_nav.sass16
2 files changed, 15 insertions, 6 deletions
diff --git a/app/assets/stylesheets/components/_breadcrumb.sass b/app/assets/stylesheets/components/_breadcrumb.sass
index 62f167eb4..1b30ca42b 100644
--- a/app/assets/stylesheets/components/_breadcrumb.sass
+++ b/app/assets/stylesheets/components/_breadcrumb.sass
@@ -1,3 +1,6 @@
.breadcrumbs
+ white-space: nowrap
+ text-overflow: ellipsis
+ overflow: hidden
a
- color: white \ No newline at end of file
+ color: white
diff --git a/app/assets/stylesheets/components/_main_nav.sass b/app/assets/stylesheets/components/_main_nav.sass
index 9f7a8e244..f102c4617 100644
--- a/app/assets/stylesheets/components/_main_nav.sass
+++ b/app/assets/stylesheets/components/_main_nav.sass
@@ -243,6 +243,9 @@ $menuW: 300px
left: 0
top: 13px
+ & > .menu-item
+ max-width: 75%
+
.menu-item
padding: 0 10px
@@ -324,8 +327,11 @@ $menuW: 300px
height: $menuH * 2
transition: 0.1s
- #menu_top > .menu-content > .menu-item-group
- display: none
+ #menu_top > .menu-content
+ & > .menu-item
+ max-width: 90%
+ & > .menu-item-group
+ display: none
.sticky-content
height: $menuH
@@ -345,16 +351,16 @@ $menuW: 300px
white-space: nowrap
max-height: 1.1em
margin: 0 -1.4em 0 0
- padding: 0 1.4em 0 0
+ padding: 0 1.4em 5px 0
overflow: hidden
&:before
content: '[...]'
font-size: 0.65em
position: absolute
- z-index: 5
+ z-index: 6
right: 0
- bottom: 4px
+ bottom: 9px
&:after
content: ''