Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #14799: Add vertical alignment of image in media component #14801

Merged
merged 2 commits into from
Oct 26, 2014

Conversation

jenndodd
Copy link
Contributor

The .media-left and .media-right images can now be aligned vertically via the .media-middle and .media-bottom classes. Top is the default so we did not make an explicit .media-top class.

The .pull-right/left version still works and we left one example in the docs for testing purposes. Do you usually do that? We weren't sure how to make sure the deprecated version is still tested without keeping it in the docs.

Any thoughts? We'd love feedback.

@stubbornella, @jenndodd, & @bebepeng

Fixes #14799.

@hnrch02
Copy link
Collaborator

hnrch02 commented Oct 22, 2014

@jenndodd Would you mind removing the dist files from the PR? They're probably the reason for the merge conflicts.

@hnrch02 hnrch02 added this to the v3.3.0 milestone Oct 22, 2014
@stubbornella
Copy link
Contributor

We can do that, sure.

@stubbornella
Copy link
Contributor

Hmm, just realized @jenndodd isn't in the office today, so we'll have to hold off until we can get her to push the fix.

@hnrch02
Copy link
Collaborator

hnrch02 commented Oct 22, 2014

Sure, no worries!

@gpleiss
Copy link

gpleiss commented Oct 23, 2014

In giving our PR one more look over, we noticed that the media-object class appears not to affect appearance of the elements it is applied to. Is it possible to remove this class, or is it doing something else that we're not noticing?

@cvrebert
Copy link
Collaborator

All .media-object does is set display: block;:

display: block;

It doesn't do anything else and isn't used anywhere else in the Less code.

stubbornella and others added 2 commits October 23, 2014 18:48
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
@gpleiss
Copy link

gpleiss commented Oct 23, 2014

Even after reverting the dist changes we still got merge conflicts. So we modified the commits, rebased the latest changes to master, and force pushed the branch.

@hnrch02
Copy link
Collaborator

hnrch02 commented Oct 24, 2014

All .media-object does is set display: block;:

display: block;

It doesn't do anything else and isn't used anywhere else in the Less code.

Doesn't mean it can be removed though.

@mdo
Copy link
Member

mdo commented Oct 24, 2014

All .media-object does is insure a proper display for elements that might not be block level. It'll need to be there I believe.

// Proper spacing between instances of .media
.media,
.media .media {
.media {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from the alignment for the legacy .media > .pull-left, none of this needs to be nested under .media. The .media, .media-right, .media-body, etc can all be top level selectors here to avoid unnecessary specificity.

@gpleiss
Copy link

gpleiss commented Oct 24, 2014

Our bad! We're putting .media-object back, and we'll address the other issues @mdo brought up.

@mdo mdo merged commit e8643ed into twbs:master Oct 26, 2014
@mdo
Copy link
Member

mdo commented Oct 26, 2014

We're getting super close to a release here, so I took care of the problems here and merged to master. Thanks y'all!

@stubbornella
Copy link
Contributor

Thanks! Sorry we were slow. Jenn was out of the office this week so we had to finagle some things to get new code to her fork.

Nicole

On Sat, Oct 25, 2014 at 9:47 PM, Mark Otto notifications@github.com
wrote:

We're getting super close to a release here, so I took care of the problems here and merged to master. Thanks y'all!

Reply to this email directly or view it on GitHub:
#14801 (comment)

@mdo
Copy link
Member

mdo commented Oct 26, 2014

No worries, yo! We're really trying to get v3.3 (formerly v3.2.1) out the door. This wouldn't have happened at all without @jenndodd and you, so thanks again to y'all and sorry if I rushed anyway 😁.

@hnrch02
Copy link
Collaborator

hnrch02 commented Oct 31, 2014

@mdo I think we missed the ship list entry for this one...

@cvrebert
Copy link
Collaborator

@hnrch02 Yeah, we should edit the GitHub Release description to mention it.

@hnrch02
Copy link
Collaborator

hnrch02 commented Oct 31, 2014

@cvrebert I'll do that.

shesek added a commit to shesek/bootstrap that referenced this pull request Nov 15, 2014
as was the case up to 3.2.x, prior to twbs#14801
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Media: flag object to vertically align media content with media image
6 participants