added adjacent selector for 1/4

iamjstates · Nov 28, 2012 · a717bb7 · a717bb7
1 parent 3c35f13
commit a717bb7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/example/css/without-effort.css b/example/css/without-effort.css
@@ -1185,11 +1185,18 @@ img {
       width: 100%; } }
   @media only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (min--moz-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (-o-min-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (min-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (min-resolution: 2dppx) {
     .space-34 {
-      width: 100%; } }
+      width: 74.8780667%; } }
   @media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
     .space-34 {
       width: 74.8780667%; } }
 
+@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) and (orientation: landscape) {
+  .space-34 + .space-14 {
+    width: 24.63433333%; } }
+@media only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (min--moz-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (-o-min-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (min-device-pixel-ratio: 2), only screen and (device-width: 768px) and (max-device-width: 1024px) and (orientation: portrait) and (min-resolution: 2dppx) {
+  .space-34 + .space-14 {
+    width: 24.63433333%; } }
+
 .space-44 {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;

diff --git a/example/css/without-effort.scss b/example/css/without-effort.scss
@@ -56,9 +56,13 @@ img{max-width: 100%;height: auto;display: block;}
     @include responsive(phone-retina){width: 100%;}
     @include responsive(phone-retina-landscape){width: 100%;}
     @include responsive(tablets){width:100%;}
-    @include responsive(tablets-retina){width:100%;}
+    @include responsive(tablets-retina){width:74.8780667%;}
     @include responsive(tablets-landscape){width: 74.8780667%;}
 }
+.space-34+.space-14{
+    @include responsive(tablets-landscape){width: 24.63433333%;}
+    @include responsive(tablets-retina){width:24.63433333%;}
+}
 .space-44{
     @include box-sizing(border-box);
     width:100%;

diff --git a/example/index.html b/example/index.html
@@ -459,18 +459,16 @@ <h3>Space 1/4 (3)</h3>
                         </form>
                 </div>
 
-                <div class="stack">
-                    <div class="space-14 demo">
-                        <h3>Space 1/4 (3)</h3>
-                        <p>
-                            Rhoncus quis egestas nascetur et! Pellentesque adipiscing, velit dapibus ultrices velit in elementum, ultrices. Habitasse
-                            pellentesque ultrices. Sociis ac porta elit? Scelerisque porttitor! Facilisis tincidunt tortor placerat. Lundium ac! Tortor
-                            turpis nascetur, turpis aliquam, nisi et urna, nec, turpis sed ultrices urna nec facilisis pulvinar odio integer, auctor sit,
-                            nec platea aliquet porttitor odio porta porttitor a natoque tristique, in risus, aenean scelerisque a cum nisi tristique porttitor
-                            elementum. Est rhoncus nunc sociis et! Scelerisque elit, nunc eu in nisi, amet. Parturient porta lacus purus vel est ridiculus
-                            porta, dolor odio enim, nunc, porttitor pellentesque elit habitasse. Magna lectus integer. Porttitor. Penatibus lacus mid.
-                        </p>
-                    </div>
+                <div class="space-14 demo">
+                    <h3>Space 1/4 (3)</h3>
+                    <p>
+                        Rhoncus quis egestas nascetur et! Pellentesque adipiscing, velit dapibus ultrices velit in elementum, ultrices. Habitasse
+                        pellentesque ultrices. Sociis ac porta elit? Scelerisque porttitor! Facilisis tincidunt tortor placerat. Lundium ac! Tortor
+                        turpis nascetur, turpis aliquam, nisi et urna, nec, turpis sed ultrices urna nec facilisis pulvinar odio integer, auctor sit,
+                        nec platea aliquet porttitor odio porta porttitor a natoque tristique, in risus, aenean scelerisque a cum nisi tristique porttitor
+                        elementum. Est rhoncus nunc sociis et! Scelerisque elit, nunc eu in nisi, amet. Parturient porta lacus purus vel est ridiculus
+                        porta, dolor odio enim, nunc, porttitor pellentesque elit habitasse. Magna lectus integer. Porttitor. Penatibus lacus mid.
+                    </p>
                 </div>
 
             </section>