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

Commit

Permalink
removed media query test
Browse files Browse the repository at this point in the history
  • Loading branch information
danReynolds committed Mar 24, 2014
1 parent 6b1570f commit bd54f7a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
4 changes: 2 additions & 2 deletions css/general.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ html {
line-height: 1.6;
}
.test {
background-color:blue;
background-color:black;
color: white;
width: 5rem;
height: 5em;
Expand All @@ -22,5 +22,5 @@ p {font-size: 5rem;}
p {
font-size: 10rem;
}
.test {background-color: black;}
.test {background-color: green;}
}
6 changes: 0 additions & 6 deletions css/nested_imports/nested_importee3.css

This file was deleted.

5 changes: 1 addition & 4 deletions css/nested_imports/nested_importer.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
/*Parent Directory and Same Line Test */
@import url("../importee2.css"); @import url(nested_importee1.css);

/*Media Query Test*/
@import url("nested_importee2.css") screen;

/*No URL test*/
@import "nested_importee3.css";
@import "nested_importee2.css";

.nested-importer {
background-color:orange;
Expand Down
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
<div class="nested-importer">Folder Test</div>
<div class="importee2">Parent Directory Test</div>
<div class="nested-importee1">Same Line Test</div>
<div class="nested-importee2">Media Query Test</div>
<div class="nested-importee3">No URL Test</div>
<div class="nested-importee2">No URL Test</div>
<p>This thing works.</p>
<script src="js/rem.js" type="text/javascript"></script>
</body>
Expand Down

0 comments on commit bd54f7a

Please sign in to comment.