1816 Moved the congrats box to right column

Work for #1816 additionally, I removed the avatar and center column for the layout. Remaining work: inspiration button needs to change once the native inspiration gallery upload feature is added ( #1815 )
Iridescent-CM · Apr 25, 2018 · 7393e13 · 7393e13
1 parent 7391c58
commit 7393e13
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/challenges/templates/challenges/edp/layout.html b/challenges/templates/challenges/edp/layout.html
@@ -29,20 +29,13 @@ <h1>{{ challenge.name }}</h1>
     </header>
     {% endblock %}
 
-    {% block congrats_panel %}{% endblock %}
-
     <div class="row">
 
-      <div class="col-md-5">
+      <div class="col-md-6">
         {% block left_panel %}
         {% endblock %}
       </div>
 
-      <div class="col-md-1">
-        {% block middle_panel %}
-        {% endblock %}
-      </div>
-
       <div class="col-md-6">
         {% block right_panel %}
         {% endblock %}

diff --git a/challenges/templates/challenges/edp/progress/reflect.html b/challenges/templates/challenges/edp/progress/reflect.html
@@ -14,9 +14,6 @@ <h2><small>We're improving this challenge. You can keep working on it, but keep
 {% endblock %}
 
 {% block middle_panel %}
-  <div class="avatar-container">
-    {% include "_avatar.html" with user=progress.owner width=50 height=50 crop='fill' %}
-  </div>
 {% endblock %}
 
 {% block comments %}

diff --git a/challenges/templates/challenges/edp/progress/student/reflect.html b/challenges/templates/challenges/edp/progress/student/reflect.html
@@ -7,13 +7,16 @@
     <div class="panel white congratulations-panel">
       <div class="panel-body text-center">
         <div class="row">
-          <div class="col-md-6 col-md-offset-3 congratulations-panel-content">
+          <div class="congratulations-panel-content">
             <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>
+            <a href="{% url 'profiles:home' %}" class="btn btn-primary">Return to Dashboard</a>
+            </div>
           </div>
         </div>
       </div>

diff --git a/challenges/templates/challenges/edp/reflect.html b/challenges/templates/challenges/edp/reflect.html
@@ -71,5 +71,7 @@ <h3 class="question"></h3>
   {% endif %}
   {% endblock %}
 
+  {% block congrats_panel %}{% endblock %}
+
   {% block comments %}{% endblock %}
 {% endblock %}
diff --git a/curiositymachine/static/css/base.css b/curiositymachine/static/css/base.css
diff --git a/curiositymachine/static/less/pages/base.less b/curiositymachine/static/less/pages/base.less
@@ -517,8 +517,10 @@ margin-left: auto;
 }
 
 .congratulations-panel {
-  min-height: 350px;
-  padding-top: 60px;
+  min-height: 200px;
+  padding-top: 0px;
+  padding-left: 26px;
+  padding-right: 26px;
   background:
     url(../images/examples/balloon-left-animated.gif) top left no-repeat,
     url(../images/examples/balloon-right-animated.gif) top right no-repeat;