Commit 936d2e0f by Brian Talbot

Merge pull request #1047 from edx/talbs/lms-tablesupport

Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays
parents 6805f4bb 9661cde5
...@@ -436,10 +436,25 @@ section.problem { ...@@ -436,10 +436,25 @@ section.problem {
} }
table { table {
margin-bottom: lh(); margin: lh() 0;
border-collapse: collapse; border-collapse: collapse;
table-layout: auto; table-layout: auto;
td, th {
&.cont-justified-left {
text-align: left !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
}
&.cont-justified-right {
text-align: right !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
}
&.cont-justified-center {
text-align: center !important; // nasty, but needed to override the bad specificity of the xmodule css selectorsstyles
}
}
th { th {
text-align: left; text-align: left;
font-weight: bold; font-weight: bold;
......
...@@ -117,19 +117,31 @@ code { ...@@ -117,19 +117,31 @@ code {
table { table {
width: 100%; width: 100%;
margin: 20px 0;
border-collapse: collapse; border-collapse: collapse;
font-size: 16px; font-size: 16px;
}
th {
background: #eee;
font-weight: bold;
}
table td, th { td, th {
margin: 20px 0; margin: 20px 0;
padding: 10px; padding: 10px;
border: 1px solid #ccc; border: 1px solid #ccc;
text-align: left;
font-size: 14px; font-size: 14px;
&.cont-justified-left {
text-align: left !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
}
&.cont-justified-right {
text-align: right !important; // nasty, but needed to override the bad specificity of the xmodule css selectors
}
&.cont-justified-center {
text-align: center !important; // nasty, but needed to override the bad specificity of the xmodule css selectorsstyles
}
}
}
th {
background: #eee;
font-weight: bold;
} }
...@@ -138,3 +138,15 @@ table td, th { ...@@ -138,3 +138,15 @@ table td, th {
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
} }
table td.cont-justified-left, table th.cont-justified-left {
text-align: left;
}
table td.cont-justified-right, table th.cont-justified-right {
text-align: right;
}
table td.cont-justified-center, table th.cont-justified-center {
text-align: center;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment