From 8d18a5710e9fbdcce56292a7e4e7c2958becb2da Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 21 Aug 2015 15:05:09 +0200 Subject: [PATCH] fixed line height of the new fields and removed the watchers tab from the styleguide --- .../content/_in_place_editing.sass | 5 +- .../work_package_details/_watchers_tab.lsg | 41 ------------ .../work_package_details/_watchers_tab.sass | 66 ------------------- app/assets/stylesheets/default.css.sass | 1 - 4 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 app/assets/stylesheets/content/work_package_details/_watchers_tab.lsg delete mode 100644 app/assets/stylesheets/content/work_package_details/_watchers_tab.sass diff --git a/app/assets/stylesheets/content/_in_place_editing.sass b/app/assets/stylesheets/content/_in_place_editing.sass index 40c84d367b..ee9f670cf8 100644 --- a/app/assets/stylesheets/content/_in_place_editing.sass +++ b/app/assets/stylesheets/content/_in_place_editing.sass @@ -276,6 +276,9 @@ a.inplace-editing--trigger-link, .work-package--details--long-field margin-top: 10px + .inplace-editing--trigger-container + line-height: 1.6 + .inplace-edit--read margin-left: 0px max-width: 100% @@ -289,7 +292,7 @@ a.inplace-editing--trigger-link, float: inherit i - vertical-align: text-bottom + vertical-align: text-top .inplace-edit--icon-wrapper .icon-button diff --git a/app/assets/stylesheets/content/work_package_details/_watchers_tab.lsg b/app/assets/stylesheets/content/work_package_details/_watchers_tab.lsg deleted file mode 100644 index 77ec167768..0000000000 --- a/app/assets/stylesheets/content/work_package_details/_watchers_tab.lsg +++ /dev/null @@ -1,41 +0,0 @@ -# Work Packages - [Details Pane] - Watchers - -``` -
- -
-``` diff --git a/app/assets/stylesheets/content/work_package_details/_watchers_tab.sass b/app/assets/stylesheets/content/work_package_details/_watchers_tab.sass deleted file mode 100644 index 208ba1385b..0000000000 --- a/app/assets/stylesheets/content/work_package_details/_watchers_tab.sass +++ /dev/null @@ -1,66 +0,0 @@ -//-- copyright -// OpenProject is a project management system. -// Copyright (C) 2012-2015 the OpenProject Foundation (OPF) -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License version 3. -// -// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -// Copyright (C) 2006-2013 Jean-Philippe Lang -// Copyright (C) 2010-2013 the ChiliProject Team -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// See doc/COPYRIGHT.rdoc for more details. -//++ - -#detail-panel-watchers - width: 100% - padding-top: 30px - .select2-with-searchbox - position: relative - .ui-select-choices - max-height: 350px - input[type='text'] - width: 100% - - .inplace-edit--read - max-width: 100% - - ul.watchers-list - margin: 15px 0 - padding: 0 0 15px 0 - list-style-type: none - - li - clear: both - height: 24px - - > .user-avatar--container - width: 40% - float: left - - .detail-panel-watchers-delete-watcher-link:hover, - .detail-panel-watchers-delete-watcher-link:active - text-decoration: none - - .detail-panel-watchers-delete-watcher-icon - padding: 0 8px - - fieldset - border: 0 - - #detail-panel-watchers-add-watcher - clear: left diff --git a/app/assets/stylesheets/default.css.sass b/app/assets/stylesheets/default.css.sass index 67f1b363e0..0ac0f8c058 100644 --- a/app/assets/stylesheets/default.css.sass +++ b/app/assets/stylesheets/default.css.sass @@ -73,7 +73,6 @@ @import content/work_package_details/activities_tab @import content/work_package_details/attachments_tab @import content/work_package_details/relations_tab -@import content/work_package_details/watchers_tab @import content/expandable_group_content @import content/control_colors