Merge pull request #301 from sonalkr132/sourcemap

Sourcemap
glittergallery · Jul 11, 2015 · 5d21e8d · 5d21e8d
2 parents cbfcf61 + cec6157
commit 5d21e8d
Show file tree

Hide file tree

Showing 13 changed files with 538 additions and 547 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ vendor
 
 # Ignore the data files created by user uploads
 /public/data/*
+/public/assets/*
 /public/testdata
 # Ignore the default SQLite database.
 /db/*.sqlite3

diff --git a/Gemfile b/Gemfile
@@ -68,6 +68,7 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'factory_girl_rails'
   gem 'binding_of_caller'
+  gem 'sass-rails-source-maps'
 end
 
 gem 'better_errors', group: :development

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -287,6 +287,11 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
+    sass-rails-source-maps (0.1.0)
+      rails
+      sass (~> 3.3)
+      sass-rails (~> 5.0.0.beta1)
+      sprockets (>= 2.3.0)
     shellany (0.0.1)
     sketchily (4.0.1)
       nokogiri
@@ -375,6 +380,7 @@ DEPENDENCIES
   rubocop
   rugged (~> 0.21)
   sass-rails
+  sass-rails-source-maps
   sketchily
   sqlite3
   test-unit

diff --git a/app/assets/stylesheets/_feed.scss b/app/assets/stylesheets/_feed.scss
@@ -1,54 +1,51 @@
 @media screen and (min-width: 0em){
-	body{
-		.wrapper{
-			article{
-				section{
-					div.feed{
-					  div{
-					  	@include cf();
-					  	margin: 0.5em auto;
-					  	header{
-					  		margin: 0;
-					  		border-style: none;
-					  		font-weight: 700;
-					  	}
-						  article{
-						  	p{
-						  		font-size: 0.9em;
-						  		a{
-						  			color: $map_blue;
-						  			font-weight: 300;
-						  			text-decoration: none;
-						  		}
-						  		a:hover{
-						  			text-decoration: underline;
-						  		}
-						  	}
-						  }
-						  footer{
-						  	@include span(1);
-						  	p{
-							  	color: gray;
-							  	font-size: 0.8em;
-						  	}
-						  }
-						}
-					}
-				}
-			}
-		}
- 	}
+  body{
+    .wrapper{
+      article{
+        section{
+          div.feed{
+            div{
+              @include cf();
+              margin: 0.5em auto;
+              header{
+                margin: 0;
+                border-style: none;
+                font-weight: 700;
+              }
+              article{
+                p{
+                  font-size: 0.9em;
+                  a{
+                    color: $map_blue;
+                    font-weight: 300;
+                    text-decoration: none;
+                  }
+                  a:hover{
+                    text-decoration: underline;
+                  }
+                }
+              }
+              footer{
+                @include span(1);
+                p{
+                  color: gray;
+                  font-size: 0.8em;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 @media screen and (min-width: 20em){
-
-
-				.feed{
-					ul{
-			  		padding-top: 1em;
-			  		padding-left: 10%;
-			  		padding-right: 10%;
-					}
-				}
-
+  .feed{
+    ul{
+      padding-top: 1em;
+      padding-left: 10%;
+      padding-right: 10%;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/_guide.scss b/app/assets/stylesheets/_guide.scss
@@ -1,29 +1,28 @@
 @media screen and (min-width: 0em){
-	body{
-		.wrapper{
-			article{
-				section{
-					.guide{
-						text-align: center;
-					  background-color: $geometry_gray;
-						padding: 1em;
-						p{
-							padding: 2em 0;
-							font-weight: 700;
-							a{
-								text-decoration: none;
-							}
-						}
-						form{
-							input[type="submit"]{
-								@include center;
-								width: 80%;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
+  body{
+    .wrapper{
+      article{
+        section{
+          .guide{
+            text-align: center;
+            background-color: $geometry_gray;
+            padding: 1em;
+            p{
+              padding: 2em 0;
+              font-weight: 700;
+              a{
+                text-decoration: none;
+              }
+            }
+            form{
+              input[type="submit"]{
+                @include center;
+                width: 80%;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 }