diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade index bb7a0045..b8d11dfe 100644 --- a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade +++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade @@ -1,5 +1,4 @@ -a.user-avatar(href="#", title="{{ vm.user.full_name_display }}") - {{ vm.user.full_name_display }} +a.user-avatar(href="#", title="{{ vm.user.full_name_display }}") {{ vm.user.full_name_display }} img(tg-bo-src="vm.user.photo", alt="{{ vm.user.full_name_display }}") div.navbar-dropdown.dropdown-user diff --git a/app/modules/navigation-bar/navigation-bar.scss b/app/modules/navigation-bar/navigation-bar.scss index e892fa40..667f6a82 100644 --- a/app/modules/navigation-bar/navigation-bar.scss +++ b/app/modules/navigation-bar/navigation-bar.scss @@ -39,6 +39,7 @@ } } .nav-right { + margin-left: auto; a { padding: .5rem 2rem; } diff --git a/app/partials/project/project-menu.jade b/app/partials/project/project-menu.jade index 4b053ee1..0c2d2663 100644 --- a/app/partials/project/project-menu.jade +++ b/app/partials/project/project-menu.jade @@ -1,46 +1,46 @@ div(class="menu-container") ul(class="main-nav") li(id="nav-search") - a(href="" title="{{'PROJECT.SECTION.SEARCH' | translate}}") + a(href="", title="{{'PROJECT.SECTION.SEARCH' | translate}}", tabindex="1") span(class="icon icon-search") span.helper(translate="PROJECT.SECTION.SEARCH") <% if (project.is_backlog_activated && project.my_permissions.indexOf("view_us") != -1) { %> li(id="nav-backlog") - a(href="" title="{{'PROJECT.SECTION.BACKLOG' | translate}}" tg-nav="project-backlog:project=project.slug") + a(href="" title="{{'PROJECT.SECTION.BACKLOG' | translate}}" tg-nav="project-backlog:project=project.slug", tabindex="2") span(class="icon icon-backlog") span.helper(translate="PROJECT.SECTION.BACKLOG") <% } %> <% if (project.is_kanban_activated && project.my_permissions.indexOf("view_us") != -1) { %> li(id="nav-kanban") - a(href="" title="{{'PROJECT.SECTION.KANBAN' | translate}}" tg-nav="project-kanban:project=project.slug") + a(href="" title="{{'PROJECT.SECTION.KANBAN' | translate}}" tg-nav="project-kanban:project=project.slug", tabindex="3") span(class="icon icon-kanban") span.helper(translate="PROJECT.SECTION.KANBAN") <% } %> <% if (project.is_issues_activated && project.my_permissions.indexOf("view_issues") != -1) { %> li(id="nav-issues") - a(href="" title="{{'PROJECT.SECTION.ISSUES' | translate}}" tg-nav="project-issues:project=project.slug") + a(href="" title="{{'PROJECT.SECTION.ISSUES' | translate}}" tg-nav="project-issues:project=project.slug", tabindex="4") span(class="icon icon-issues") span.helper(translate="PROJECT.SECTION.ISSUES") <% } %> <% if (project.is_wiki_activated && project.my_permissions.indexOf("view_wiki_pages") != -1) { %> li(id="nav-wiki") - a(href="" title="{{'PROJECT.SECTION.WIKI' | translate}}" tg-nav="project-wiki:project=project.slug") + a(href="" title="{{'PROJECT.SECTION.WIKI' | translate}}" tg-nav="project-wiki:project=project.slug", tabindex="5") span(class="icon icon-wiki") span.helper(translate="PROJECT.SECTION.WIKI") <% } %> li(id="nav-team") - a(href="" title="{{'PROJECT.SECTION.TEAM' | translate}}" tg-nav="project-team:project=project.slug") + a(href="" title="{{'PROJECT.SECTION.TEAM' | translate}}" tg-nav="project-team:project=project.slug", tabindex="6") span(class="icon icon-team") span.helper(translate="PROJECT.SECTION.TEAM") <% if (project.videoconferences) { %> li(id="nav-video") - a(href!="<%- project.videoconferenceUrl %>" target="_blank" title="{{'PROJECT.SECTION.MEETUP' | translate}}") + a(href!="<%- project.videoconferenceUrl %>" target="_blank" title="{{'PROJECT.SECTION.MEETUP' | translate}}", tabindex="7") span(class="icon icon-video") span(translate="PROJECT.SECTION.MEETUP") <% } %> <% if (project.i_am_owner) { %> li(id="nav-admin") - a(href="" tg-nav="project-admin-home:project=project.slug" title="{{'PROJECT.SECTION.ADMIN' | translate}}") + a(href="" tg-nav="project-admin-home:project=project.slug" title="{{'PROJECT.SECTION.ADMIN' | translate}}", tabindex="8") span(class="icon icon-settings") span.helper(translate="PROJECT.SECTION.ADMIN") <% } %> diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss index 33ee7665..13a1e88f 100644 --- a/app/styles/components/summary.scss +++ b/app/styles/components/summary.scss @@ -12,12 +12,9 @@ margin: 0 .5rem; } .data { - margin-top: 4px; .number { color: $fresh-taiga; - top: 0; } - } .icon { @extend %large; @@ -25,15 +22,13 @@ .number { @extend %xlarge; @extend %bold; + line-height: .9; margin-right: .3rem; - position: relative; - top: 5px; } .description { @extend %small; @extend %text; - line-height: .9rem; } } diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 79504e0c..a3cab813 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -7,6 +7,7 @@ body { @extend %text; background: $white; // fallback color: $grayer; + line-height: 1.2; min-height: 100%; width: 100%; .master { diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss index d78b24d9..24ed564b 100644 --- a/app/styles/dependencies/helpers.scss +++ b/app/styles/dependencies/helpers.scss @@ -8,9 +8,9 @@ %xxlarge {font-size: 3rem;} // __Font Types__ // -%title {font-family: 'OpenSans-CondLight', Arial, Helvetica, sans-serif; line-height: 1.5;} -%text {font-family: 'opensans-regular', Arial, Helvetica, sans-serif; line-height: 1.5;} -%bold {font-family: 'opensans-semibold', Arial, Helvetica, sans-serif; line-height: 1.5;} +%title {font-family: 'OpenSans-CondLight', Arial, Helvetica, sans-serif; } +%text {font-family: 'opensans-regular', Arial, Helvetica, sans-serif; } +%bold {font-family: 'opensans-semibold', Arial, Helvetica, sans-serif; } %taiga {font-family: 'taiga';} %mono {font-family: 'courier new', 'monospace';} diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss index 1dc5c5d3..add30736 100644 --- a/app/styles/modules/backlog/backlog-table.scss +++ b/app/styles/modules/backlog/backlog-table.scss @@ -151,6 +151,7 @@ transition: background .2s ease-in; } .user-story-name { + align-items: center; display: flex; flex-wrap: nowrap; input { diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index 65b7fba5..775c3fdc 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -3,7 +3,6 @@ $label-arrow-wh: 12px; .menu { background-image: url('../images/menu.png'); background-position: center center; - height: 100%; min-height: 100vh; padding: 1rem 0; text-transform: uppercase; @@ -34,7 +33,7 @@ $label-arrow-wh: 12px; opacity: 1; padding: .4rem 1rem; position: absolute; - top: 0; + top: calc(50% - 1rem); transition: all .2s; z-index: 99; &:after { diff --git a/gulpfile.js b/gulpfile.js index 9a315e9b..ddad3495 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -70,8 +70,8 @@ paths.css_order = [ paths.tmp + "styles/vendor/*", paths.tmp + "styles/core/reset.css", paths.tmp + "styles/core/base.css", - paths.tmp + "styles/core/animation.css", paths.tmp + "styles/core/typography.css", + paths.tmp + "styles/core/animation.css", paths.tmp + "styles/core/elements.css", paths.tmp + "styles/core/forms.css", paths.tmp + "styles/layout/*",