kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

resolve conflicts and remake

Browse source
This commit is contained in:
Mark Otto 2012-09-17 16:43:18 -07:00
commit 917b46a343
5 changed files with 173 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docs/assets/css/bootstrap-responsive.css vendored
View file

@ -895,6 +895,18 @@
padding-right: 10px;
padding-left: 10px;
}
.media .pull-left,
.media .pull-right {
display: block;
float: none;
margin-bottom: 10px;
}
.media .pull-left {
margin-right: 0;
}
.media .pull-right {
margin-left: 0;
}
.modal {
top: 10px;
right: 10px;

77
docs/assets/css/bootstrap.css vendored
View file

@ -5272,6 +5272,83 @@ a.thumbnail:hover {
color: #555555;
}
.media,
.media-body {
overflow: hidden;
*overflow: visible;
zoom: 1;
}
.media {
margin-bottom: 10px;
}
.media .media {
margin-top: 20px;
}
.media .pull-left {
margin-right: 10px;
}
.media .pull-right {
margin-left: 10px;
}
.media .media-object {
display: block;
}
.medias {
margin-top: 20px;
margin-left: 0;
list-style-type: none;
}
.medias .media {
padding-bottom: 10px;
border-bottom: 1px solid rgba(0, 0, 0, 0.07);
}
.medias > .media.last {
margin: 0;
border-bottom: none;
}
.medias > .media .media {
padding-bottom: 0;
margin-bottom: 0;
border-bottom: none;
}
.media-box {
padding: 10px;
margin-bottom: 19px;
background-color: #fff;
border: 1px solid rgba(0, 0, 0, 0.09);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
}
@media (max-width: 480px) {
.media .pull-left,
.media .pull-right {
display: block;
float: none;
margin-bottom: 10px;
}
.media .pull-left {
margin-right: 0;
}
.media .pull-right {
margin-left: 0;
}
}
.label,
.badge {
font-size: 11.844px;

1
less/bootstrap.less vendored
View file

@ -52,6 +52,7 @@
// Components: Misc
@import "thumbnails.less";
@import "media.less";
@import "labels-badges.less";
@import "progress-bars.less";
@import "accordion.less";

69
less/media.less Normal file
View file

@ -0,0 +1,69 @@
// COMMON STYLES
// -------------
.media,
.media-body {
overflow: hidden;
*overflow: visible;
zoom: 1;
}
.media {
margin-bottom: 10px;
}
.media .media {
margin-top: 20px;
}
.media .pull-left {
margin-right: 10px;
}
.media .pull-right {
margin-left: 10px;
}
.media .media-object {
display: block;
}
// Media list
.medias {
margin-top: 20px;
margin-left: 0;
list-style-type: none;
}
.medias .media {
padding-bottom: 10px;
border-bottom: 1px solid rgba(0,0,0,.07);
}
.medias > .media.last {
margin: 0;
border-bottom: none;
}
.medias > .media .media {
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,.1));
}
@media (max-width: 480px) {
.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
}
}

14
less/responsive-767px-max.less
View file

@ -155,6 +155,20 @@
}
}
// Medias
.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;
}
// Modals
.modal {
top: 10px;