Merge remote branch 'origin/master'

jesusrltp · Feb 29, 2012 · cfebf11 · cfebf11
2 parents bbd7b4d + f3bb432
commit cfebf11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/css/structure/jquery.mobile.core.css b/css/structure/jquery.mobile.core.css
@@ -62,11 +62,6 @@ div.ui-mobile-viewport { overflow-x: hidden; }
 /* icons sizing */
 .ui-icon { width: 18px; height: 18px; }
 
-/* fluid images */
-.ui-mobile img {
-	max-width: 100%;
-}
-
 /* non-js content hiding */
 .ui-nojs { position: absolute; left: -9999px; }
 

diff --git a/docs/_assets/css/jqm-docs.css b/docs/_assets/css/jqm-docs.css
@@ -23,9 +23,16 @@ pre { white-space: pre; white-space: pre-wrap; word-wrap: break-word; }
 #jqm-homeheader img { width: 235px; }
 img { max-width: 100%; }
 
+/* fluid images moved from jquery.mobile.core.css*/
+.ui-mobile img {
+	max-width: 100%;
+}
+
 .ui-header .jqm-home { top: 0; }
 nav { margin: 0; }
 
+
+
 p.intro {
 	font-size: .96em;
 	line-height: 1.3;