Merge pull request #309 from sharelatex/ja-tags-folders-tweaks

UX tweaks to tags/folders side bar entry
This commit is contained in:
Alasdair Smith 2018-02-06 10:36:15 +00:00 committed by GitHub
commit e93e055b13
4 changed files with 11 additions and 18 deletions

View file

@ -49,7 +49,11 @@
li(ng-class="{active: (filter == 'v1')}", ng-click="filterProjects('v1')")
a(href) #{translate("v1_projects")}
li.separator
h2 #{translate("folders")}
h2 #{translate("tags_slash_folders")}
li.tag(ng-cloak)
a.tag-name(href, ng-click="openNewTagModal()")
i.fa.fa-fw.fa-plus
span.name #{translate("new_folder")}
li.tag(
ng-repeat="tag in tags | orderBy:'name'",
ng-class="{active: tag.selected}",
@ -96,12 +100,9 @@
ng-class="{active: filter === 'untagged'}",
)
a.tag-name(href)
| #{translate("uncategorized")}
span.name
| #{translate("uncategorized")}
span.subdued ({{ nUntagged }})
li(ng-cloak)
a.tag(href, ng-click="openNewTagModal()")
i.fa.fa-fw.fa-plus
span.name #{translate("new_folder")}
.row-spaced(ng-if="projects.length == 0", ng-cloak)
.first-project

View file

@ -203,18 +203,12 @@ ul.folders-menu {
}
}
&.untagged {
font-style: italic;
margin-bottom: @line-height-computed / 4;
a {
line-height: @folders-untagged-line-height;
&:hover,
&:focus {
text-decoration: none;
a.tag-name {
span.name {
font-style: italic;
padding-left: 0;
}
}
span.subdued {
font-style: normal;
}
}
&:hover {
&:not(.active) {

View file

@ -873,7 +873,6 @@
@folders-tag-border-color : @text-color;
@folders-tag-menu-active-hover : darken(@brand-primary, 10%);
@folders-tag-menu-hover : @gray-light;
@folders-untagged-line-height : 1.7;
// Progress bars
@progress-border-radius : @border-radius-base;

View file

@ -162,7 +162,6 @@
@folders-tag-border-color : @folders-tag-menu-color;
@folders-tag-menu-hover : rgba(0, 0, 0, .1);
@folders-tag-menu-active-hover : rgba(0, 0, 0, .1);
@folders-untagged-line-height : @folders-menu-line-height;
// Project table
@structured-list-line-height : 2.5;