SAK-31978: Images elements not responsive when inserted via CKeditor (s…

…akaiproject#4033) SAK-31978: Images
vaibhav-s · Mar 13, 2017 · 08b8998 · 08b8998
1 parent 3c58605
commit 08b8998
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/...gnment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm b/...gnment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm
@@ -425,7 +425,7 @@ function printView(url) {
 						<label for="toggleAllSelectAllowResubmit" class="skip">$tlang.getString("allowResubmission.toggleall")</label>
 					</th> 
 					<th id="attachment" class="attach">
-						<img src="#imageLink("sakai/attachments.gif")" border="0" alt="$tlang.getString("gen.att")" width="15" height="15" />
+						<img src="#imageLink("sakai/attachments.gif")" border="0" alt="$tlang.getString("gen.att")" width="15" height="15" class="attachmentsIcon" />
 					</th>
 					<th id="studentname">
 						<a href="javascript:void(0)" onclick="location='#toolLinkParam("AssignmentAction" "doSort_grade_submission" "criteria=$!sort_lastName")'; return false;"   title="$tlang.getString("gen.sorbylas")">
@@ -567,7 +567,7 @@ function printView(url) {
 									#end
 								#end
 								#if ($size > 0)
-									<img src="#imageLink("sakai/attachments.gif")" border="0" alt="$tlang.getString("gen.att")" width="15" height="15" />
+									<img src="#imageLink("sakai/attachments.gif")" border="0" alt="$tlang.getString("gen.att")" width="15" height="15" class="attachmentsIcon" />
 								#end
 							</td>
 							<td headers="studentname">

diff --git a/library/src/morpheus-master/sass/base/_defaults.scss b/library/src/morpheus-master/sass/base/_defaults.scss
@@ -174,6 +174,15 @@ s, strike, del {
 	text-decoration: line-through;
 }
 
+img {
+	max-width: 100%;
+	height: auto;
+}
+
+video, embed, object, iframe {
+	max-width: 100%;
+}
+
 legend{
 	padding: 0.5em 0 0.1em 0;
 	margin-bottom: 0;

diff --git a/library/src/morpheus-master/sass/modules/tool/assignments/_assignments.scss b/library/src/morpheus-master/sass/modules/tool/assignments/_assignments.scss
@@ -197,6 +197,10 @@
 	  vertical-align: top;
 	}
 
+	.attachmentsIcon {
+	  max-width: none;
+	}
+
 	.assignmentUnsubmittable {
 	  background-color: #900;
 	  color: #fff;

diff --git a/library/src/morpheus-master/sass/modules/tool/resources/_resources.scss b/library/src/morpheus-master/sass/modules/tool/resources/_resources.scss
@@ -123,9 +123,6 @@
 		display: inline;
 		font-size:1em;
 	}
-	.table .attach {
-	width:20px !important;
-	}
 	td.actions2 .dropdown-toggle {
 		padding: 2px 6px !important;
 	}