From 8a3f104c60613ce6b22609a99fe4b8b0f8dd6e94 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Mon, 9 Oct 2017 16:19:02 +0100 Subject: [PATCH] Fix some issues with longer project names. --- .../public/stylesheets/app/project-list.less | 23 +++++++------------ .../stylesheets/core/_common-variables.less | 2 +- .../public/stylesheets/core/ol-variables.less | 3 +-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index b5193ddefd..19a6c18e77 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -141,8 +141,6 @@ ul.folders-menu { cursor: pointer; position: relative; > a { - font-size: 0.9rem; - line-height: @folders-menu-line-height; display: block; color: @sidebar-link-color; padding: @folders-menu-item-v-padding @folders-menu-item-h-padding; @@ -183,7 +181,6 @@ ul.folders-menu { margin-bottom: @folders-title-margin-bottom; font-size: @folders-title-font-size; color: @folders-title-color; - line-height: @folders-title-line-height; text-transform: @folders-title-text-transform; padding: @folders-title-padding; font-weight: @folders-title-font-weight; @@ -303,17 +300,17 @@ ul.structured-list { .header when (@is-overleaf = false) { text-transform: uppercase; } - .select-item, .select-all { - display: inline-block; - margin: 0 (@line-height-computed / 4); - } // .select-item, .select-all { - // position: absolute; - // left: @line-height-computed; + // display: inline-block; + // margin: 0 (@line-height-computed / 4); // } + .select-item, .select-all { + position: absolute; + left: @line-height-computed; + } .select-item + span, .select-all + span { display: inline-block; - padding-left: (@line-height-computed / 4); + padding-left: @line-height-computed * 1.5; max-width: 100%; overflow: hidden; text-overflow: ellipsis; @@ -328,7 +325,6 @@ ul.structured-list { ul.project-list { li { - line-height: @structured-list-line-height; .last-modified when (@is-overleaf = false) { font-size: .8rem; } @@ -338,7 +334,7 @@ ul.project-list { .owner when (@is-overleaf = false) { margin-right: 0; } - .projectName when (@is-overleaf = false) { + .projectName { margin-right: @line-height-computed / 4; } @@ -371,9 +367,6 @@ ul.project-list { border-bottom-left-radius: 0; } } - li when (@is-overleaf = true) { - padding: 0; - } i.tablesort { padding-left: 8px; } diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less index 576aa6d6d4..644fe4c88e 100644 --- a/services/web/public/stylesheets/core/_common-variables.less +++ b/services/web/public/stylesheets/core/_common-variables.less @@ -822,6 +822,7 @@ @structured-header-border-color: @gray-lightest; @structured-list-border-color: @gray-lightest; @structured-list-hover-color: @gray-lightest; +@structured-list-line-height: @line-height-base; @sidebar-bg: transparent; @sidebar-color: @gray; @@ -831,7 +832,6 @@ @sidebar-hover-bg: transparent; @sidebar-hover-text-decoration: underline; -@structured-list-line-height: inherit; @folders-menu-margin: 0; @folders-menu-line-height: 1.2; @folders-menu-item-v-padding: (@line-height-computed / 4); diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less index 4598490c4a..e8aa2fe22b 100644 --- a/services/web/public/stylesheets/core/ol-variables.less +++ b/services/web/public/stylesheets/core/ol-variables.less @@ -111,14 +111,13 @@ @folders-menu-margin : 0 -(@grid-gutter-width / 2);; @folders-menu-line-height : @structured-list-line-height; -@folders-menu-item-v-padding : 0; +@folders-menu-item-v-padding : (@line-height-computed / 4); @folders-menu-item-h-padding : (@grid-gutter-width / 2); @folders-title-padding : @folders-menu-item-v-padding @folders-menu-item-v-padding; @folders-title-margin-top : 0; @folders-title-margin-bottom : 0; @folders-title-font-weight : normal; @folders-title-font-size : @font-size-small; -@folders-title-line-height : unit((@font-size-base / @font-size-small) * @folders-menu-line-height); @folders-title-color : @ol-blue-gray-2; @folders-title-text-transform : uppercase; @folders-tag-display : block;