-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
#1811 #1816 #1817 edp restyling #1820
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few small things to check, looking good
@@ -6,17 +6,14 @@ | |||
{% endblock %} | |||
|
|||
{% block top_header %} | |||
<h1>{{ challenge.name }} <small>By {{progress.owner.username}}</small></h1> | |||
<div class="h1 text-center challenge-header">{{ challenge.name }} <small>By {{progress.owner.username}}</small></div> | |||
{% endblock %} | |||
|
|||
{% block draft_message %} | |||
<h2><small>We're improving this challenge. You can keep working on it, but keep an eye out for changes.</small></h2> | |||
{% endblock %} | |||
|
|||
{% block middle_panel %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This block doesn't exist any more, right? If so I would remove this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does still exist!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You deleted the only place it's included right here (layout.html line 42)
} | ||
margin-left: 0; | ||
margin-right: 0; | ||
margin-top: -10px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it too painful to get the spacing you want without a negative margin? Since we're trying to get rid of our LESS sooner rather than later this might be okay, but in general avoid negative margins unless you have really good reason to use them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, if I'm remembering correctly we use a negative margin elsewhere, but now that things are moved around we need it here. It is a consequence of the base template, and as far as i understand can't really be changed easily.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So two things: looking at this closer, you've actually removed any content from .challenge-header
so just remove the element. Secondly, if that wasn't the case you still have easy access to the preceding elements and the containing element, so there's no reason for a negative margin. Maybe we need to look at this together to figure out the confusion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, part of the confusion is that the student "progress" view and non-student "preview" view are out of sync a little bit now.
p { | ||
margin: 20px 0; | ||
} | ||
&:before {border-color: lighten(@green, 5%) transparent transparent transparent;} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's this doing?
<div class="panel-body"> | ||
<h3 data-submit-replacement-text="Please wait...">What step are you on?</h3> | ||
<h1 data-submit-replacement-text="Please wait...">What step are you on?</h1> | ||
<p>{{challenge.build_call_to_action}} Did it work like you thought it would?</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Did it work like you thought it would?" doesn't seem like appropriate text to follow the build call to action. Is this correct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This relates to the testing step. There might be a better way of displaying this.
<h2>Congratulations!</h2> | ||
<p> | ||
You just completed a design challenge! Now you can post a picture of your project to the Inspiration Gallery | ||
to share with the community. | ||
</p> | ||
<div class="button-wrapper"> | ||
<a href="{% url "challenges:examples" challenge_id=challenge.id %}" class="btn btn-primary">Go to the Inspiration Gallery</a> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indent this and next line
{% endblock %} | ||
|
||
{% block right_panel %} | ||
{% block right_panel_head %}{% endblock %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new design doesn't call for a header on the right panel anywhere, does it? I think you can drop this and clean this block out of any related templates.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the mentor views actually make use of this to display the student's name, so I'm leaving it in.
Another note: try to remember to start branches with the ticket #(s). At least check for typos, I thought I was going crazy trying to checkout out |
This should be a link
* remove impact survey default 0s * allow null in impact survey
removed the plan stage build call to action and the hardcoded testing phrase in the build stage.
Closed in favor of #1846 |
these are aesthetic changes driven by tickets #1811 #1816 #1817
They should be able to merge into staging without interfering with existing features.