diff --git a/CHANGELOG.md b/CHANGELOG.md index db5c37784..edc7b19ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Display a message when no plans are available - Fix a bug: in the settings area, boolean switches are always shown as false - Fix a bug: public cards presenting the plans in the public area, have bogus style +- Fix a bug: theme primary color is ignored on links - Updated stripe gem to 5.21.0 - [TODO DEPLOY] `rails fablab:stripe:plans_prices` - [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet` diff --git a/app/frontend/templates/admin/settings/about.html b/app/frontend/templates/admin/settings/about.html index 1b72552d5..109f3d330 100644 --- a/app/frontend/templates/admin/settings/about.html +++ b/app/frontend/templates/admin/settings/about.html @@ -28,7 +28,7 @@ -
+
@@ -45,7 +45,7 @@

{{ 'app.admin.settings.privacy.about_analytics' }} - {{ 'app.admin.settings.privacy.read_more' }} + {{ 'app.admin.settings.privacy.read_more' }}

diff --git a/app/frontend/templates/projects/index.html b/app/frontend/templates/projects/index.html index 09a492cd2..6acf364a8 100644 --- a/app/frontend/templates/projects/index.html +++ b/app/frontend/templates/projects/index.html @@ -23,7 +23,7 @@
- {{ 'app.public.projects_list.reset_all_filters' | translate }} + {{ 'app.public.projects_list.reset_all_filters' | translate }} diff --git a/app/frontend/templates/projects/show.html b/app/frontend/templates/projects/show.html index f7ac378cc..f526e1587 100644 --- a/app/frontend/templates/projects/show.html +++ b/app/frontend/templates/projects/show.html @@ -77,7 +77,7 @@
- + {{ 'app.public.projects_show.by_name' | translate:{NAME:project.author.first_name} }} {{ 'app.public.projects_show.deleted_user' }} diff --git a/app/models/stylesheet.rb b/app/models/stylesheet.rb index 1615cc58a..436393e2d 100644 --- a/app/models/stylesheet.rb +++ b/app/models/stylesheet.rb @@ -93,10 +93,16 @@ class Stylesheet < ApplicationRecord .btn-link { color: #{Stylesheet.primary} !important; } .btn-link:hover { color: #{Stylesheet.primary_dark} !important; } a { color: #{Stylesheet.primary}; } - .about-page-link a.about-link { color: #{Stylesheet.primary}; } - .user-profile-nav b.caret { color: #{Stylesheet.primary}; } + .about-page-link a.about-link, .user-profile-nav b.caret { color: #{Stylesheet.primary}; } + .app-generator a, .home-events h4 a, a.reinit-filters, .pricing-panel a, .calendar-url a, .article a, a.project-author, a.dsq-brlink, .alert a, .about-fablab a, a.collected-infos { color: #{Stylesheet.primary}; } + .app-generator a:hover, .home-events h4 a:hover, a.reinit-filters:hover, .pricing-panel a:hover, .calendar-url a:hover, .article a:hover, a.project-author:hover, a.dsq-brlink:hover, .widget .widget-content a:hover, .alert a:hover, .about-fablab a:hover, a.collected-infos:hover { color: #{Stylesheet.primary_dark}; } + .btn.btn-default.reserve-button, .btn.btn-default.show-button, .btn.btn-default.red { color: #{Stylesheet.primary} !important; } + .nav.nav-tabs .uib-tab.nav-item:not(.active) a { color: #{Stylesheet.primary}; } + .article h2, .article h3, .article h5 { color: #{Stylesheet.primary} !important; } + table.table thead tr th a, table.table tbody tr td a:not(.btn) { color: #{Stylesheet.primary}; } + table.table thead tr th a:hover, table.table tbody tr td a:not(.btn):hover { color: #{Stylesheet.primary_dark}; } a:hover, a:focus { color: #{Stylesheet.primary_dark}; } - h2, h3, h5 { color: #{Stylesheet.primary}; } + h2, h3, h3.red, h5 { color: #{Stylesheet.primary} !important; } h5:after { background-color: #{Stylesheet.primary}; } .bg-yellow { background-color: #{Stylesheet.secondary} !important; color: #{Stylesheet.secondary_text_color}; } .event:hover { background-color: #{Stylesheet.primary}; color: #{Stylesheet.secondary_text_color}; }