codeforlife-portal 1.0.0.post.dev483__tar.gz → 1.0.0.post.dev485__tar.gz

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post.dev483
+Version: 1.0.0.post.dev485
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/codeforlife_portal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: codeforlife-portal
-Version: 1.0.0.post0.dev483
+Version: 1.0.0.post0.dev485
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/portal/_version.py

@@ -11,8 +11,8 @@ version_json = '''
 {
  "dirty": false,
  "error": null,
- "full-revisionid": "8ac224ba9d0f160020908e2a8fe7ee2c27f4a6f6",
- "version": "1.0.0.post.dev483"
+ "full-revisionid": "3668346e26acc734fb77e588bca50a346f433b09",
+ "version": "1.0.0.post.dev485"
 }
 '''  # END VERSION_JSON
 

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/portal/static/portal/sass/styles.scss

@@ -200,6 +200,7 @@ h4 {
 
 a {
   color: #4a4a4a;
+  cursor: pointer;
 }
 
 a:hover,
@@ -280,7 +281,6 @@ label {
   a:hover {
     border-bottom: 1px solid $color-text-tertiary;
     color: $color-text-tertiary;
-    cursor: pointer;
     text-decoration: none;
   }
 
@@ -299,7 +299,9 @@ button,
 .button,
 .button:hover,
 .button:active,
-.button:visited {
+.button:visited,
+.button:focus {
+  color: $color-text-secondary;
   text-decoration: none;
 }
 
@@ -397,7 +399,7 @@ button,
 
 .button--primary--positive {
   background: $color-button-primary-action-positive;
-  color: $color-text-primary;
+  color: $color-text-secondary;
 }
 
 .button--primary--negative {
@@ -418,7 +420,7 @@ button,
 
 .button--primary--setup {
   background: $color-button-primary-action-setup;
-  color: $color-text-primary;
+  color: $color-text-secondary;
 }
 
 .button--secondary {
@@ -431,7 +433,11 @@ button,
   color: $color-text-secondary;
 }
 
-.button--secondary--dark  {
+.button--secondary--dark,
+.button--secondary--dark:hover,
+.button--secondary--dark:active,
+.button--secondary--dark:visited,
+.button--secondary--dark:focus {
   border-color: $color-button-secondary-border-dark;
   color: $color-text-tertiary;
 
@@ -1202,9 +1208,6 @@ td {
     vertical-align: middle;
   }
 
-  .button--primary--positive {
-    float: right;
-  }
 }
 
 table,
@@ -1391,6 +1394,11 @@ td {
     text-align: left;
   }
 
+  a:focus {
+    background-color: $color-background-secondary;
+    color: $color-teacher-blue;
+  }
+
 }
 
 .sub-nav--hidden {

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/base_new.html

@@ -90,7 +90,7 @@
             {% block leftMenuButtons %}
             {% if user|is_logged_in %}
                 {% if user|is_logged_in_as_teacher %}
-                    <a class="button--menu button--menu--primary"><b>Teacher</b></a>
+                    <a href="{% url 'teach_new' %}" class="button--menu button--menu--primary"><b>Teacher</b></a>
                     {% block secondaryButtons %}
                     {% if user|has_teacher_finished_onboarding %}
                         <a href="{% url 'dashboard' %}" class="button--menu button--menu--secondary button--menu--enabled">School / Club</a>

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/teach_new/dashboard.html

@@ -149,10 +149,10 @@
                             <td><p class="small-text">{{ join_request.title }} {{ join_request.new_user.first_name }} {{ join_request.new_user.last_name }}</p></td>
                             <td><p class="small-text">{{ join_request.new_user.email }}</p></td>
                             <td class="cell-center">
-                                <a id="allow_button" class="button button--small button-primary button--primary--positive"
+                                <a id="allow_button" class="button button--small button--primary--positive"
                                         href="{% url 'organisation_allow_join_new' join_request.id %}">Allow</a></td>
                             <td class="cell-center">
-                                <a id="deny_button" class="button button--small button-primary button--primary--danger"
+                                <a id="deny_button" class="button button--small button--primary--danger"
                                         href="{% url 'organisation_deny_join_new' join_request.id %}">Deny</a></td>
                         </tr>
                     {% endfor %}

{codeforlife-portal-1.0.0.post.dev483 → codeforlife-portal-1.0.0.post.dev485}/portal/templates/redesign/teach_new/viewer_new.html

@@ -16,14 +16,14 @@
 
 <div id="pdf_viewer_page" class="top-element"></div>
 
-<div class="sticky-subnav sub-nav sub-nav--hidden sub-nav--teacher row--small">
+<div class="sticky-subnav sub-nav sub-nav--hidden sub-nav--teacher">
     <a href="{% url 'materials_new' %}#user_guide" class="button button--regular button--secondary button--secondary--light">User guide</a>
     <a href="{% url 'materials_new' %}#ks1" class="button button--regular button--secondary button--secondary--light">Key Stage 1</a>
     <a href="{% url 'materials_new' %}#lks2" class="button button--regular button--secondary button--secondary--light">Lower Key Stage 2</a>
     <a href="{% url 'materials_new' %}#uks2" class="button button--regular button--secondary button--secondary--light">Upper Key Stage 2</a>
 </div>
 
-<div class="sub-nav sub-nav--teacher row--small">
+<div class="sub-nav sub-nav--teacher">
     <a href="{% url 'materials_new' %}#user_guide" class="button button--regular button--secondary button--secondary--light">User guide</a>
     <a href="{% url 'materials_new' %}#ks1" class="button button--regular button--secondary button--secondary--light">Key Stage 1</a>
     <a href="{% url 'materials_new' %}#lks2" class="button button--regular button--secondary button--secondary--light">Lower Key Stage 2</a>