Fixed regression on assets handling

This was probably added in the PR #953.

Fixes #1078

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

app/assets/javascripts/application.coffee

@@ -4,7 +4,5 @@
 #= require turbolinks
 #= require bootstrap-sprockets
 #= require lifeitup_layout
-#= require bootstrap
-#= require open_search
-#= require alert
 #= require bootstrap-typeahead-rails
+#= require_tree .

app/assets/stylesheets/application.scss

@@ -6,17 +6,15 @@
 // Vendored fonts and styles.
 @import "font-awesome";
 @import "raleway";
+@import "pacifico";
 
+// Core libraries.
 @import "bootstrap-sprockets";
-@import 'variables';
-@import 'mixins';
+@import 'core/**/*';
 @import 'bootstrap';
 @import 'lifeitup/lifeitup';
 
-//custom style overriding lifeitup
-@import 'layout';
-@import 'activities';
-@import 'buttons';
-@import 'images';
-@import 'tables';
-@import 'responsive-utilities';
+// Portus
+@import "includes/**/*";
+@import "pages/**/*";
+@import "components/*";

app/assets/stylesheets/errors.scss → app/assets/stylesheets/components/errors.scss

@@ -1,5 +1,3 @@
-@import "variables";
-@import "pacifico";
 
 .oops {
   padding-top: 2em;

app/assets/stylesheets/includes/forms.scss

@@ -1,6 +1,3 @@
-@import "variables";
-@import "mixins";
-
 section.sign-up {
   input#user_email {
     border-radius: 4px 4px 0 0;

app/assets/stylesheets/includes/labels.scss

@@ -1,5 +1,3 @@
-@import "../variables";
-
 //labels
 .label.label-info{
   background: $primary-colour;

app/assets/stylesheets/includes/panels.scss

@@ -1,5 +1,3 @@
-@import "../variables";
-
 .panel-overview {
   margin-bottom: 20px;
   background-color: #fff;

app/assets/stylesheets/includes/types.scss

@@ -1,5 +1,3 @@
-@import "../variables";
-
 h1 {
   small {
     font-size: floor($font-size-base - 1);

app/assets/stylesheets/comments.scss → app/assets/stylesheets/pages/comments.scss

@@ -1,5 +1,3 @@
-@import 'variables';
-
 .destroy_comments_btn {
   padding-top: 0px;
   padding-bottom: 0px;

app/assets/stylesheets/dashboard.scss → app/assets/stylesheets/pages/dashboard.scss

@@ -1,5 +1,3 @@
-@import 'variables';
-
 .starred {
   .fa {
     color: $first-colour !important;

app/assets/stylesheets/repositories.scss → app/assets/stylesheets/pages/repositories.scss

@@ -1,8 +1,4 @@
-@import 'includes/panels';
-@import 'includes/labels';
-@import 'includes/forms';
-@import 'includes/types';
-@import 'comments';
+@import "comments";
 
 #write_comment_repository_btn {
   padding-top: 0px;

app/assets/stylesheets/search.scss → app/assets/stylesheets/pages/search.scss

@@ -1,5 +1,3 @@
-@import 'variables';
-
 .search {
   .category-panel {
     .result-counter {

app/views/layouts/application.html.slim

@@ -3,11 +3,7 @@ html
   head
     title Portus
     = stylesheet_link_tag 'application', media: 'all'
-    - if Rails.application.assets.find_asset("#{params[:controller]}.css")
-      = stylesheet_link_tag params[:controller], media: 'all'
     = javascript_include_tag 'application'
-    - if Rails.application.assets.find_asset("#{params[:controller]}.js")
-      = javascript_include_tag params[:controller]
     = csrf_meta_tags
     meta content="width=device-width, initial-scale=1" name="viewport"
     link href="/favicon/apple-touch-icon-57x57.png" rel="apple-touch-icon" sizes="57x57"

app/views/layouts/authentication.html.slim

@@ -2,7 +2,7 @@ doctype html
 html
   head
     title Portus
-    = stylesheet_link_tag 'authentication', media: 'all'
+    = stylesheet_link_tag 'application', media: 'all'
     = javascript_include_tag 'application'
     = csrf_meta_tags
     meta content="width=device-width, initial-scale=1" name="viewport"