diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index dbedcdad..b1eb4549 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -96,7 +96,7 @@ ProjectsNavigationDirective = ($rootscope, animationFrame, $timeout, tgLoader, $ <% _.each(projects, function(project) { %>
  • - <%- project.name %> + <%- project.name %>
  • diff --git a/app/partials/admin-project-profile.jade b/app/partials/admin-project-profile.jade index 7e8e1892..1938928f 100644 --- a/app/partials/admin-project-profile.jade +++ b/app/partials/admin-project-profile.jade @@ -20,7 +20,7 @@ block content fieldset label(for="project-name") Project Name input(type="text", name="name", placeholder="Project name", id="project-name", - ng-model="project.name", data-required="true") + ng-model="project.name", data-required="true", maxlength="45") fieldset label(for="project-slug") Project Slug diff --git a/app/partials/kanban.jade b/app/partials/kanban.jade index b0cb7fb9..6c91ba33 100644 --- a/app/partials/kanban.jade +++ b/app/partials/kanban.jade @@ -9,7 +9,7 @@ block content section.main.kanban div.kanban-detail-header h1 - span(tg-bo-bind="project.name") + span(tg-bo-bind="project.name", class="project-name") span.green(tg-bo-bind="sectionName") div.kanban-settings // a.button.button-trans(href="", title="Filter") diff --git a/app/partials/project.jade b/app/partials/project.jade index 3581f018..6aa5b1ab 100644 --- a/app/partials/project.jade +++ b/app/partials/project.jade @@ -7,7 +7,7 @@ block content div.wrapper(ng-controller="ProjectController as ctrl") section.main.single-project h1 - span.green(tg-bo-bind="project.name") + span.green(tg-bo-bind="project.name", class="project-name") div.summary ul.home-project-info-list li diff --git a/app/partials/taskboard.jade b/app/partials/taskboard.jade index c4fda74e..da9557f8 100644 --- a/app/partials/taskboard.jade +++ b/app/partials/taskboard.jade @@ -8,7 +8,7 @@ block content ng-init="section='backlog'") section.main.taskboard h1 - span(tg-bo-bind="project.name") + span(tg-bo-bind="project.name", class="project-name-short") span.green(tg-bo-bind="sprint.name") span.date(tg-date-range="sprint.estimated_start,sprint.estimated_finish") include views/components/sprint-summary diff --git a/app/partials/views/components/mainTitle.jade b/app/partials/views/components/mainTitle.jade index e96f923b..8a2935b9 100644 --- a/app/partials/views/components/mainTitle.jade +++ b/app/partials/views/components/mainTitle.jade @@ -1,4 +1,4 @@ header h1 - span(tg-bo-bind="project.name") - span.green(tg-bo-bind="sectionName") \ No newline at end of file + span(tg-bo-bind="project.name", class="project-name") + span.green(tg-bo-bind="sectionName") diff --git a/app/partials/views/modules/lightbox_create-project.jade b/app/partials/views/modules/lightbox_create-project.jade index be39d14e..4209cb00 100644 --- a/app/partials/views/modules/lightbox_create-project.jade +++ b/app/partials/views/modules/lightbox_create-project.jade @@ -5,7 +5,7 @@ form form fieldset input(type="text", name="name", ng-model="data.name", data-required="true", - placeholder="Name") + placeholder="Name", maxlength="45") fieldset textarea(name="description", ng-model="data.description", data-required="true", placeholder="Description") diff --git a/app/partials/wiki-edit.jade b/app/partials/wiki-edit.jade index 0929e854..40084c03 100644 --- a/app/partials/wiki-edit.jade +++ b/app/partials/wiki-edit.jade @@ -12,7 +12,7 @@ block content //Include views/components/mainTitle header h1 - span(tg-bo-bind="project.name") + span(tg-bo-bind="project.name", class="project-name-short") span.green Wiki span.wiki-title(tg-bo-bind='wikiSlug|unslugify') .action-buttons diff --git a/app/partials/wiki.jade b/app/partials/wiki.jade index 83a7f39e..64612346 100644 --- a/app/partials/wiki.jade +++ b/app/partials/wiki.jade @@ -11,7 +11,7 @@ block content section.main.wiki .header-with-actions h1 - span(tg-bo-bind="project.name") + span(tg-bo-bind="project.name", class="project-name-short") span.green Wiki span.wiki-title(tg-bo-bind='wiki.slug|unslugify') .action-buttons diff --git a/app/styles/dependencies/typography.scss b/app/styles/dependencies/typography.scss index 1aae25e4..3e6f83bc 100755 --- a/app/styles/dependencies/typography.scss +++ b/app/styles/dependencies/typography.scss @@ -53,11 +53,20 @@ h1 { margin-right: .5rem; overflow: hidden; text-overflow: ellipsis; + vertical-align: bottom; white-space: nowrap; &.green, &:last-child { flex-shrink: 0; } + &.project-name { + display: inline-block; + max-width: 60%; + } + &.project-name-short { + display: inline-block; + max-width: 40%; + } } .green { color: $green-taiga; diff --git a/app/styles/modules/common/projects-nav.scss b/app/styles/modules/common/projects-nav.scss index 9b5f53db..0ea93764 100644 --- a/app/styles/modules/common/projects-nav.scss +++ b/app/styles/modules/common/projects-nav.scss @@ -63,6 +63,7 @@ color: $whitish; display: block; padding: 1rem; + position: relative; text-transform: uppercase; width: 100%; &.active, @@ -74,11 +75,20 @@ opacity: 1; } } + .project-name { + display: block; + max-width: 90%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } .icon { color: $whitish; - float: right; opacity: 0; + position: absolute; + right: 1rem; + top: 1rem; } li { border-bottom: 2px solid $gray;