IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox

Browse Source 
Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
This commit is contained in:
Robin Ward
2013-07-26 11:30:40 -04:00
parent d71e7cdfde d7d3be1130
commit 29519ece23
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/application/compose.css.scss
View File

@@ -299,10 +299,15 @@
webkit-border-radius: 4px;
ms-border-radius: 4px;
}
video {
max-width: 100%;
height: auto;
}
audio {
max-width: 100%;
}
}
#wmd-preview {
border: 1px dashed $gray;

4
app/assets/stylesheets/application/topic-post.css.scss
View File

@@ -534,6 +534,10 @@
max-width: 100%;
height: auto;
}
audio {
max-width: 100%;
}
.topic-body {
position: relative;
.contents {