Skip to content

Commit 8b923c3

Browse files
author
Chris Hart
committed
Fix Learning Mastery Outcomes text-wrap
Fixes: CNVS-25394 Test plan: - This bug affects both Firefox and IE Edge on Windows 10 - Follow the instructions in the JIRA to create an Outcome and view it in the Learning Mastery Gradebook. Make sure the description is really long. - Ensure the description is being truncated by ellipses after one line and that the layout is no longer being blown out (see the JIRA ticket for screenshot of bug). The page should now look like this: http://screencast.com/t/b5Jt5RZO Change-Id: Ida2510fe2207b7f4694cdc895aa2b022dbb428ff Reviewed-on: https://gerrit.instructure.com/68981 Tested-by: Jenkins Reviewed-by: Pam Hiett <[email protected]> Product-Review: Pam Hiett <[email protected]> QA-Review: Myller de Araujo <[email protected]>
1 parent f5ee0b2 commit 8b923c3

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

app/stylesheets/base/_ic_app_layout.scss

+9-12
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@ $ic-left-side-width: $ic-sp*15;
7777
.ic-app-main-and-right-side {
7878
box-sizing: border-box;
7979
flex: 1;
80-
// firefox max-width images break the parent container
81-
@-moz-document url-prefix() {
82-
min-width: 1px;
83-
}
80+
81+
// Fix Firefox and IE Edge issues with contents breaking out of flex container
82+
min-width: 1px;
8483
}
8584

8685
.ic-app-course-menu {
@@ -104,23 +103,21 @@ $ic-left-side-width: $ic-sp*15;
104103
body:not(.ic-no-flex-layout) & {
105104
box-sizing: border-box;
106105
flex: 1;
107-
// firefox max-width images break the parent container
108-
@-moz-document url-prefix() {
106+
@include breakpoint(desktop) { display: flex; }
107+
108+
// Fix Firefox and IE Edge issues with contents breaking out of flex container
109109
min-width: 1px;
110110
}
111-
@include breakpoint(desktop) { display: flex; }
112-
}
113111
}
114112

115113
.ic-app-main-content__primary {
116114
box-sizing: border-box;
117115
@include breakpoint(desktop) {
118116
body:not(.ic-no-flex-layout) & {
119117
flex: 1;
120-
// firefox max-width images break the parent container
121-
@-moz-document url-prefix() {
122-
min-width: 1px;
123-
}
118+
119+
// Fix Firefox and IE Edge issues with contents breaking out of flex container
120+
min-width: 1px;
124121
}
125122
}
126123
}

0 commit comments

Comments
 (0)