Skip to content
Browse files

fixed ordering of the media queries

  • Loading branch information...
1 parent c30d51d commit ee0815884bcc4dce8f8d182b0a84cdba6c9e9cf8 Travis Millward committed May 14, 2012
Showing with 40 additions and 34 deletions.
  1. +20 −17 grazy.css
  2. +20 −17 grazy.less
View
37 grazy.css
@@ -110,12 +110,12 @@ h6 {
/*these shadows need to be above the fill and width classes so that the fill classes will overide the shadows border*/
.shadowMinor {
box-shadow: 0px 0px 5px rgba(0,0,0,0.5);
- border: 1px solid rgba(0,0,0,0.1);
+
}
.shadowMajor {
box-shadow: 0px 0px 15px rgba(0,0,0,0.5);
- border: 1px solid rgba(0,0,0,0.2);
+
}
.hundred {width: 100%;}
@@ -379,6 +379,23 @@ fieldset {
border: 1px solid rgba(0,0,0,0.2);
}
+@media only screen and (max-width: 1170px) {
+ .fixedLayout {
+ width: 940px;
+ }
+
+ .fixedLayout img {
+ display: table;
+ width: 100%;
+ max-width: 100%;
+ max-height: 100%;
+ width: auto;
+ height: auto;
+ }
+}
+
+
+
@media handheld, only screen and (max-width: 940px), only screen and (max-device-width: 1024px) {
body {
margin: 4px;
@@ -388,7 +405,7 @@ fieldset {
}
.fixedLayout {
- width: auto;
+ width: 100%;
}
@@ -451,17 +468,3 @@ fieldset {
}
}
-@media only screen and (max-width: 1170px) {
- .fixedLayout {
- width: 940px;
- }
-
- .fixedLayout img {
- display: table;
- width: 100%;
- max-width: 100%;
- max-height: 100%;
- width: auto;
- height: auto;
- }
-}
View
37 grazy.less
@@ -110,12 +110,12 @@ h6 {
/*these shadows need to be above the fill and width classes so that the fill classes will overide the shadows border*/
.shadowMinor {
box-shadow: 0px 0px 5px rgba(0,0,0,0.5);
- border: 1px solid rgba(0,0,0,0.1);
+
}
.shadowMajor {
box-shadow: 0px 0px 15px rgba(0,0,0,0.5);
- border: 1px solid rgba(0,0,0,0.2);
+
}
.hundred {width: 100%;}
@@ -379,6 +379,23 @@ fieldset {
border: 1px solid rgba(0,0,0,0.2);
}
+@media only screen and (max-width: 1170px) {
+ .fixedLayout {
+ width: 940px;
+ }
+
+ .fixedLayout img {
+ display: table;
+ width: 100%;
+ max-width: 100%;
+ max-height: 100%;
+ width: auto;
+ height: auto;
+ }
+}
+
+
+
@media handheld, only screen and (max-width: 940px), only screen and (max-device-width: 1024px) {
body {
margin: 4px;
@@ -388,7 +405,7 @@ fieldset {
}
.fixedLayout {
- width: auto;
+ width: 100%;
}
@@ -451,17 +468,3 @@ fieldset {
}
}
-@media only screen and (max-width: 1170px) {
- .fixedLayout {
- width: 940px;
- }
-
- .fixedLayout img {
- display: table;
- width: 100%;
- max-width: 100%;
- max-height: 100%;
- width: auto;
- height: auto;
- }
-}

0 comments on commit ee08158

Please sign in to comment.
Something went wrong with that request. Please try again.