KBP-175 #time 30m fix rails console warnings

lab2023 · Jan 9, 2018 · 64838a3 · 64838a3
1 parent 0edb266
commit 64838a3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/lib/cybele/helpers/app_files/assets_files.rb b/lib/cybele/helpers/app_files/assets_files.rb
@@ -26,16 +26,16 @@ def stylesheet_files
           # Css Assets files
           remove_file 'app/assets/stylesheets/application.css', force: true
 
-          template 'app_files/app/assets/stylesheets/application.css.sass',
-                   'app/assets/stylesheets/application.css.sass',
+          template 'app_files/app/assets/stylesheets/application.sass',
+                   'app/assets/stylesheets/application.sass',
                    force: true
 
-          template 'app_files/app/assets/stylesheets/hq/application.css.sass',
-                   'app/assets/stylesheets/hq/application.css.sass',
+          template 'app_files/app/assets/stylesheets/hq/application.sass',
+                   'app/assets/stylesheets/hq/application.sass',
                    force: true
 
-          copy_file 'app_files/app/assets/stylesheets/hq/_sidebar.css.sass',
-                    'app/assets/stylesheets/hq/_sidebar.css.sass'
+          copy_file 'app_files/app/assets/stylesheets/hq/_sidebar.sass',
+                    'app/assets/stylesheets/hq/_sidebar.sass'
         end
       end
     end

diff --git a/...p/assets/stylesheets/application.css.sass → ...s/app/assets/stylesheets/application.sass b/...p/assets/stylesheets/application.css.sass → ...s/app/assets/stylesheets/application.sass
diff --git a/...p/assets/stylesheets/hq/_sidebar.css.sass → ...s/app/assets/stylesheets/hq/_sidebar.sass b/...p/assets/stylesheets/hq/_sidebar.css.sass → ...s/app/assets/stylesheets/hq/_sidebar.sass
@@ -34,8 +34,7 @@
           padding-left: 5px
     .collapse .list-group-item, .collapsing .list-group-item
       padding-left: 20px
-    .collapse >
-    .collapse .list-group-item, .collapsing .list-group-item
+    .collapse > .collapse .list-group-item, .collapsing .list-group-item
       padding-left: 1.25rem
       .collapse > .collapse .list-group-item
         padding-left: 40px

diff --git a/...ssets/stylesheets/hq/application.css.sass → ...pp/assets/stylesheets/hq/application.sass b/...ssets/stylesheets/hq/application.css.sass → ...pp/assets/stylesheets/hq/application.sass
diff --git a/templates/devise/devise_strong_parameter.rb.erb b/templates/devise/devise_strong_parameter.rb.erb
@@ -1,7 +1,7 @@
 
 
   def configure_devise_permitted_parameters
-    sign_up_attributes = %i[email password password_confirmation name surname]
+    sign_up_attributes = %i[email password password_confirmation name surname time_zone]
     sign_in_attributes = %i[email password password_confirmation current_password]
     if resource_class == User
       devise_parameter_sanitizer.permit(:sign_up, keys: sign_up_attributes)