Skip to content

Commit 57ad964

Browse files
committed
Merge branch 'aha-guide-milestone2' of https://github.com/CodeNow/runnable-angular into aha-guide-overview
2 parents d520ded + 68985c6 commit 57ad964

17 files changed

Lines changed: 92 additions & 21 deletions

File tree

client/assets/styles/scss/components/aha-guide.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
overflow: hidden;
44
position: relative;
55

6+
&.padding-md {
7+
@include media(xxs) {
8+
padding: 30px 15px;
9+
}
10+
}
11+
612
> .grid-block {
713
overflow: visible;
814
}
@@ -13,6 +19,7 @@
1319
height: $input-md;
1420
left: 15px;
1521
position: absolute;
22+
top: 16px;
1623
transition: opacity .15s ease-in-out, transform .15s ease-in-out;
1724
width: $input-md;
1825

@@ -37,6 +44,10 @@
3744
}
3845
}
3946

47+
.spinner-wrapper {
48+
overflow: hidden;
49+
}
50+
4051
.aha-meter {
4152
background-image: linear-gradient(90deg, $gray-lightest 50%, transparent 50%, transparent), linear-gradient(0deg, $gray-lightest 50%, $gray-lightest 50%, $gray-lightest);
4253
border-radius: 50%;
@@ -154,6 +165,10 @@
154165
margin-left: 30px;
155166
min-width: 30px;
156167

168+
@include media(xxs) {
169+
margin-left: 9px;
170+
}
171+
157172
.iconnables {
158173
height: 100%;
159174
width: 15px;

client/assets/styles/scss/components/aha-modals.scss

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
.modal-backdrop > .aha-guide {
22
animation: fade .15s ease-in-out;
33
height: 105px;
4-
left: auto;
4+
left: 0;
5+
margin: 0 auto;
56
max-width: calc(100vw - 30px);
67
position: absolute;
7-
right: auto;
8+
right: 0;
89
top: 15px;
910
width: 450px;
1011

1112
@include media(lg) {
1213
height: 90px;
1314
}
1415

16+
@include media(xxxs) {
17+
top: 0;
18+
}
19+
1520
&.fixed {
1621
position: fixed;
1722
z-index: $z-modal;
@@ -28,6 +33,11 @@
2833
margin-top: 105px;
2934
}
3035
}
36+
37+
.spinner-wrapper,
38+
.aha-meter {
39+
top: 24px;
40+
}
3141
}
3242

3343
.modal-dialog > .aha-guide {

client/assets/styles/scss/components/aha-popover.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@
44
top: 66px;
55
width: 450px;
66

7+
@include media(xxs) {
8+
left: 15px;
9+
right: 15px;
10+
top: 60px;
11+
width: calc(100vw - 30px);
12+
13+
&.right {
14+
margin-left: 0;
15+
}
16+
}
17+
18+
.arrow {
19+
@include media(xxs) {
20+
display: none;
21+
}
22+
}
23+
724
.popover-content {
825
@extend %padding-sm;
926
}

client/assets/styles/scss/components/aha-sidebar.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
width: 390px;
1313
z-index: $z-popover;
1414

15+
@include media(xxxs) {
16+
left: 12px;
17+
width: auto;
18+
}
19+
1520
&.ng-enter {
1621
transform: translate3d(100%,0,0);
1722
}

client/assets/styles/scss/components/help.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
overflow: visible;
2222
padding: 0 12px;
2323
position: absolute;
24+
top: 0;
2425

2526
&:hover {
2627
color: lighten($blue,10%);

client/assets/styles/scss/layout/environment-body.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
// environment body
22
.environment-body {
33
flex: 1 0 auto;
4+
5+
// aha guide
6+
> .modal-dialog {
7+
min-width: 0;
8+
}
49
}
510

611
// card grid
@@ -51,7 +56,7 @@
5156
}
5257

5358
@include media(lg) {
54-
flex: 0 0 calc(33.333% - 10px);
59+
flex: 0 0 calc(33.333% - 11px);
5560

5661
// on the 6th card + 5 thereafter
5762
&:nth-child(5n+6) {

client/assets/styles/scss/layout/environment-header.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
display: table;
2727
margin: 0 auto;
2828

29+
@include media(xxxs) {
30+
font-size: 16px;
31+
height: $input-sm;
32+
line-height: $input-line-height-sm;
33+
margin-top: 3px;
34+
}
35+
2936
&.scale {
3037
animation: scale .4s ease;
3138
}
@@ -41,6 +48,10 @@
4148
height: 18px;
4249
margin: 10px 9px 0 0;
4350
width: 18px;
51+
52+
@include media(xxxs) {
53+
margin-top: 8px;
54+
}
4455
}
4556
}
4657
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
.modal-servers,
22
.modal-servers .animated-panel {
33
min-width: 100%; // fix animated panel container
4+
5+
@include media(xxxs) {
6+
max-width: 100%;
7+
}
48
}
59

610
.modal-server-select {

client/assets/styles/scss/modals/modals.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,10 @@
472472
&.text-next {
473473
padding-right: 6px;
474474
width: 90px;
475+
476+
@include media(xxxs) {
477+
width: auto;
478+
}
475479
}
476480

477481
&.float-right + .float-right {

client/assets/styles/scss/views/views-toolbar.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
color: rgba($orange,.75);
136136
cursor: default;
137137
font-family: $sans-serif;
138+
padding: 0;
138139

139140
.icons-alert {
140141
height: 12px;

0 commit comments

Comments
 (0)