From: Giuliano Velli Date: Tue, 24 Apr 2012 15:23:14 +0000 (+0200) Subject: Modified the file to conform to bootstrap standards and fix an IE7 css selector issue X-Git-Tag: v2.2.0^2~90^2~1^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7762a77c21905a71bc9b260052cadc80740d0d37;p=thirdparty%2Fbootstrap.git Modified the file to conform to bootstrap standards and fix an IE7 css selector issue Signed-off-by: Giuliano Velli --- 7762a77c21905a71bc9b260052cadc80740d0d37 diff --cc less/media.less index 87ea1bc1e4,87ea1bc1e4..dbcc212a06 --- a/less/media.less +++ b/less/media.less @@@ -1,68 -1,68 +1,69 @@@ // COMMON STYLES // ------------- --.media, .media-body { -- overflow:hidden; -- *overflow:visible; -- zoom:1; ++.media, ++.media-body { ++ overflow: hidden; ++ *overflow: visible; ++ zoom: 1; } .media { -- margin-bottom: 10px; ++ margin-bottom: 10px; } .media .media { -- margin-top: 20px; ++ margin-top: 20px; } .media .pull-left { -- margin-right: 10px; ++ margin-right: 10px; } .media .pull-right { -- margin-left: 10px; ++ margin-left: 10px; } .media .media-object { -- display: block; ++ display: block; } // Media list .medias { -- margin-top: 20px; -- margin-left: 0; -- list-style-type: none; ++ margin-top: 20px; ++ margin-left: 0; ++ list-style-type: none; } .medias .media { -- padding-bottom: 10px; -- border-bottom: 1px solid rgba(0, 0, 0, .07); ++ padding-bottom: 10px; ++ border-bottom: 1px solid rgba(0,0,0,.07); } --.medias > .media:last-child { -- margin: 0; -- border-bottom: none; ++.medias > .media.last { ++ margin: 0; ++ border-bottom: none; } .medias > .media .media { -- margin-bottom: 0; -- padding-bottom: 0; -- border-bottom: none; ++ margin-bottom: 0; ++ padding-bottom: 0; ++ border-bottom: none; } // Media box .media-box { -- margin-bottom: 19px; -- padding: 10px; -- background-color: #fff; -- border: 1px solid rgba(0,0,0,.09); -- .border-radius(4px); -- .box-shadow(1px 1px 2px rgba(0, 0, 0, 0.1)); ++ margin-bottom: 19px; ++ padding: 10px; ++ background-color: #fff; ++ border: 1px solid rgba(0,0,0,.09); ++ .border-radius(4px); ++ .box-shadow(1px 1px 2px rgba(0,0,0,.1)); } @media (max-width: 480px) { -- .media .pull-left, -- .media .pull-right { -- float: none; -- display: block; -- margin-bottom: 10px; -- } -- .media .pull-left { -- margin-right: 0; -- } -- .media .pull-right { -- margin-left: 0; -- } ++.media .pull-left, ++.media .pull-right { ++ float: none; ++ display: block; ++ margin-bottom: 10px; ++} ++.media .pull-left { ++ margin-right: 0; // we stack the components so the indent is not needed anymore ++} ++.media .pull-right { ++ margin-left: 0; // we stack the components so the indent is not needed anymore ++} }