Skip to content

Commit 083b573

Browse files
taylordolantaylordolan
committed
merge master
2 parents 4f2e3dd + fd522b1 commit 083b573

File tree

15 files changed

+169
-113
lines changed

15 files changed

+169
-113
lines changed

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
//- ************************
2+
//- deprecated file, delete with $root.featureFlags.demoOrgSelectUpdate
3+
4+
.modal-org-select {
5+
6+
.modal-header {
7+
align-self: stretch;
8+
}
9+
10+
.h1 {
11+
font-size: 27px;
12+
}
13+
14+
.p.deprecated {
15+
font-size: 15px;
16+
margin-bottom: $sm;
17+
}
18+
19+
.list + .p {
20+
margin-top: 24px;
21+
}
22+
23+
.list-item {
24+
25+
.icons-github {
26+
height: 30px;
27+
width: 30px;
28+
}
29+
30+
.small {
31+
opacity: .6;
32+
}
33+
}
34+
35+
.green .icons-link-external {
36+
height: 12px;
37+
width: 18px;
38+
}
39+
40+
.well {
41+
background: $gray-lightest;
42+
43+
.icons-github-listening {
44+
color: $gray-light;
45+
display: block;
46+
height: 45px;
47+
margin: 0 auto $xxs;
48+
width: 45px;
49+
}
50+
51+
.icons-github {
52+
height: 12px;
53+
margin-right: 4px;
54+
top: 1px;
55+
width: 12px;
56+
}
57+
58+
.icons-link-external {
59+
height: 9px;
60+
top: 5px;
61+
width: 15px;
62+
}
63+
}
64+
}
65+
66+
//- end deprecated file
67+
//- ************************

‎client/assets/styles/scss/globals/var.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ $purple-lightest: #eee1f7;
3737
$purple-dark: #402754; // darken($purple,10%);
3838
$purple-darker: #261731; // darken($purple,20%);
3939
$purple-darkest: #1b0f24;
40+
$purple-blue: #475496; // blend of purple and blue
4041

4142
// from marketing
4243
$purple-faded: #866f98;

‎client/assets/styles/scss/index.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
@import "deprecated/card-status";
210210
@import "deprecated/connections";
211211
@import "deprecated/deleted-commit";
212+
@import "deprecated/demo-org-select";
212213
@import "deprecated/popover-container-menu";
213214

214215
// shame 🔔🔔

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

Lines changed: 41 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,9 @@
11
.modal-org-select {
22

3-
.h1 {
4-
font-size: 27px;
5-
}
6-
7-
.well {
8-
background: $gray-lightest;
9-
10-
.icons-github-listening {
11-
color: $gray-light;
12-
display: block;
13-
height: 45px;
14-
margin: 0 auto $xxs;
15-
width: 45px;
16-
}
17-
18-
.icons-github {
19-
height: 12px;
20-
margin-right: 4px;
21-
top: 1px;
22-
width: 12px;
23-
}
24-
25-
.icons-link-external {
26-
height: 9px;
27-
top: 5px;
28-
width: 15px;
29-
}
30-
}
31-
32-
.green .icons-link-external {
33-
height: 12px;
34-
width: 18px;
35-
}
36-
37-
.btn-skip {
38-
39-
&:hover .iconnables,
40-
&:active .iconnables {
41-
transform: rotate(-90deg) translate3d(0,2px,0);
42-
}
43-
44-
.iconnables {
45-
height: 15px;
46-
width: 15px;
47-
}
48-
}
49-
50-
.modal-header {
51-
align-self: stretch;
52-
}
53-
54-
.org-select-view {
55-
padding: 24px $sm;
56-
57-
.p,
58-
.list-item {
59-
padding: 0 $sm;
60-
}
61-
62-
.p {
63-
font-size: 15px;
64-
margin-bottom: $sm;
65-
text-align: center;
66-
}
67-
}
68-
69-
.list {
70-
width: 100%;
71-
72-
+ .p {
73-
margin-top: 24px;
74-
}
75-
}
76-
77-
.icons-link-external {
78-
height: 9px;
79-
top: 1px;
80-
width: 18px;
81-
}
82-
833
.list-item {
844
border-radius: 0;
85-
font-size: 18px;
865
font-weight: $weight-normal;
87-
height: 69px;
6+
height: 72px;
887

898
&:hover,
909
&:active {
@@ -108,24 +27,51 @@
10827
+ .list-item {
10928
margin-top: -1px;
11029
}
30+
}
11131

112-
.icons-github {
113-
height: 30px;
114-
width: 30px;
115-
}
32+
.footer {
33+
align-self: stretch;
34+
border-top: 1px solid $gray-lighter;
35+
}
36+
}
11637

117-
.small {
118-
opacity: .6;
119-
}
38+
.org-select-view {
39+
padding: $md $sm $sm;
40+
41+
.p,
42+
.list-item {
43+
font-size: 19px;
44+
padding: 0 $sm;
12045
}
46+
}
12147

122-
.iframe {
123-
border-radius: $input-border-radius-lg;
124-
max-width: 100%;
48+
.teams-bar {
49+
background-color: $white;
50+
border-left: 1px solid $gray-lighter;
51+
border-radius: $input-border-radius-lg $input-border-radius-lg 0 0;
52+
border-right: 1px solid $gray-lighter;
53+
border-top: 1px solid $gray-lighter;
54+
height: 36px + $input-border;
55+
padding: 0 6px 0 18px;
56+
57+
.btn {
58+
margin-left: auto;
12559
}
12660

127-
.footer {
128-
align-self: stretch;
129-
border-top: 1px solid $gray-lighter;
61+
.icons-link-external {
62+
height: 8px;
63+
margin-left: 3px;
64+
width: 8px;
65+
}
66+
67+
.spinner-wrapper {
68+
margin-right: $input-border-radius-lg;
13069
}
13170
}
71+
72+
.teams-empty-state {
73+
background-color: $white;
74+
border: 1px solid $gray-lighter;
75+
border-radius: 0 0 $input-border-radius-lg $input-border-radius-lg;
76+
padding: $lg $sm;
77+
}

‎client/assets/styles/scss/pages/github-auth.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,12 @@
9494
}
9595
}
9696

97+
.btn .iconnables {
98+
height: 100%;
99+
margin-left: 3px;
100+
width: 15px;
101+
}
102+
97103
.footer {
98104
background: $gray-lighterest;
99105
border-top: 1px solid $gray-lighter;

‎client/assets/styles/scss/pages/welcome.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.welcome {
2-
background: linear-gradient(rgba($purple-light,.99), rgba($purple,.99), rgba($purple-dark,.98));
2+
background: linear-gradient(rgba($purple-light,.99), rgba($purple-blue,.98));
33

44
.logo {
55
height: auto;

‎client/directives/githubAuth/githubAuthView.jade‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ main.grid-block.vertical.align-center.layout-github
1414
href = "https://github.com/settings/connections/applications/d42d6634d4070c9d9bf9"
1515
ng-click = "GAC.actions.confirmGitHub()"
1616
) Got it! Take me to GitHub
17-
svg.iconnables.icons-arrow-forward
17+
svg.iconnables
1818
use(
19-
xlink:href = "#icons-arrow-down"
19+
xlink:href = "#icons-arrow-right"
2020
)
2121
p.p.small.strong.text-gray.text-center.margin-top-sm We need access to your code so we can run it. 
2222
br.hidden-xxs

‎client/directives/modals/gracePeriodModal/gracePeriodFooter/gracePeriodFooterView.jade‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
a.grid-content.shrink.link(
2+
ng-if = "$root.featureFlags.demoOrgSelectUpdate"
3+
) Try a Demo
14
a.grid-content.shrink.link(
25
ng-if = "!hideChooseOrg"
36
ng-click = "goToOrgSelect()"

‎client/directives/modals/modalChooseOrganization/chooseOrganizationModalController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function ChooseOrganizationModalController(
6767
}
6868
var customWindow = customWindowService(connectionUrl, {
6969
width: 1020, // match github minimum width
70-
height: 730
70+
height: 660
7171
});
7272
loading.reset(loadingString);
7373
loading(loadingString, true);

‎client/directives/modals/modalChooseOrganization/chooseOrganizationModalView.jade‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
src = "/build/images/runnable-logo.svg"
66
width = "192"
77
)
8-
98
img.grid-block.shrink.img.runnabear(
109
height = "130"
1110
src = "/build/images/runnabear-waving-3.png"
@@ -46,7 +45,6 @@
4645
ng-include = "'authorizeOrganizationView'"
4746
)
4847

49-
5048
//- sign out (always) + change team (during grace period)
5149
.grid-block.shrink.justify-center.margin-top-sm.margin-bottom-xl.welcome-footer.text-white(
5250
grace-period-footer

0 commit comments

Comments
 (0)