From a3eaf71c0c2980ebce074cb076b357a1646be355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 29 Nov 2016 15:55:24 +0100 Subject: [PATCH 1/6] Bump VERSION to 6.1.2 --- lib/open_project/auth_plugins/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/auth_plugins/version.rb b/lib/open_project/auth_plugins/version.rb index 22e51187a7..157965f6db 100644 --- a/lib/open_project/auth_plugins/version.rb +++ b/lib/open_project/auth_plugins/version.rb @@ -29,6 +29,6 @@ module OpenProject module AuthPlugins - VERSION = "6.1.1" + VERSION = "6.1.2" end end From 9b496daa9e5c072604db6d55de408616450a4949 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 16 Dec 2016 15:13:31 +0100 Subject: [PATCH 2/6] Style googles button according to their requirements --- .../stylesheets/auth_plugins/auth_plugins.css | 34 +++++++++++++++++++ app/views/hooks/login/_providers.html.erb | 9 +++-- lib/open_project/auth_plugins/engine.rb | 2 ++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/auth_plugins/auth_plugins.css diff --git a/app/assets/stylesheets/auth_plugins/auth_plugins.css b/app/assets/stylesheets/auth_plugins/auth_plugins.css new file mode 100644 index 0000000000..2f1eb59110 --- /dev/null +++ b/app/assets/stylesheets/auth_plugins/auth_plugins.css @@ -0,0 +1,34 @@ +/* -- copyright +// OpenProject My Project Page Plugin +// +// Copyright (C) 2011-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. +// +// 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.md for more details. +*/ + +/* +// Defined by Google +// see: https://developers.google.com/identity/branding-guidelines +// !important is necessary to overwrite the default styling options +*/ +#top-menu #nav-login-content .login-auth-providers a.auth-provider.auth-provider-google, +#content .login-auth-providers a.auth-provider-google, +.modal-wrapper .login-auth-providers a.auth-provider-google { + padding: 8px 8px 8px 50px; + background-position-x: 8px; + background-size: 18px 18px; + background-color: #FFF; + background-image: url('/assets/openid_connect/auth_provider-google.png'); +} diff --git a/app/views/hooks/login/_providers.html.erb b/app/views/hooks/login/_providers.html.erb index 73ee822a5d..11bc2c50de 100644 --- a/app/views/hooks/login/_providers.html.erb +++ b/app/views/hooks/login/_providers.html.erb @@ -27,6 +27,8 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> +<%= stylesheet_link_tag 'auth_plugins/auth_plugins' %> + <% OpenProject::Plugins::AuthPlugin.providers.each do |pro| %> <% opts = { @@ -37,14 +39,17 @@ See doc/COPYRIGHT.rdoc for more details. opts[:origin] = params['back_url'] end %> - + diff --git a/lib/open_project/auth_plugins/engine.rb b/lib/open_project/auth_plugins/engine.rb index 5a3ea8a087..2bf282c8af 100644 --- a/lib/open_project/auth_plugins/engine.rb +++ b/lib/open_project/auth_plugins/engine.rb @@ -42,5 +42,7 @@ module OpenProject::AuthPlugins initializer 'auth_plugins.register_hooks' do require 'open_project/auth_plugins/hooks' end + + assets %w(auth_plugins/auth_plugins.css) end end From ce2ac8e9f26f1d4c115d2013c0adbcde5ed59223 Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Wed, 21 Dec 2016 18:59:57 +0100 Subject: [PATCH 3/6] Bump VERSION to 6.1.3 --- lib/open_project/auth_plugins/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/auth_plugins/version.rb b/lib/open_project/auth_plugins/version.rb index 157965f6db..451c073ea9 100644 --- a/lib/open_project/auth_plugins/version.rb +++ b/lib/open_project/auth_plugins/version.rb @@ -29,6 +29,6 @@ module OpenProject module AuthPlugins - VERSION = "6.1.2" + VERSION = "6.1.3" end end From 860e03147eb887d57c5edd4e42e26852d5f47b2d Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Thu, 22 Dec 2016 16:26:04 +0100 Subject: [PATCH 4/6] Bump VERSION to 6.1.4 --- lib/open_project/auth_plugins/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/auth_plugins/version.rb b/lib/open_project/auth_plugins/version.rb index 451c073ea9..ad90aa8645 100644 --- a/lib/open_project/auth_plugins/version.rb +++ b/lib/open_project/auth_plugins/version.rb @@ -29,6 +29,6 @@ module OpenProject module AuthPlugins - VERSION = "6.1.3" + VERSION = "6.1.4" end end From 8fe436dd19c9d81e073780e2346615eab4806246 Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Thu, 22 Dec 2016 21:39:58 +0100 Subject: [PATCH 5/6] Revert "Style googles button according to their requirements" only merge once https://github.com/opf/openproject/pull/5105 is ready This reverts commit 9b496daa9e5c072604db6d55de408616450a4949. --- .../stylesheets/auth_plugins/auth_plugins.css | 34 ------------------- app/views/hooks/login/_providers.html.erb | 9 ++--- lib/open_project/auth_plugins/engine.rb | 2 -- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 app/assets/stylesheets/auth_plugins/auth_plugins.css diff --git a/app/assets/stylesheets/auth_plugins/auth_plugins.css b/app/assets/stylesheets/auth_plugins/auth_plugins.css deleted file mode 100644 index 2f1eb59110..0000000000 --- a/app/assets/stylesheets/auth_plugins/auth_plugins.css +++ /dev/null @@ -1,34 +0,0 @@ -/* -- copyright -// OpenProject My Project Page Plugin -// -// Copyright (C) 2011-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. -// -// 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.md for more details. -*/ - -/* -// Defined by Google -// see: https://developers.google.com/identity/branding-guidelines -// !important is necessary to overwrite the default styling options -*/ -#top-menu #nav-login-content .login-auth-providers a.auth-provider.auth-provider-google, -#content .login-auth-providers a.auth-provider-google, -.modal-wrapper .login-auth-providers a.auth-provider-google { - padding: 8px 8px 8px 50px; - background-position-x: 8px; - background-size: 18px 18px; - background-color: #FFF; - background-image: url('/assets/openid_connect/auth_provider-google.png'); -} diff --git a/app/views/hooks/login/_providers.html.erb b/app/views/hooks/login/_providers.html.erb index 11bc2c50de..73ee822a5d 100644 --- a/app/views/hooks/login/_providers.html.erb +++ b/app/views/hooks/login/_providers.html.erb @@ -27,8 +27,6 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> -<%= stylesheet_link_tag 'auth_plugins/auth_plugins' %> - <% OpenProject::Plugins::AuthPlugin.providers.each do |pro| %> <% opts = { @@ -39,17 +37,14 @@ See doc/COPYRIGHT.rdoc for more details. opts[:origin] = params['back_url'] end %> - + diff --git a/lib/open_project/auth_plugins/engine.rb b/lib/open_project/auth_plugins/engine.rb index 2bf282c8af..5a3ea8a087 100644 --- a/lib/open_project/auth_plugins/engine.rb +++ b/lib/open_project/auth_plugins/engine.rb @@ -42,7 +42,5 @@ module OpenProject::AuthPlugins initializer 'auth_plugins.register_hooks' do require 'open_project/auth_plugins/hooks' end - - assets %w(auth_plugins/auth_plugins.css) end end From f0c139cd4bef7d2e6bd5df68e087786eea1afdea Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 6 Jan 2017 16:00:48 +0100 Subject: [PATCH 6/6] Style googles button according to their requirements --- .../stylesheets/auth_plugins/auth_plugins.css | 34 +++++++++++++++++++ app/views/hooks/login/_providers.html.erb | 9 +++-- lib/open_project/auth_plugins/engine.rb | 2 ++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/auth_plugins/auth_plugins.css diff --git a/app/assets/stylesheets/auth_plugins/auth_plugins.css b/app/assets/stylesheets/auth_plugins/auth_plugins.css new file mode 100644 index 0000000000..2f1eb59110 --- /dev/null +++ b/app/assets/stylesheets/auth_plugins/auth_plugins.css @@ -0,0 +1,34 @@ +/* -- copyright +// OpenProject My Project Page Plugin +// +// Copyright (C) 2011-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. +// +// 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.md for more details. +*/ + +/* +// Defined by Google +// see: https://developers.google.com/identity/branding-guidelines +// !important is necessary to overwrite the default styling options +*/ +#top-menu #nav-login-content .login-auth-providers a.auth-provider.auth-provider-google, +#content .login-auth-providers a.auth-provider-google, +.modal-wrapper .login-auth-providers a.auth-provider-google { + padding: 8px 8px 8px 50px; + background-position-x: 8px; + background-size: 18px 18px; + background-color: #FFF; + background-image: url('/assets/openid_connect/auth_provider-google.png'); +} diff --git a/app/views/hooks/login/_providers.html.erb b/app/views/hooks/login/_providers.html.erb index 73ee822a5d..11bc2c50de 100644 --- a/app/views/hooks/login/_providers.html.erb +++ b/app/views/hooks/login/_providers.html.erb @@ -27,6 +27,8 @@ See doc/COPYRIGHT.rdoc for more details. ++#%> +<%= stylesheet_link_tag 'auth_plugins/auth_plugins' %> + <% OpenProject::Plugins::AuthPlugin.providers.each do |pro| %> <% opts = { @@ -37,14 +39,17 @@ See doc/COPYRIGHT.rdoc for more details. opts[:origin] = params['back_url'] end %> - + diff --git a/lib/open_project/auth_plugins/engine.rb b/lib/open_project/auth_plugins/engine.rb index 5a3ea8a087..2bf282c8af 100644 --- a/lib/open_project/auth_plugins/engine.rb +++ b/lib/open_project/auth_plugins/engine.rb @@ -42,5 +42,7 @@ module OpenProject::AuthPlugins initializer 'auth_plugins.register_hooks' do require 'open_project/auth_plugins/hooks' end + + assets %w(auth_plugins/auth_plugins.css) end end