Skip to content
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.

Sign up for GitHub

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

show success state after inviting runnabot #1872

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

show success state after inviting runnabot #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
443ae94
show success state after inviting runnabot
taylordolan Nov 2, 2016
9e6f7f3
fix centering GitHub icon
runnabro Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/assets/styles/scss/modals/modals-empty.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@

// submit buttons (like for api token)
.green {
display: table;
margin-left: auto;
margin-right: auto;
}
Expand Down
8 changes: 4 additions & 4 deletions client/directives/modals/ahaModal/ahaModal.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
.modal-body
//- if demo feature is off
.grid-block.shrink.vertical.align-center.aha-overview.padding-md.padding-bottom-sm(
ng-if = "!$root.featureFlags.demoProject"
ng-if = "!$root.featureFlags.demoProject && !AMC.isSettingUpRunnabot() && !AMC.hasRunnabot()"
)
p.grid-content.shrink.text-center.p.weight-light It takes just 3 steps to get everything set up. 
br
Expand All @@ -51,7 +51,7 @@

//- if demo feature is on
.grid-block.shrink.vertical.align-center.noscroll.aha-overview(
ng-if = "!AMC.isSettingUpRunnabot() && $root.featureFlags.demoProject"
ng-if = "$root.featureFlags.demoProject && !AMC.isSettingUpRunnabot() && !AMC.hasRunnabot()"
)
//- step 1
.grid-block.vertical.shrink.align-center.padding-sm.aha-guide.disabled
Expand Down Expand Up @@ -135,9 +135,9 @@
target = "_blank"
) Learn how to add branches.

.grid-block.vertical.align-center.form-github(
.grid-block.vertical.align-center.form-github.padding-md(
github-integration
ng-if = "AMC.isSettingUpRunnabot()"
ng-if = "AMC.isSettingUpRunnabot() || AMC.hasRunnabot()"
)

.grid-block.shrink.justify-center.margin-bottom-xl.welcome-footer(
Expand Down
2 changes: 2 additions & 0 deletions client/directives/modals/ahaModal/ahaModalController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ function AhaModalController(
AMC.isAddingFirstBranch = ahaGuide.isAddingFirstBranch;
AMC.getFurthestSubstep = ahaGuide.furthestSubstep;
AMC.getClassForSubstep = ahaGuide.getClassForSubstep;
AMC.isInGuide = ahaGuide.isInGuide;
AMC.hasRunnabot = ahaGuide.hasRunnabot;
AMC.hasInstances = false;
AMC.accountHasRepos = false;
AMC.currentOrg = currentOrg;
Expand Down