Skip to content

Commit 22845b5

Browse files
authored
Merge pull request #1939 from habitat-sh/bad_footer
fix footer styling
2 parents 85bb0c3 + 17cdd1d commit 22845b5

3 files changed

Lines changed: 20 additions & 31 deletions

File tree

components/builder-web/app/app.component.html

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@ <h5>
3333
</div>
3434
</ng-container>
3535
<router-outlet *ngIf="!isSigningIn"></router-outlet>
36+
<footer>
37+
<div class="pull-left">
38+
<p>
39+
Copyright © 2012-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
40+
</p>
41+
<p>
42+
Progress and certain product names used herein are trademarks or registered trademarks of Progress Software Corporation and/or one of its subsidiaries or affiliates in the U.S. and/or other countries. See <a href="https://www.progress.com/legal/trademarks" target="_blank">Trademarks</a> for appropriate markings. All rights in any other trademarks contained herein are reserved by their respective owners and their inclusion does not imply an endorsement, affiliation, or sponsorship as between Progress and the respective owners.
43+
</p>
44+
</div>
45+
<span>
46+
Need help? If you have questions or you're stuck,
47+
<a href="https://www.chef.io/support" target="_blank">we're here to help</a>.
48+
</span>
49+
<div class="pull-right">
50+
<a href="https://www.chef.io/end-user-license-agreement" target="_blank">End User License Agreement</a>
51+
<a href="https://www.progress.com/legal/privacy-policy" target="_blank">Privacy Policy</a>
52+
<a href="https://www.progress.com/legal/cookie-policy" target="_blank">Cookie Policy </a>
53+
</div>
54+
</footer>
3655
</main>
37-
<footer>
38-
<div class="pull-left">
39-
<p>
40-
Copyright © 2012-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
41-
</p>
42-
<p>
43-
Progress and certain product names used herein are trademarks or registered trademarks of Progress Software Corporation and/or one of its subsidiaries or affiliates in the U.S. and/or other countries. See <a href="https://www.progress.com/legal/trademarks" target="_blank">Trademarks</a> for appropriate markings. All rights in any other trademarks contained herein are reserved by their respective owners and their inclusion does not imply an endorsement, affiliation, or sponsorship as between Progress and the respective owners.
44-
</p>
45-
</div>
46-
<span>
47-
Need help? If you have questions or you're stuck,
48-
<a href="https://www.chef.io/support" target="_blank">we're here to help</a>.
49-
</span>
50-
<div class="pull-right">
51-
<a href="https://www.chef.io/end-user-license-agreement" target="_blank">End User License Agreement</a>
52-
<a href="https://www.progress.com/legal/privacy-policy" target="_blank">Privacy Policy</a>
53-
<a href="https://www.progress.com/legal/cookie-policy" target="_blank">Cookie Policy </a>
54-
</div>
55-
</footer>
5656
</div>
5757
</div>

components/builder-web/app/app.scss

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,10 @@ main {
134134
left: 0;
135135
background-color: $white;
136136
overflow-y: auto;
137-
margin-bottom: 30px;
138137

139138
.full &, .sign-in & {
140139
background: transparent;
141-
}
142-
143-
@include tablet-up {
144-
.sign-in & {
145-
margin-top: 192px;
146-
}
140+
overflow-y: unset;
147141
}
148142

149143
.menu-toggle {
@@ -221,11 +215,7 @@ main {
221215
}
222216

223217
footer {
224-
$menu-width: 224px;
225-
position: fixed;
226-
left: $menu-width;
227218
z-index: 100;
228-
right: 0;
229219
bottom: 0;
230220
color: currentcolor;
231221
text-align: left;

components/builder-web/stylesheets/base/_grid.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
main {
3636
max-width: 420px;
3737
margin: 0 auto;
38-
margin-top: $default-margin * 4;
3938
}
4039
footer {
4140
left: 0px;

0 commit comments

Comments
 (0)