Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed style of enter grade link #68

Merged
merged 1 commit into from
Mar 27, 2015
Merged

Changed style of enter grade link #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions edx_sga/static/css/edx_sga.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@

.sga-block .upload button {
position: absolute;
top: 0px;
top: 1px;
left: 0px;
z-index: 1;
cursor: pointer;
}

.sga-block .upload .fileupload {
Expand All @@ -50,11 +51,15 @@
filter:alpha(opacity: 0);
opacity: 0;
z-index: 2;
width: 200px;
cursor: pointer;
}

.sga-block td .upload button {
padding: 3px;
width: 100%;
height: 20px;
cursor: pointer;
}

.sga-block .error {
Expand Down Expand Up @@ -119,7 +124,33 @@
}

.modal-type-edx_sga ul.editor-modes.action-list.action-modes li a:hover {
background: #777;
color: #FFF;
background: #777;
color: #FFF;
}

.sga-block a.button {
background-color: #E5E4E3;
border: 1px solid #cec5c5;
border-radius: 2px;
text-decoration: none;
-moz-user-select: none;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
line-height: normal;
text-align: center;
vertical-align: middle;
white-space: nowrap;
top: 0px;
left: 0px;
z-index: 2;
padding: 2px;
width: 200px;
color: #333346;
font-weight: bold;
font-size: 0.8125em;
margin-top: 1px;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the button one pixel lower than the other button. I think that if you remove this line this is definitely good to go. Sorry to be so particular:
image

height: 20px;
cursor: pointer;
}

4 changes: 2 additions & 2 deletions edx_sga/templates/staff_graded_assignment/show.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@
</td>
<td>
<% if (assignment.may_grade) { %>
<a class="enter-grade-button" href="#{{ id }}-enter-grade">
<a class="enter-grade-button button" href="#{{ id }}-enter-grade">
<% if (assignment.needs_approval) { %>
{% trans "Approve grade" %}
<% } else { %>
{% trans "Enter grade" %}
<% } %>
</a>
<% } %>
<% } %>
</td>
<td>
<div class="upload">
Expand Down