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

refactor(bs3): misc

Browse source
This commit is contained in:
Matteo Pagliazzi 2014-02-04 22:21:12 +01:00
parent d711d61a1f
commit ccc1230828
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/css/tasks.styl
View file

@ -61,8 +61,8 @@ for $stage in $stages
margin: 0 0 0.5em
padding: 0
// 50% width columns with scrollbars
@media (max-width: 960px)
// 50% width columns with scrollbars for tablets
@media (min-width: 768px) and (max-width: 970px)
.task-column
max-height: 18.6em
overflow-y: scroll

10
public/js/controllers/authCtrl.js
View file

@ -5,8 +5,8 @@
*/
angular.module('authCtrl', [])
.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','API_URL',
function($scope, $rootScope, User, $http, $location, $window, API_URL) {
.controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','API_URL', '$modal',
function($scope, $rootScope, User, $http, $location, $window, API_URL, $modal) {
var runAuth;
var showedFacebookMessage;
@ -71,8 +71,10 @@ angular.module('authCtrl', [])
if (User.authenticated()) {
window.location.href = '/#/tasks';
} else {
// Using controller: 'AuthCtrl' it causes problems
$rootScope.openModal('login');
$modal.open({
templateUrl: 'modals/login.html'
// Using controller: 'AuthCtrl' it causes problems
});
}
}

10
views/shared/footer.jade
View file

@ -1,14 +1,14 @@
footer.footer(ng-controller='FooterCtrl')
.container
.row
.col-md-3
.col-sm-3
h4=env.t('footerMobile')
ul.list-unstyled
li
a(href='https://itunes.apple.com/us/app/habitrpg/id689569235?mt=8', target='_blank')=env.t('mobileIOS')
li
a(href='https://play.google.com/store/apps/details?id=com.ocdevel.habitrpg', target='_blank')=env.t('mobileAndroid')
.col-md-3
.col-sm-3
h4=env.t('footerCompany')
ul.list-unstyled.list-unstyled
if (!env.isFrontPage)
@ -28,7 +28,7 @@ footer.footer(ng-controller='FooterCtrl')
a(href='/static/privacy')=env.t('companyPrivacy')
li
a(href='/static/terms')=env.t('companyTerms')
.col-md-3
.col-sm-3
h4=env.t('footerCommunity')
ul.list-unstyled
li
@ -47,7 +47,7 @@ footer.footer(ng-controller='FooterCtrl')
a(target='_blank', href='https://www.facebook.com/Habitrpg')=env.t('communityFacebook')
li
a(target='_blank', href='http://www.reddit.com/r/habitrpg/')=env.t('communityReddit')
.col-md-3
.col-sm-3
if (env.NODE_ENV=='production')
h4=env.t('footerSocial')
.addthis_toolbox.addthis_default_style(addthis:url='https://habitrpg.com', addthis:title=env.t('socialTitle'))
@ -64,7 +64,7 @@ footer.footer(ng-controller='FooterCtrl')
tr
td
a.addthis_button_google_plusone(g:plusone:size='medium')
else
else if(!env.isFrontPage)
h4 Debug
ul.list-unstyled
li