sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 00:09:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated tab indent

Browse source 
added link in footer
renamed Merchandise to Merch (looks better in the footer)
moved css to static.styl
This commit is contained in:
Daniel Van Camp 2015-11-27 23:25:56 +01:00
parent 37378e8497
commit 6a535277a7
5 changed files with 66 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/dist/sprites/habitrpg-shared.css vendored Normal file
View file

File diff suppressed because one or more lines are too long

2
common/locales/en/merch.json
View file

@ -1,5 +1,5 @@
{
"merch" : "Merchandise",
"merch" : "Merch",
"merch-1-name" : "Teespring",
"merch-1-summary" : "Teespring is a platform that makes it easy for anyone to create and sell high-quality products people love, with no cost or risk.",

36
website/public/css/static.styl
View file

@ -69,3 +69,39 @@ a.h2.accordion.collapsed:before
color: grey
content: "\e080"
margin-right: 0.5em
// Merch Page
.merch-block
border: 1px dotted #553889
border-radius: 6px
padding: 15px
margin-bottom: 20px
.merch-block:hover
background: #ececec
.merch-header
font-size: 24px
img
display: block
max-width: 200px
.merch-img-con
text-align: center
.merch-img
max-width: 350px
padding: 30px 0
.merch-link
margin-top: 20px
.btn-habitica
background-color: #553889
color: #ffffff
.btn.btn-habitica:hover
color: #ffffff
background-color: #452d6e
border-color: #342253

2
website/views/shared/footer.jade
View file

@ -36,6 +36,8 @@ footer.footer(ng-controller='FooterCtrl')
a(href='/static/terms')=env.t('companyTerms')
li
a(href='/static/contact')=env.t('contactUs')
li
a(href='/static/merch')=env.t('merch')
.col-sm-3
h4=env.t('footerCommunity')
ul.list-unstyled

94
website/views/static/merch.jade
View file

@ -1,79 +1,37 @@
extends ./layout
// Merchandise page : when adding a merch make sure to add following resources
+ image of merchandise -- env.t("merch-*-name").png -- eg. teespring.png
+ logo of seller -- env.t("merch-*-name")-logo.png -- eg. teespring-logo.png
+ update merch.json with extra info about merchandise
- merch-*-name -> Teespring
- merch-*-summary -> Teespring is and will always be...
- merch-*-link -> https://teespring.com/habitica-gryphon-t-shirt | link to the merchandise not the seller
- merch-*-goto -> Get myself a Habitica T-Shirts
+ image of merchandise -- env.t("merch-*-name").png -- eg. teespring.png
+ logo of seller -- env.t("merch-*-name")-logo.png -- eg. teespring-logo.png
+ update merch.json with extra info about merchandise
- merch-*-name -> Teespring
- merch-*-summary -> Teespring is and will always be...
- merch-*-link -> https://teespring.com/habitica-gryphon-t-shirt | link to the merchandise not the seller
- merch-*-goto -> Get myself a Habitica T-Shirts
block vars
- var layoutEnv = env
- var merchNumbers = 2 // update the amount of merchandise attributes that are available
- var layoutEnv = env
- var merchNumbers = 2 // update the amount of merchandise attributes that are available
block title
title=env.t('merch')
block extraHead
style.
.merch-block {
border: 1px dotted #553889;
border-radius: 6px;
padding: 15px;
margin-bottom: 20px;
}
.merch-block:hover {
background: #ececec;
}
.merch-header {
font-size: 24px;
}
.merch-header img {
display: block;
max-width: 200px;
}
.img-con {
text-align: center;
}
.img-con .merch-img {
max-width: 350px;
padding: 30px 0;
}
.merch-link {
margin-top: 20px;
}
.btn-habitica {
background-color: #553889;
color: #ffffff;
}
.btn.btn-habitica:hover {
color: #ffffff;
background-color: #452d6e;
border-color: #342253;
}
title=env.t('merch')
block content
.row
.col-md-12
.page-header
h3=env.t('merch')
.row
.col-md-12
.page-header
h3=env.t('merch')
// Merchandise block - START
- for (var i = 1; i <= merchNumbers; ++i) {
if i%2!==0
.row=test
.col-lg-6.col-md-6.col-sm-12
.merch-block
div.merch-header: img(src="/merch/"+env.t('merch-' + i + '-name')+"-logo.png")
div.img-con: a(href=env.t('merch-' + i + '-link') target='_blank'): img.img-rendering-auto.merch-img(src="/merch/" + env.t('merch-' + i + '-name') + ".png")
p=env.t('merch-' + i + '-summary')
a.btn.btn-habitica.merch-link(href=env.t('merch-' + i + '-link') target='_blank')=env.t('merch-' + i + '-goto')
-}
// Merchandise block - END
// Merchandise block - START
- for (var i = 1; i <= merchNumbers; ++i) {
if i % 2 !== 0
.row=test
.col-lg-6.col-md-6.col-sm-12
.merch-block
div.merch-header: img(src="/merch/" + env.t('merch-' + i + '-name') + "-logo.png")
div.merch-img-con: a(href=env.t('merch-' + i + '-link') target='_blank'): img.img-rendering-auto.merch-img(src="/merch/" + env.t('merch-' + i + '-name') + ".png")
p=env.t('merch-' + i + '-summary')
a.btn.btn-habitica.merch-link(href=env.t('merch-' + i + '-link') target='_blank')=env.t('merch-' + i + '-goto')
-}
// Merchandise block - END