Skip to content

E
edx-platform
Commit 7d903c40 by Tom Giannattasio
Options

sidebar hover and firefox bug fixes

parent b7ce475a
Showing with 32 additions and 28 deletions
lms/static/sass/course/_gradebook.scss
...@@ -18,7 +18,7 @@ div.gradebook-wrapper { ...@@ -18,7 +18,7 @@ div.gradebook-wrapper {
width: 100%; width: 100%;
height: 27px; height: 27px;
padding: 0 15px 0 35px; padding: 0 15px 0 35px;
box-sizing: border-box; @include box-sizing(border-box);
border-radius: 13px; border-radius: 13px;
border: 1px solid $table-border-color; border: 1px solid $table-border-color;
background: url(../images/search-icon.png) no-repeat 9px center #f6f6f6; background: url(../images/search-icon.png) no-repeat 9px center #f6f6f6;
...@@ -40,7 +40,6 @@ div.gradebook-wrapper { ...@@ -40,7 +40,6 @@ div.gradebook-wrapper {
.student-table { .student-table {
float: left; float: left;
// width: 264px;
width: 24%; width: 24%;
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
color: #3c3c3c; color: #3c3c3c;
...@@ -91,12 +90,20 @@ div.gradebook-wrapper { ...@@ -91,12 +90,20 @@ div.gradebook-wrapper {
.left-shadow { .left-shadow {
left: 0; left: 0;
background: -webkit-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -webkit-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0)); background-image: -webkit-gradient(linear, left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -webkit-gradient(linear, left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -webkit-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -moz-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -moz-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -ms-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -ms-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -o-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -o-linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
} }
.right-shadow { .right-shadow {
right: 0; right: 0;
background: -webkit-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -webkit-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0)); background-image: -webkit-gradient(linear, right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -webkit-gradient(linear, right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -webkit-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -webkit-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -moz-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -moz-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -ms-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -ms-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
background-image: -o-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 20%), -o-linear-gradient(right, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0));
} }
} }
...@@ -106,9 +113,8 @@ div.gradebook-wrapper { ...@@ -106,9 +113,8 @@ div.gradebook-wrapper {
left: 0; left: 0;
width: 1000px; width: 1000px;
cursor: move; cursor: move;
-webkit-transition: none; @include transition(none);
-webkit-user-select: none; @include user-select(none);
user-select: none;
td, td,
th { th {
...@@ -119,32 +125,30 @@ div.gradebook-wrapper { ...@@ -119,32 +125,30 @@ div.gradebook-wrapper {
thead th { thead th {
position: relative; position: relative;
height: 50px; height: 50px;
background: -webkit-linear-gradient(top, $cell-border-color, #ddd); @include linear-gradient(top, $cell-border-color, #ddd);
font-size: 10px; font-size: 10px;
line-height: 10px; line-height: 10px;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
box-shadow: 0 1px 0 $table-border-color inset, 0 2px 0 rgba(255, 255, 255, .7) inset; box-shadow: 0 1px 0 $table-border-color inset, 0 2px 0 rgba(255, 255, 255, .7) inset;
border-left: 1px solid #ccc;
&:before {
content: ''; // &:before {
display: block; // content: '';
position: absolute; // display: block;
left: 0; // position: absolute;
top: 0; // left: 0;
z-index: 9999; // top: 0;
width: 1px; // z-index: 9999;
height: 100%; // width: 1px;
background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0) 30%, rgba(0, 0, 0, .15)); // height: 50px;
} // @include linear-gradient(top, rgba(0, 0, 0, 0) 30%, rgba(0, 0, 0, .15));
// }
&:first-child { &:first-child {
border-radius: 5px 0 0 0; border-radius: 5px 0 0 0;
box-shadow: 1px 1px 0 $table-border-color inset, 1px 2px 0 rgba(255, 255, 255, .7) inset; box-shadow: 1px 1px 0 $table-border-color inset, 1px 2px 0 rgba(255, 255, 255, .7) inset;
border-left: none;
&:before {
display: hidden;
}
} }
&:last-child { &:last-child {
...@@ -164,7 +168,7 @@ div.gradebook-wrapper { ...@@ -164,7 +168,7 @@ div.gradebook-wrapper {
.max { .max {
height: 12px; height: 12px;
background: -webkit-linear-gradient(top, #c6c6c6, #bababa); @include linear-gradient(top, #c6c6c6, #bababa);
font-size: 9px; font-size: 9px;
line-height: 12px; line-height: 12px;
color: #fff; color: #fff;
......
lms/static/sass/course/courseware/_sidebar.scss
...@@ -124,7 +124,7 @@ section.course-index { ...@@ -124,7 +124,7 @@ section.course-index {
} }
&:hover { &:hover {
background: #fff; background: rgba(0, 0, 0, .1);
> a p { > a p {
color: #333; color: #333;
......
lms/templates/courseware/gradebook.html
...@@ -67,9 +67,9 @@ ...@@ -67,9 +67,9 @@
<thead> <thead>
<tr> <!-- Header Row --> <tr> <!-- Header Row -->
%for section in templateSummary['section_breakdown']: %for section in templateSummary['section_breakdown']:
<th>${section['label']}</th> <th><div class="assignment-label">${section['label']}</div></th>
%endfor %endfor
<th>Total</th> <th><div class="assignment-label">Total</div></th>
</tr> </tr>
</thead> </thead>
......
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