From 1c9d5828b17cda5daaf13700ffb67f80ab696e7c Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 6 Oct 2017 12:02:20 +0100 Subject: [PATCH] Even more adjustments to make the SL theme closer to original. --- .../web/public/stylesheets/app/project-list.less | 15 ++++----------- .../stylesheets/core/_common-variables.less | 12 ++++++------ .../web/public/stylesheets/core/ol-variables.less | 8 ++++---- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index f47374381e..73c44d68e3 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -131,7 +131,7 @@ ul.folders-menu { line-height: @folders-menu-line-height; display: block; color: @sidebar-link-color; - padding: @folders-menu-item-v-padding (@grid-gutter-width / 2); + padding: @folders-menu-item-v-padding @folders-menu-item-h-padding; border-bottom: solid 1px transparent; &:hover { background-color: @sidebar-hover-bg; @@ -167,7 +167,7 @@ ul.folders-menu { color: @folders-title-color; line-height: @folders-title-line-height; text-transform: @folders-title-text-transform; - padding: @folders-menu-item-v-padding (@grid-gutter-width / 2); + padding: @folders-title-padding; font-weight: @folders-title-font-weight; font-family: @font-family-sans-serif; } @@ -210,18 +210,11 @@ ul.folders-menu { } a.tag-name { padding: @folders-tag-padding; - margin-right: @folders-tag-margin-right; display: @folders-tag-display; position: relative; - i { - position: @folders-tag-icon-position; - top: 5px; - left: 6px; - } span.name { - display: inline-block; - padding-left: @folders-tag-spacing; - line-height: 1.4; + padding-left: 0.5em; + line-height: @folders-tag-line-height; } } .tag-menu { diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less index 9d29d7b91c..0a7c415049 100644 --- a/services/web/public/stylesheets/core/_common-variables.less +++ b/services/web/public/stylesheets/core/_common-variables.less @@ -831,18 +831,18 @@ @folders-menu-margin: 0; @folders-menu-line-height: 1.2; @folders-menu-item-v-padding: (@line-height-computed / 4); -@folders-title-margin-top: @line-height-computed / 2; -@folders-title-margin-bottom: @line-height-computed / 4; +@folders-menu-item-h-padding: (@line-height-computed / 4); +@folders-title-padding: 0; +@folders-title-margin-top: (@line-height-computed / 2); +@folders-title-margin-bottom: (@line-height-computed / 4); @folders-title-font-size: @font-size-base; @folders-title-font-weight: 500; @folders-title-line-height: @headings-line-height; @folders-title-color: inherit; @folders-title-text-transform: none; -@folders-tag-icon-position: absolute; -@folders-tag-padding: 2px (@line-height-computed / 4); -@folders-tag-spacing: 22px; +@folders-tag-padding: 2px 20px 2px @folders-menu-item-h-padding; +@folders-tag-line-height: 1.8; @folders-tag-display: block; -@folders-tag-margin-right: 18px; @folders-tag-menu-color: @gray; @folders-tag-hover: darken(@gray-lightest, 2%); @folders-tag-border-color: @text-color; diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less index 1a0e4ddde3..c5abf25ffe 100644 --- a/services/web/public/stylesheets/core/ol-variables.less +++ b/services/web/public/stylesheets/core/ol-variables.less @@ -107,6 +107,8 @@ @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-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; @@ -115,10 +117,8 @@ @folders-title-color : @ol-blue-gray-3; @folders-title-text-transform : uppercase; @folders-tag-display : block; -@folders-tag-margin-right : 0; -@folders-tag-icon-position : static; -@folders-tag-padding : @folders-menu-item-v-padding (@grid-gutter-width / 2); -@folders-tag-spacing : 0.5em; +@folders-tag-line-height : 1.4; +@folders-tag-padding : @folders-menu-item-v-padding 20px @folders-menu-item-v-padding @folders-menu-item-v-padding; @folders-tag-menu-color : #FFF; @folders-tag-hover : @sidebar-hover-bg; @folders-tag-border-color : @folders-tag-menu-color;