Merge pull request #2059 from CodeNow/org-list-semantics

fix html for org list

Author: runnabro

client/assets/styles/scss/deprecated/demo-org-select.scss

@@ -22,6 +22,11 @@
 
   .list-item {
 
+    &.deprecated:first-child {
+      border-top-left-radius: $input-border-radius-lg;
+      border-top-right-radius: $input-border-radius-lg;
+    }
+
     .icons-github {
       height: 30px;
       width: 30px;

client/assets/styles/scss/modals/modals-org-select.scss

@@ -14,11 +14,6 @@
       opacity: .5;
     }
 
-    &:first-child {
-      border-top-left-radius: $input-border-radius-lg;
-      border-top-right-radius: $input-border-radius-lg;
-    }
-
     &:last-child {
       border-bottom-left-radius: $input-border-radius-lg;
       border-bottom-right-radius: $input-border-radius-lg;
@@ -45,7 +40,7 @@
   }
 }
 
-.teams-bar {
+.teams-header {
   background-color: $white;
   border-left: 1px solid $gray-lighter;
   border-radius: $input-border-radius-lg $input-border-radius-lg 0 0;

client/directives/modals/modalChooseOrganization/orgSelectModalView.jade

@@ -1,4 +1,4 @@
-.modal-header(
+header.modal-header(
   ng-if = "!$root.featureFlags.demoOrgSelectUpdate"
 )
   h1.modal-heading Welcome Aboard!
@@ -12,32 +12,33 @@
     ng-class = "{'deprecated': !$root.featureFlags.demoOrgSelectUpdate}"
     ng-if = "!COMC.personalAccountOnly || $root.featureFlags.demoOrgSelectUpdate"
   ) Select a team to start running its code.
+  header.grid-block.align-center.text-gray.small.teams-header(
+    ng-if = "$root.featureFlags.demoOrgSelectUpdate"
+  )
+    .spinner-wrapper.spinner-gray.spinner-sm.hidden-xxxs(
+      ng-if = "$root.isLoading.grantAccess"
+      ng-include = "'spinner'"
+    )
+    | {{ $root.isLoading.grantAccess ? "Listening for teams…" : "Your GitHub Teams" }}
+    button.btn.btn-xs.gray(
+      ng-click = "COMC.grantAccess()"
+    ) Add a Team
+      svg.iconnables.icons-link-external
+        use(
+          xlink:href = "#icons-link-external-alt"
+        )
   ol.grid-block.vertical.list(
     ng-if = "!COMC.personalAccountOnly"
     ng-init = "data.loading = false"
   )
-    .grid-block.align-center.text-gray.small.teams-bar(
-      ng-if = "$root.featureFlags.demoOrgSelectUpdate"
-    )
-      .spinner-wrapper.spinner-gray.spinner-sm.hidden-xxxs(
-        ng-if = "$root.isLoading.grantAccess"
-        ng-include = "'spinner'"
-      )
-      | {{ $root.isLoading.grantAccess ? "Listening for teams…" : "Your GitHub Teams" }}
-      button.btn.btn-xs.gray(
-        ng-click = "COMC.grantAccess()"
-      ) Add a Team
-        svg.iconnables.icons-link-external
-          use(
-            xlink:href = "#icons-link-external-alt"
-          )
-    .grid-block.align-center.justify-center.text-gray.text-center.small.teams-empty-state(
+    li.grid-block.align-center.justify-center.text-gray.text-center.small.teams-empty-state(
       ng-if = "COMC.personalAccountOnly || $root.featureFlags.demoNoOrgs"
     ) Runnable is made for teams, but it looks 
       br.hidden-xxxs
       | like you haven’t added any yet.
     li.grid-block.align-center.list-item.btn.white(
       data-event-name = "Org Selected"
+      ng-class = "{'deprecated': !$root.featureFlags.demoOrgSelectUpdate}"
       ng-click = "COMC.actions.selectAccount(org.oauthName())"
       ng-if = "!$root.featureFlags.demoNoOrgs"
       ng-repeat = "org in COMC.allAccounts.models | orderBy:'attrs.login'"