diff --git a/app/assets/stylesheets/openproject.sass b/app/assets/stylesheets/openproject.sass deleted file mode 100644 index b93f7ccb22..0000000000 --- a/app/assets/stylesheets/openproject.sass +++ /dev/null @@ -1,34 +0,0 @@ -/*-- copyright - * OpenProject is an open source project management software. - * Copyright (C) 2012-2020 the OpenProject GmbH - * - * 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 docs/COPYRIGHT.rdoc for more details. ++ - */ - -// Todo for task #33508 - -// Enable asset pipeline for Bourbon mixins (e.g. +font-face) -// @see http://bourbon.io/docs/#asset-pipeline -$bourbon: ("rails-asset-pipeline": function-exists(font-url)) - diff --git a/app/assets/images/auth_provider-developer.png b/frontend/src/assets/images/auth_provider-developer.png similarity index 100% rename from app/assets/images/auth_provider-developer.png rename to frontend/src/assets/images/auth_provider-developer.png diff --git a/frontend/src/global_styles/content/_accounts.sass b/frontend/src/global_styles/content/_accounts.sass index e52cd7ec7a..34dfce5778 100644 --- a/frontend/src/global_styles/content/_accounts.sass +++ b/frontend/src/global_styles/content/_accounts.sass @@ -96,8 +96,7 @@ padding: 0.5rem 0.5rem 0.5rem 2rem margin-left: 10px margin-bottom: 10px - // Todo for task #33508 - //background-image: image-url('auth_provider-developer.png') + background-image: url('~assets/images/auth_provider-developer.png') background-size: 20px 20px background-repeat: no-repeat background-position: 5px center diff --git a/frontend/src/global_styles/openproject/_index.sass b/frontend/src/global_styles/openproject/_index.sass index 832c75438b..69b8e6c001 100644 --- a/frontend/src/global_styles/openproject/_index.sass +++ b/frontend/src/global_styles/openproject/_index.sass @@ -8,7 +8,3 @@ @import mixins @import onboarding @import scm - -// allow plugins to hook into global assets -// Todo for task #33508 -// @import openproject/plugins