Skip to content

Commit

Permalink
Merge pull request #104 from SiR-DanieL/fix-3679
Browse files Browse the repository at this point in the history
Fix 3679
  • Loading branch information
PaulAdamDavis committed Aug 21, 2014
2 parents 7e55f9a + 1d0cb16 commit 0a66aab
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 2 deletions.
5 changes: 5 additions & 0 deletions core/client/assets/sass/components/navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@
margin-top: 14px;
padding: 10px 12px;
border-radius: 4px;
max-width: 300px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
@include transition(background 0.5s);

small {
Expand Down Expand Up @@ -238,6 +242,7 @@
.name {
float: left;
margin: 0;
max-width: 300px;
padding: 0 0 5px 0;
text-overflow: ellipsis;
white-space: nowrap;
Expand Down
5 changes: 5 additions & 0 deletions core/client/docs/dist/css/ghost-ui.css
Original file line number Diff line number Diff line change
Expand Up @@ -1987,6 +1987,10 @@ table,
margin-top: 14px;
padding: 10px 12px;
border-radius: 4px;
max-width: 300px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
-webkit-transition: background 0.5s;
-moz-transition: background 0.5s;
transition: background 0.5s; }
Expand Down Expand Up @@ -2100,6 +2104,7 @@ table,
.user-menu .name {
float: left;
margin: 0;
max-width: 300px;
padding: 0 0 5px 0;
text-overflow: ellipsis;
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion core/client/docs/dist/css/ghost-ui.min.css

Large diffs are not rendered by default.

Binary file modified core/client/docs/dist/fonts/icons.eot
Binary file not shown.
3 changes: 2 additions & 1 deletion core/client/docs/dist/fonts/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/client/docs/dist/fonts/icons.ttf
Binary file not shown.
Binary file modified core/client/docs/dist/fonts/icons.woff
Binary file not shown.

0 comments on commit 0a66aab

Please sign in to comment.