Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Use Octicons for homescreen links

Henriette Dargea2ff95a0d8e0
diff --git a/app/components/_index.sass b/app/components/_index.sass
index 72d0675a6cc..3366c366a07 100644
--- a/app/components/_index.sass
+++ b/app/components/_index.sass
@@ -32,4 +32,6 @@
@import "work_packages/progress/modal_body_component"
@import "work_packages/reminder/modal_body_component"
@import "work_packages/split_view_component"
+@import "homescreen/link_component"
+@import "homescreen/links_component"
@import "homescreen/new_features_component"
diff --git a/app/components/homescreen/link_component.html.erb b/app/components/homescreen/link_component.html.erb
index e5584e315d9..fc918c0df5f 100644
--- a/app/components/homescreen/link_component.html.erb
+++ b/app/components/homescreen/link_component.html.erb
@@ -32,6 +32,6 @@ See COPYRIGHT and LICENSE files for more details.
target: "_blank",
aria_label: title,
rel: "noopener" do %>
- <%= op_icon(link[:icon]) %>
+ <%= render(Primer::Beta::Octicon.new(icon: link[:icon], size: :medium)) %>
<%= title %>
<% end %>
diff --git a/app/components/homescreen/link_component.sass b/app/components/homescreen/link_component.sass
new file mode 100644
index 00000000000..360d87921a6
--- /dev/null
+++ b/app/components/homescreen/link_component.sass
@@ -0,0 +1,49 @@
+//-- copyright
+// OpenProject is an open source project management software.
+// Copyright (C) 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 COPYRIGHT and LICENSE files for more details.
+//++
+
+.homescreen--links--item
+ flex: 1
+ display: flex
+ flex-direction: column
+ row-gap: var(--base-size-8)
+ align-items: center
+ color: var(--control-iconColor-rest)
+
+ svg
+ height: 3rem
+ width: 3rem
+
+ &:hover
+ text-decoration: none
+ color: var(--accent-color)
+
+@media screen and (max-width: $breakpoint-sm)
+ .homescreen--links--item
+ flex: auto
+ margin: 20px 0
+ width: 50%
diff --git a/app/components/homescreen/links_component.sass b/app/components/homescreen/links_component.sass
new file mode 100644
index 00000000000..df654f78c2d
--- /dev/null
+++ b/app/components/homescreen/links_component.sass
@@ -0,0 +1,39 @@
+//-- copyright
+// OpenProject is an open source project management software.
+// Copyright (C) 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 COPYRIGHT and LICENSE files for more details.
+//++
+
+.homescreen--links
+ margin: 10px 0
+ display: flex
+ padding: 20px 15%
+ align-items: center
+ justify-content: center
+
+@media screen and (max-width: $breakpoint-sm)
+ .homescreen--links
+ padding: 20px
+ flex-wrap: wrap
diff --git a/config/initializers/homescreen.rb b/config/initializers/homescreen.rb
index d7cddebfe6b..70b11bffdb9 100644
--- a/config/initializers/homescreen.rb
+++ b/config/initializers/homescreen.rb
@@ -74,27 +74,27 @@ OpenProject::Static::Homescreen.manage :links do |links|
links.push(
{
label: :user_guides,
- icon: "icon-context icon-rename",
+ icon: "milestone",
url_key: :user_guides
},
{
label: :glossary,
- icon: "icon-context icon-glossar",
+ icon: "op-glossar",
url_key: :glossary
},
{
label: :shortcuts,
- icon: "icon-context icon-shortcuts",
+ icon: "op-shortcuts",
url_key: :shortcuts
},
{
label: :forums,
- icon: "icon-context icon-forums",
+ icon: "comment-discussion",
url_key: :forums
},
{
label: :impressum,
- icon: "icon-context icon-info1",
+ icon: "info",
url_key: :impressum
}
)
diff --git a/frontend/src/global_styles/openproject/_homescreen.sass b/frontend/src/global_styles/openproject/_homescreen.sass
index accdab1fe2f..e1fcac0844c 100644
--- a/frontend/src/global_styles/openproject/_homescreen.sass
+++ b/frontend/src/global_styles/openproject/_homescreen.sass
@@ -31,43 +31,3 @@
.controller-homescreen .widget-boxes
.widget-box
box-shadow: none
-
-.homescreen--links
- margin: 10px 0
- display: flex
- padding: 20px 20%
- align-items: center
- justify-content: center
-
- .icon-context:before
- padding-right: 0
-
- .homescreen--links--item
- flex: 1
- display: block
- text-align: center
- color: var(--control-iconColor-rest)
-
- i::before
- display: block
- margin-bottom: 10px
- font-size: 3rem
- color: var(--control-iconColor-rest)
-
- &:hover,
- &:hover span
- text-decoration: none
- color: var(--accent-color)
- i::before
- color: var(--accent-color)
-
-
-@media screen and (max-width: $breakpoint-sm)
- .homescreen--links
- padding: 20px
- flex-wrap: wrap
-
- .homescreen--links--item
- flex: auto
- margin: 20px 0
- width: 50%