Skip to content

Commit

Permalink
Add Instagram links
Browse files Browse the repository at this point in the history
  • Loading branch information
simison committed Aug 25, 2017
1 parent b842ea2 commit 83ff29d
Show file tree
Hide file tree
Showing 16 changed files with 79 additions and 18 deletions.
6 changes: 6 additions & 0 deletions modules/core/client/fonts/fontello/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,12 @@
"css": "edit",
"code": 59404,
"src": "modernpics"
},
{
"uid": "4c1ef492f1d2c39a2250ae457cee2a6e",
"css": "instagram",
"code": 61805,
"src": "fontawesome"
}
]
}
1 change: 1 addition & 0 deletions modules/core/client/fonts/fontello/css/tricons-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@
.icon-share:before { content: '\e833'; } /* '' */
.icon-minus:before { content: '\e834'; } /* '' */
.icon-sofa:before { content: '\e835'; } /* '' */
.icon-instagram:before { content: '\f16d'; } /* '' */
.icon-sliders:before { content: '\f1de'; } /* '' */
13 changes: 7 additions & 6 deletions modules/core/client/fonts/fontello/css/tricons-embedded.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@
.icon-share { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-minus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sofa { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
1 change: 1 addition & 0 deletions modules/core/client/fonts/fontello/css/tricons-ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@
.icon-share { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-minus { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sofa { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-instagram { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sliders { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
15 changes: 8 additions & 7 deletions modules/core/client/fonts/fontello/css/tricons.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'tricons';
src: url('../font/tricons.eot?83122918');
src: url('../font/tricons.eot?83122918#iefix') format('embedded-opentype'),
url('../font/tricons.woff2?83122918') format('woff2'),
url('../font/tricons.woff?83122918') format('woff'),
url('../font/tricons.ttf?83122918') format('truetype'),
url('../font/tricons.svg?83122918#tricons') format('svg');
src: url('../font/tricons.eot?58477635');
src: url('../font/tricons.eot?58477635#iefix') format('embedded-opentype'),
url('../font/tricons.woff2?58477635') format('woff2'),
url('../font/tricons.woff?58477635') format('woff'),
url('../font/tricons.ttf?58477635') format('truetype'),
url('../font/tricons.svg?58477635#tricons') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'tricons';
src: url('../font/tricons.svg?83122918#tricons') format('svg');
src: url('../font/tricons.svg?58477635#tricons') format('svg');
}
}
*/
Expand Down Expand Up @@ -109,4 +109,5 @@
.icon-share:before { content: '\e833'; } /* '' */
.icon-minus:before { content: '\e834'; } /* '' */
.icon-sofa:before { content: '\e835'; } /* '' */
.icon-instagram:before { content: '\f16d'; } /* '' */
.icon-sliders:before { content: '\f1de'; } /* '' */
11 changes: 6 additions & 5 deletions modules/core/client/fonts/fontello/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,11 @@
}
@font-face {
font-family: 'tricons';
src: url('./font/tricons.eot?98469132');
src: url('./font/tricons.eot?98469132#iefix') format('embedded-opentype'),
url('./font/tricons.woff?98469132') format('woff'),
url('./font/tricons.ttf?98469132') format('truetype'),
url('./font/tricons.svg?98469132#tricons') format('svg');
src: url('./font/tricons.eot?15025384');
src: url('./font/tricons.eot?15025384#iefix') format('embedded-opentype'),
url('./font/tricons.woff?15025384') format('woff'),
url('./font/tricons.ttf?15025384') format('truetype'),
url('./font/tricons.svg?15025384#tricons') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -381,6 +381,7 @@ <h1>
<div class="row">
<div title="Code: 0xe834" class="the-icons span3"><i class="demo-icon icon-minus">&#xe834;</i> <span class="i-name">icon-minus</span><span class="i-code">0xe834</span></div>
<div title="Code: 0xe835" class="the-icons span3"><i class="demo-icon icon-sofa">&#xe835;</i> <span class="i-name">icon-sofa</span><span class="i-code">0xe835</span></div>
<div title="Code: 0xf16d" class="the-icons span3"><i class="demo-icon icon-instagram">&#xf16d;</i> <span class="i-name">icon-instagram</span><span class="i-code">0xf16d</span></div>
<div title="Code: 0xf1de" class="the-icons span3"><i class="demo-icon icon-sliders">&#xf1de;</i> <span class="i-name">icon-sliders</span><span class="i-code">0xf1de</span></div>
</div>
</div>
Expand Down
Binary file modified modules/core/client/fonts/fontello/font/tricons.eot
Binary file not shown.
2 changes: 2 additions & 0 deletions modules/core/client/fonts/fontello/font/tricons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified modules/core/client/fonts/fontello/font/tricons.ttf
Binary file not shown.
Binary file modified modules/core/client/fonts/fontello/font/tricons.woff
Binary file not shown.
Binary file modified modules/core/client/fonts/fontello/font/tricons.woff2
Binary file not shown.
6 changes: 6 additions & 0 deletions modules/core/server/views/partials/footer.server.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
Twitter
</a>
</li>
<li>
<a href="https://www.instagram.com/trustroots_org/"
aria-label="Trustroots at Instagram">
Instagram
</a>
</li>
<li>
{% if appSettings.commit %}
<a href="https://github.com/Trustroots/trustroots/tree/{{ appSettings.commit }}"
Expand Down
27 changes: 27 additions & 0 deletions modules/core/server/views/partials/header.server.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,33 @@
<li><a class="text-muted" ui-sref="rules">Rules</a></li>
</ul>
</li>
<li role="presentation" class="divider"></li>
<li class="small text-muted dropdown-meta text-center font-brand-regular">
<ul class="list-inline">
<!-- Social media links -->
<li>
<a href="https://www.facebook.com/trustroots.org"
class="text-muted"
aria-label="Trustroots at Facebook">
Facebook
</a>
</li>
<li>
<a href="https://twitter.com/trustroots"
class="text-muted"
aria-label="Trustroots at Twitter">
Twitter
</a>
</li>
<li>
<a href="https://www.instagram.com/trustroots_org/"
class="text-muted"
aria-label="Trustroots at Instagram">
Instagram
</a>
</li>
</ul>
</li>
</ul>
</li>
<li ui-sref-active="active" class="visible-xs-block">
Expand Down
7 changes: 7 additions & 0 deletions modules/pages/client/views/home.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ <h3 class="font-brand-light">Free and open source</h3>
<i class="icon-twitter icon-lg"></i>
</a>
</li>
<li>
<a href="https://www.instagram.com/trustroots_org/"
uib-tooltip="Instagram"
aria-label="Trustroots at Instagram">
<i class="icon-instagram icon-lg"></i>
</a>
</li>
<li>
<a href="https://github.com/Trustroots/trustroots"
uib-tooltip="GitHub"
Expand Down
7 changes: 7 additions & 0 deletions modules/pages/client/views/navigation.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ <h5 class="text-uppercase text-muted">Info &amp; support</h5>
Twitter
</a>
</li>
<li>
<a href="https://www.instagram.com/trustroots_org/"
class="btn btn-link"
aria-label="Trustroots at Instagram">
Instagram
</a>
</li>
<li>
<a href="https://github.com/Trustroots/trustroots"
class="btn btn-link"
Expand Down

0 comments on commit 83ff29d

Please sign in to comment.