Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
Fixed regression on assets handling
Browse files Browse the repository at this point in the history
This was probably added in the PR #953.

Fixes #1078

Signed-off-by: Miquel Sabaté Solà <[email protected]>
  • Loading branch information
mssola committed Oct 10, 2016
1 parent fc6982a commit fdb92ff
Show file tree
Hide file tree
Showing 25 changed files with 10 additions and 63 deletions.
4 changes: 1 addition & 3 deletions app/assets/javascripts/application.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
2 changes: 0 additions & 2 deletions app/assets/stylesheets/admin/dashboard.scss

This file was deleted.

16 changes: 7 additions & 9 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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/*";
19 changes: 0 additions & 19 deletions app/assets/stylesheets/authentication.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "variables";
@import "pacifico";

.oops {
padding-top: 2em;
Expand Down
3 changes: 0 additions & 3 deletions app/assets/stylesheets/includes/forms.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
@import "variables";
@import "mixins";

section.sign-up {
input#user_email {
border-radius: 4px 4px 0 0;
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/includes/labels.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../variables";

//labels
.label.label-info{
background: $primary-colour;
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/includes/panels.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../variables";

.panel-overview {
margin-bottom: 20px;
background-color: #fff;
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/includes/types.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../variables";

h1 {
small {
font-size: floor($font-size-base - 1);
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/namespaces.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import 'variables';

.destroy_comments_btn {
padding-top: 0px;
padding-bottom: 0px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import 'variables';

.starred {
.fa {
color: $first-colour !important;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import 'variables';

.search {
.category-panel {
.result-counter {
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/teams.scss

This file was deleted.

4 changes: 0 additions & 4 deletions app/views/layouts/application.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/authentication.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fdb92ff

Please sign in to comment.