github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into sk-unlisted-projects

Browse source
This commit is contained in:
Shane Kilkelly 2017-11-08 11:21:19 +00:00
commit f3d037f7bc
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/list/project-list.pug
View file

@ -53,7 +53,7 @@
i.fa.fa-folder-open-o i.fa.fa-folder-open-o
| |
span.caret span.caret
ul.dropdown-menu.dropdown-menu-right.js-tags-dropdown-menu( ul.dropdown-menu.dropdown-menu-right.js-tags-dropdown-menu.tags-dropdown-menu(
role="menu" role="menu"
ng-controller="TagListController" ng-controller="TagListController"
) )

18
services/web/public/stylesheets/app/project-list.less
View file

@ -65,7 +65,6 @@
padding-top: @content-margin-vertical; padding-top: @content-margin-vertical;
padding-bottom: @content-margin-vertical; padding-bottom: @content-margin-vertical;
height: 100%; height: 100%;
overflow: hidden;
} }
.project-header { .project-header {
@ -81,6 +80,16 @@
.project-tools { .project-tools {
display: inline; display: inline;
float: right;
}
.tags-dropdown-menu {
max-width: 50vw;
&.dropdown-menu > li > a {
overflow: hidden;
text-overflow: ellipsis;
}
} }
.first-project { .first-project {
@ -216,9 +225,9 @@ ul.folders-menu {
} }
} }
a.tag-name { a.tag-name {
position: relative;
padding: @folders-tag-padding; padding: @folders-tag-padding;
display: @folders-tag-display; display: @folders-tag-display;
position: relative;
span.name { span.name {
padding-left: 0.5em; padding-left: 0.5em;
line-height: @folders-tag-line-height; line-height: @folders-tag-line-height;
@ -329,6 +338,7 @@ ul.project-list {
position: relative; position: relative;
top: -2px; top: -2px;
display: inline-block; display: inline-block;
white-space: nowrap;
} }
.tag-label-name, .tag-label-name,
.tag-label-remove { .tag-label-remove {
@ -337,6 +347,7 @@ ul.project-list {
color: #FFF; color: #FFF;
border-radius: @tag-border-radius; border-radius: @tag-border-radius;
background-color: @tag-bg-color; background-color: @tag-bg-color;
vertical-align: text-bottom;
&:hover, &:hover,
&:focus { &:focus {
background-color: @tag-bg-hover-color; background-color: @tag-bg-hover-color;
@ -346,6 +357,9 @@ ul.project-list {
padding-right: 0.3em; padding-right: 0.3em;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
max-width: @tag-max-width;
overflow: hidden;
text-overflow: ellipsis;
} }
.tag-label-remove { .tag-label-remove {
padding-left: 0.3em; padding-left: 0.3em;

1
services/web/public/stylesheets/core/_common-variables.less
View file

@ -889,4 +889,5 @@
// Tags // Tags
@tag-border-radius : 0.25em; @tag-border-radius : 0.25em;
@tag-bg-color : @label-default-bg; @tag-bg-color : @label-default-bg;
@tag-max-width : 150px;
@tag-bg-hover-color : darken(@label-default-bg, 10%); @tag-bg-hover-color : darken(@label-default-bg, 10%);