Skip to content

Commit 187baf9

Browse files
authored
Merge pull request ShareDropio#104 from cowbell/update-footer
Update footer
2 parents 25ffa9a + 31572a8 commit 187baf9

File tree

6 files changed

+22
-85
lines changed

6 files changed

+22
-85
lines changed

app/styles/layout/_footer.sass

+13-40
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
position: fixed
33
z-index: 200
44
bottom: 0
5-
width: 100%
6-
height: 54px
5+
left: 0
6+
right: 0
77
background-color: rgba(white,.6)
88
text-align: center
99
color: #b0b0b0
@@ -20,57 +20,30 @@
2020
font-size: 1.1rem
2121
line-height: 1.4
2222
margin-top: .2em
23+
padding: 0 10px
2324

24-
.cowbell-labs
25-
position: absolute
26-
left: 15px
27-
bottom: 15px
28-
font-size: 1rem
29-
> a
30-
display: inline-block
31-
vertical-align: middle
32-
margin: -1px 0 0 2px
33-
width: 102px
34-
height: 16px
35-
background: transparent url("../assets/images/cowbell-labs.svg") no-repeat center
25+
.logos
26+
display: flex
27+
align-items: center
28+
justify-content: space-between
29+
padding: 10px
30+
31+
.left,
32+
.right
33+
display: flex
3634

3735
.github
38-
position: absolute
39-
left: 175px
40-
bottom: 13px
4136
width: 20px
4237
height: 20px
4338
background: transparent url("../assets/images/github.svg") no-repeat center
4439

45-
.facebook
46-
position: absolute
47-
left: 280px
48-
bottom: 11px
49-
height: 21px
50-
border: none
51-
overflow: hidden
52-
5340
.twitter
54-
position: absolute
55-
left: 210px
56-
bottom: 12px
5741
width: 60px
5842
height: 20px
43+
margin-left: 8px
5944

6045
.webrtc
61-
position: absolute
62-
right: 106px
63-
bottom: 17px
6446
width: 72px
6547
height: 12px
6648
background: transparent url("../assets/images/webrtc.png") no-repeat center
6749
background-size: 71px 12px
68-
69-
.firebase
70-
position: absolute
71-
right: 15px
72-
bottom: 15px
73-
width: 76px
74-
height: 20px
75-
background: transparent url("../assets/images/firebase.png") no-repeat center
76-
background-size: 76px 20px

app/styles/layout/_media.sass

+1-10
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,7 @@
7070
margin-left: 10px
7171

7272
.l-footer
73-
height: 100px
74-
padding: 15px
75-
.cowbell-labs
76-
> span
77-
display: none
78-
.github
79-
left: 50%
80-
margin-left: -10px
81-
.webrtc, .facebook, .twitter
82-
display: none
73+
padding-top: 10px
8374

8475
.circles
8576
display: none

app/templates/application.hbs

+8-7
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121

2222
<footer class="l-footer">
2323
<p class="about">{{outlet "about_you"}}</p>
24-
<div class="cowbell-labs">
25-
<span>Made by</span>
26-
<a href="https://cowbell-labs.com/" target="_blank" rel="noopener noreferrer"><span>Cowbell Labs</span></a>
24+
<div class="logos">
25+
<div class="left">
26+
<a href="https://github.com/cowbell/sharedrop" class="github" target="_blank" rel="noopener noreferrer"><span>Cowbell Labs Github</span></a>
27+
<iframe title="twitter" loading="lazy" class="twitter" src="https://platform.twitter.com/widgets/tweet_button.html?url=https%3A%2F%2Fwww.sharedrop.io&text=ShareDrop%20%E2%80%93%20easily%20and%20securely%20share%20files%20of%20any%20size%20directly%20between%20devices%20using%20your%20browser&count=none" scrolling="no" frameborder="0" allowtransparency="true" ></iframe>
28+
</div>
29+
<div class="right">
30+
<a href="http://www.webrtc.org/" class="webrtc" target="_blank" rel="noopener noreferrer"><span>WebRTC</span></a>
31+
</div>
2732
</div>
28-
<a href="https://github.com/cowbell/sharedrop" class="github" target="_blank" rel="noopener noreferrer"><span>Cowbell Labs Github</span></a>
29-
<iframe title="twitter" loading="lazy" class="twitter" src="https://platform.twitter.com/widgets/tweet_button.html?url=https%3A%2F%2Fwww.sharedrop.io&text=ShareDrop%20%E2%80%93%20easily%20and%20securely%20share%20files%20of%20any%20size%20directly%20between%20devices%20using%20your%20browser&count=none" scrolling="no" frameborder="0" allowtransparency="true" ></iframe>
30-
<a href="http://www.webrtc.org/" class="webrtc" target="_blank" rel="noopener noreferrer"><span>WebRTC</span></a>
31-
<a href="https://www.firebase.com/" class="firebase" target="_blank" rel="noopener noreferrer"><span>Powered by Firebase</span></a>
3233
</footer>

public/assets/images/cowbell-labs.svg

-25
This file was deleted.

public/assets/images/firebase.png

-4.25 KB
Binary file not shown.

public/assets/images/persona.svg

-3
This file was deleted.

0 commit comments

Comments
 (0)