Merge branch 'dev' into monthly-payment

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`

app/frontend/templates/admin/settings/about.html

@@ -28,7 +28,7 @@
 
         </div>
 
-        <div class="row">
+        <div class="row about-fablab">
             <div class="col-md-4 col-md-offset-1">
                 <div class="text-justify" ng-model="aboutBodySetting.value" medium-editor options='{"placeholder": "{{ "app.admin.settings.input_the_main_content" | translate }}",
                   "buttons": ["bold", "italic", "anchor", "header1", "header2" ]

app/frontend/templates/admin/settings/privacy.html

@@ -4,7 +4,7 @@
   </div>
     <div class="panel-body">
 
-        <div class="row">
+        <div class="row about-fablab">
             <div class="col-md-8">
               <select class="form-control m-b history-select" ng-options="d.id as d.name for d in privacyDraftsHistory" ng-model="privacyPolicy.version" ng-change="handlePolicyRevisionChange()">
                 <option value="" translate>{{ 'app.admin.settings.privacy.current_policy' }}</option>
@@ -45,7 +45,7 @@
           </boolean-setting>
           <p>
             <span translate>{{ 'app.admin.settings.privacy.about_analytics' }}</span>
-            <a ng-click="analyticsModal()" class="pointer" translate>{{ 'app.admin.settings.privacy.read_more' }}</a>
+            <a ng-click="analyticsModal()" class="pointer collected-infos" translate>{{ 'app.admin.settings.privacy.read_more' }}</a>
           </p>
         </div>
       </div>

app/frontend/templates/projects/index.html

@@ -23,7 +23,7 @@
 <section class="m-lg">
   <div class="row m-b-md">
     <div class="col-md-12 m-b">
-      <a href="javascript:void(0);" class="text-sm pull-right" name="button" ng-click="resetFiltersAndTriggerSearch()" ng-show="!openlab.searchOverWholeNetwork"><i class="fa fa-refresh"></i> {{ 'app.public.projects_list.reset_all_filters' | translate }}</a>
+      <a href="javascript:void(0);" class="text-sm pull-right reinit-filters" name="button" ng-click="resetFiltersAndTriggerSearch()" ng-show="!openlab.searchOverWholeNetwork"><i class="fa fa-refresh"></i> {{ 'app.public.projects_list.reset_all_filters' | translate }}</a>
 
       <span ng-if="openlab.projectsActive" uib-tooltip="{{ 'app.public.projects_list.tooltip_openlab_projects_switch' | translate }}" tooltip-trigger="mouseenter">
         <label for="searchOverWholeNetwork" class="control-label m-r text-sm" translate>{{ 'app.public.projects_list.search_over_the_whole_network' }}</label>

app/frontend/templates/projects/show.html

@@ -77,7 +77,7 @@
         <fab-user-avatar ng-model="project.author.user_avatar" avatar-class="thumb-50"></fab-user-avatar>
       </div>
       <div>
-        <a ng-show="project.author_id" class="text-sm font-sbold" ui-sref="app.logged.members_show({id: project.author.slug})">
+        <a ng-show="project.author_id" class="text-sm font-sbold project-author" ui-sref="app.logged.members_show({id: project.author.slug})">
           <i> {{ 'app.public.projects_show.by_name' | translate:{NAME:project.author.first_name} }}</i>
         </a>
         <span ng-hide="project.author_id" class="text-sm font-sbold text-gray" translate>{{ 'app.public.projects_show.deleted_user' }}</span>

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}; }
+      .about-page-link a.about-link, .user-profile-nav b.caret { color: #{Stylesheet.primary}; }
-      .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}; }