Commit graph

791 commits

Author SHA1 Message Date
benmanley
c63f4b7c4c Change navbar background-color
Correct navbar background-color and remove some redundant styles
2014-03-15 08:26:25 +00:00
benmanley
0ec5ca48f5 Remove flying pig custom styles
Remove styles that haven’t been pulled into habitrpg
2014-03-14 23:43:18 +00:00
benmanley
eef5e55ad9 Redesign navbar
Restyle navigation and improve mobile layout
2014-03-14 23:32:32 +00:00
benmanley
e4e6100652 Merge branch 'develop' of https://github.com/benmanley/habitrpg into develop
Conflicts:
	public/css/inventory.styl
2014-03-10 20:20:58 +00:00
benmanley
db2ff45551 Add custom css to prevent Flying Pig progress bar being hidden 2014-03-10 19:06:41 +00:00
Matteo Pagliazzi
acb31b99ad fix(stikyHeader): fix #2904 2014-03-06 14:47:35 +01:00
snicker
1968a22c04 fix(chat): autocomplete list aligns properly with the @ symbol again 2014-03-04 18:54:58 -08:00
TheSisb
2c8a43e248 Fixing buttons alignment in panel headings 2014-03-01 10:18:06 -08:00
Tyler Renelle
2209bd5a0c chore(bower): back to angular-ui-router SHA, I'll explain on GH for this commit 2014-02-28 23:48:20 -07:00
Tyler Renelle
01180416ef fix(ui-router): upgraded angular-ui-router, $anchorScroll no
longer supported. See https://github.com/angular-ui/ui-router/pull/715
for autoscroll attribute if we need to enable/disable ui-view
autoscrolling in certain locations (cc @paglias)
2014-02-28 22:42:27 -07:00
Matteo Pagliazzi
c41097b6ec fix(i18n): remove duplicate string 2014-02-24 18:35:48 +01:00
Matteo Pagliazzi
35a997c690 Merge pull request #2917 from benmanley/stable-styles
Move CSS for pets that have been raised into mounts from stable.jade to inventory.styl
2014-02-22 15:25:01 +01:00
Tyler Renelle
a8e890a6df feat(premium): mystery items 2014-02-21 17:37:37 -08:00
benmanley
e050bed42c Remove obsolete comment 2014-02-21 22:25:31 +00:00
benmanley
598088df03 Delete -ms-filter value as it is automatically added when compiled 2014-02-21 21:25:46 +00:00
benmanley
def83b089a Add custom css to prevent Flying Pig progress bar being hidden 2014-02-21 13:28:27 +00:00
benmanley
8c2c940d88 Move styles from stable.jade to inventory.styl file 2014-02-21 12:49:46 +00:00
benmanley
c04caefaac Fix positioning of paw sprites 2014-02-21 12:49:46 +00:00
Tyler Renelle
02c283b628 chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
Conflicts:
	views/options/settings.jade
2014-02-20 16:34:28 -08:00
Tyler Renelle
55782512bf feat(valentine): remove valentine event 2014-02-18 11:22:31 -07:00
benmanley
977aeec27f Merge remote-tracking branch 'upstream/develop' into develop 2014-02-18 15:55:33 +00:00
Matteo Pagliazzi
9ba3362642 fix(css): remove padding for heroboxes in modals, fix #2872 2014-02-17 22:43:09 +01:00
Matteo Pagliazzi
705d8a3b1a fix(css): fix chooseClass modal herobox padding 2014-02-16 19:58:53 +01:00
Marc-André Larivière
dc75834ec4 Changed hints style (and small quick fixes) 2014-02-16 10:13:16 -05:00
Tyler Renelle
191b789d76 fix(bower): updated jquery directory 2014-02-14 20:04:59 -07:00
Matteo Pagliazzi
00bece28d4 chore(dependencies): update jquery path 2014-02-14 18:46:32 +01:00
Matteo Pagliazzi
e0193e36c3 chore(dependencies): update jquery parh 2014-02-14 18:43:18 +01:00
Tyler Renelle
844dc93316 chore(jquery): use updated jquery directory location 2014-02-13 22:04:53 -07:00
Tyler Renelle
fd6eb8724e feat(valentine): valentine event 2014-02-13 18:40:33 -07:00
Tyler Renelle
c8faffcc72 fix(css): temp fix for bailey height 2014-02-12 22:31:32 -07:00
Tyler Renelle
5501d57e10 fix(toolbar): tweaks 2014-02-12 21:51:35 -07:00
Tyler Renelle
c95c6a4c3b chore(modals): remove mathUpdates modal (no longer in use). reference
this commit for any future emergency updates
2014-02-12 21:24:50 -07:00
Tyler Renelle
f72cb21300 feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, &
chat / invite notifications
2014-02-12 21:21:36 -07:00
Tyler Renelle
ce82be637d feat(groups): add group chat notifications 2014-02-12 21:21:30 -07:00
Matteo Pagliazzi
99474729aa fix(typo) 2014-02-12 19:10:45 +01:00
benmanley
783e874690 Fix positioning of paw sprites 2014-02-12 14:40:45 +00:00
Matteo Pagliazzi
8fdc5327e9 refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification 2014-02-12 15:10:22 +01:00
Tyler Renelle
ff9d4b886e fix(event-tracking): typo 2014-02-11 19:02:20 -07:00
Tyler Renelle
b093717b8d feat(event-tracking): better page-view tracking via ui-router 2014-02-11 18:30:43 -07:00
Matteo Pagliazzi
c4244bc3b6 fix(misc) 2014-02-11 21:43:17 +01:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Matteo Pagliazzi
975b516573 fix(css): menu and gems wallet margin 2014-02-11 18:37:20 +01:00
Matteo Pagliazzi
e75a9423d4 Merge pull request #2813 from benmanley/develop
Fix alignment of task meta icons (glyphicons)
2014-02-11 18:10:07 +01:00
Tyler Renelle
cbb448478e feat(marketing): more copy for mobile 2014-02-11 01:34:42 -07:00
Tyler Renelle
cb079977e6 feat(marketing): start fleshing out the about page with images, content,
etc. Create separate videos page
2014-02-11 00:51:29 -07:00
benmanley
39ec102326 Fix alignment of task meta icons (glyphicons) 2014-02-10 22:22:54 +00:00
Tyler Renelle
ebd1df932e fix(bs3): fix to MemberModalCtrl parameter 2014-02-10 13:48:34 -07:00
Tyler Renelle
2480591444 refactor(bs3): put paypal button back in, use javascript API to
construct button on `ng-init` (since you can't nest script tags)
2014-02-10 13:28:16 -07:00
Tyler Renelle
2b9089a204 Merge branch 'event-tracking' into develop 2014-02-10 13:26:55 -07:00
Tyler Renelle
f7b4a04a59 feat(event-tracking): add server-side GA tracking for ecommerce events 2014-02-10 11:35:33 -07:00