Merge branch 'dev' into feature/intro-js

Nick Litwin · Nick Litwin · commit 1c08f651055c · 2015-10-06T07:22:08.000-07:00
diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade
@@ -3,7 +3,7 @@
     .challenge-track
 
     header
-      a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
+      a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
 
     .srm-details
       p.starts-in Starts in #[span {{srm.startDate | timeDiff:"quantity"}} {{srm.startDate | timeDiff:'unit'}}]
@@ -24,7 +24,7 @@
     .challenge-track
 
     header
-      a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
+      a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
       .ended-on #[span {{srm.startDate | localTime:"MMM DD, YYYY" }}]
 
     .member-stats
@@ -43,7 +43,7 @@
     .challenge-track
     header
       .srm-name
-        a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
+        a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
 
     .srm-details
       p.starts-in Starts in #[span {{srm.startDate | timeDiff:"quantity"}} {{srm.startDate | timeDiff:'unit'}}]
@@ -59,7 +59,7 @@
     .challenge-track
     header
       .srm-name
-        a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.id}}") {{srm.name}}
+        a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}}
 
     .srm-details
       p.ended-on Ended {{srm.endDate | timeDiff:"quantity"}} {{srm.endDate | timeDiff:'unit'}} ago
diff --git a/assets/images/skills/id-406.svg b/assets/images/skills/id-406.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>icons/skills/id 406</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="7.32852269%" y1="78.1494237%" x2="90.71457%" y2="58.0668032%" id="linearGradient-1">
+            <stop stop-color="#64D3B2" offset="0%"></stop>
+            <stop stop-color="#64D3B2" offset="21.0637131%"></stop>
+            <stop stop-color="#3980DF" offset="45.1584604%"></stop>
+            <stop stop-color="#4087DE" offset="66.3976313%"></stop>
+            <stop stop-color="#FD341C" offset="91.205176%"></stop>
+            <stop stop-color="#FD341C" offset="100%"></stop>
+        </linearGradient>
+        <path d="M2.69426752,29.6101911 C3.13758183,32.0484198 4.19967312,34.0340688 5.88057325,35.5671975 C7.56147337,37.1003261 9.69489153,37.866879 12.2808917,37.866879 C14.0172061,37.866879 15.5226051,37.5436338 16.7971338,36.8971338 C18.0716624,36.2506337 19.1522249,35.4009607 20.0388535,34.3480892 C20.9254821,33.2952177 21.6458571,32.0853572 22.2,30.7184713 C22.7541429,29.3515855 23.1789794,27.9477779 23.4745223,26.5070064 C23.7700652,25.0662348 23.9732479,23.6439561 24.0840764,22.2401274 C24.194905,20.8362987 24.2503185,19.5617892 24.2503185,18.4165605 L24.1394904,18.3057325 C23.733119,19.3770754 23.2066911,20.3745177 22.5601911,21.2980892 C21.913691,22.2216607 21.128667,23.043627 20.2050955,23.7640127 C19.281524,24.4843985 18.2194328,25.0477687 17.0187898,25.4541401 C15.8181469,25.8605116 14.4789883,26.0636943 13.0012739,26.0636943 C11.0802452,26.0636943 9.32548565,25.7404491 7.73694268,25.093949 C6.1483997,24.447449 4.79076996,23.5423625 3.66401274,22.3786624 C2.53725551,21.2149623 1.65987575,19.8388614 1.03184713,18.2503185 C0.403818516,16.6617755 0.0898089172,14.907016 0.0898089172,12.9859873 C0.0898089172,11.1019014 0.413054092,9.37484861 1.05955414,7.80477707 C1.70605419,6.23470553 2.6019051,4.87707579 3.74713376,3.73184713 C4.89236241,2.58661848 6.24999215,1.70000314 7.82006369,1.07197452 C9.39013524,0.443945904 11.117188,0.129936306 13.0012739,0.129936306 C13.9617882,0.129936306 14.9684661,0.22229207 16.0213376,0.407006369 C17.0742091,0.591720669 18.0901225,0.914965844 19.0691083,1.37675159 C20.0480941,1.83853734 20.9808873,2.49426327 21.8675159,3.34394904 C22.7541446,4.19363482 23.529933,5.27419726 24.1949045,6.58566879 C24.8598759,7.89714032 25.3863038,9.49489504 25.7742038,11.3789809 C26.1621039,13.2630667 26.356051,15.4796051 26.356051,18.0286624 C26.356051,19.5802625 26.2821663,21.1964884 26.1343949,22.8773885 C25.9866235,24.5582887 25.7187917,26.2022213 25.3308917,27.8092357 C24.9429917,29.4162501 24.4165638,30.9401202 23.7515924,32.3808917 C23.0866209,33.8216633 22.2277123,35.0869372 21.1748408,36.1767516 C20.1219693,37.266566 18.8659309,38.1254746 17.4066879,38.7535032 C15.9474449,39.3815318 14.2388633,39.6955414 12.2808917,39.6955414 C9.02992005,39.6955414 6.36083846,38.8273972 4.27356688,37.0910828 C2.1862953,35.3547684 0.957963631,32.8611628 0.588535032,29.6101911 L2.69426752,29.6101911 Z M13.0012739,24.2350318 C14.5898169,24.2350318 16.0398024,23.9394934 17.3512739,23.3484076 C18.6627454,22.7573219 19.7987213,21.9538267 20.7592357,20.9378981 C21.71975,19.9219694 22.4678317,18.7305801 23.0035032,17.3636943 C23.5391747,15.9968085 23.8070064,14.5375874 23.8070064,12.9859873 C23.8070064,11.47133 23.5299391,10.0398157 22.9757962,8.69140127 C22.4216533,7.34298689 21.664336,6.17006868 20.7038217,5.17261146 C19.7433073,4.17515425 18.6073314,3.39013025 17.2958599,2.81751592 C15.9843883,2.2449016 14.552874,1.95859873 13.0012739,1.95859873 C11.4496738,1.95859873 10.0181594,2.25413717 8.7066879,2.84522293 C7.39521637,3.43630869 6.25924047,4.23056826 5.29872611,5.22802548 C4.33821176,6.22548269 3.58089449,7.3984009 3.02675159,8.74681529 C2.47260869,10.0952297 2.1955414,11.5082729 2.1955414,12.9859873 C2.1955414,14.5006445 2.47260869,15.9413944 3.02675159,17.3082803 C3.58089449,18.6751661 4.33821176,19.8665554 5.29872611,20.8824841 C6.25924047,21.8984127 7.39521637,22.7111434 8.7066879,23.3207006 C10.0181594,23.9302578 11.4496738,24.2350318 13.0012739,24.2350318 L13.0012739,24.2350318 Z" id="path-2"></path>
+        <radialGradient cx="20.137535%" cy="18.7046257%" fx="20.137535%" fy="18.7046257%" r="78.8914335%" id="radialGradient-4">
+            <stop stop-color="#FEC73D" offset="0%"></stop>
+            <stop stop-color="#FD341C" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="icons/skills/id-406" sketch:type="MSArtboardGroup">
+            <g id="Rectangle-92-+-9-+-Oval-13-+-Oval-13" sketch:type="MSLayerGroup">
+                <rect id="Rectangle-92" fill="#FFFFFF" sketch:type="MSShapeGroup" x="0.0955414013" y="0.0955414013" width="59.8089172" height="59.8089172" rx="17"></rect>
+                <g id="9-+-Oval-13-+-Oval-13" transform="translate(16.764331, 9.458599)">
+                    <mask id="mask-3" sketch:name="Mask" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <use id="Mask" fill="url(#linearGradient-1)" sketch:type="MSShapeGroup" xlink:href="#path-2"></use>
+                    <circle id="Oval-13" fill="url(#radialGradient-4)" sketch:type="MSShapeGroup" mask="url(#mask-3)" cx="12.5159236" cy="12.3248408" r="16.910828"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
