Merging changes from remote push

This commit is contained in:
Brian Buller 2015-11-09 17:58:12 -06:00
parent 0b202e63fa
commit 2c05ce154b
3 changed files with 11 additions and 1 deletions

View File

@ -294,6 +294,11 @@ Hides the menu at `48em`, but modify this based on your app's needs.
#layout.active .menu-link { #layout.active .menu-link {
left: 150px; left: 150px;
} }
.levelup-user {
width: 48%;
}
} }
@media (max-width: 48em) { @media (max-width: 48em) {
@ -307,4 +312,8 @@ Hides the menu at `48em`, but modify this based on your app's needs.
position: relative; position: relative;
left: 150px; left: 150px;
} }
.levelup-user {
width: 98%;
}
} }

View File

@ -87,7 +87,7 @@ function buildList() {
userName = levelUpStats.users[i].name, userName = levelUpStats.users[i].name,
idName = userName.replace('.','_'); idName = userName.replace('.','_');
B("#userXpList").append(B('<div>').attr('id',"levelup-user-"+idName).addClass('levelup-user pure-u-1 pure-u-md-1-3').attr('data-username',userName)); B("#userXpList").append(B('<div>').attr('id',"levelup-user-"+idName).addClass('levelup-user pure-u-1 pure-u-md-11-24').attr('data-username',userName));
var userNameSpan = B("<span>").attr('id','levelup-user-'+idName+'-name').addClass('levelup-username'); var userNameSpan = B("<span>").attr('id','levelup-user-'+idName+'-name').addClass('levelup-username');
B("#levelup-user-"+idName).append(B("<div>").attr('id','levelup-user-'+idName+'-level').addClass('levelup-level').html(userLevel)); B("#levelup-user-"+idName).append(B("<div>").attr('id','levelup-user-'+idName+'-level').addClass('levelup-level').html(userLevel));
B("#levelup-user-"+idName).append(userNameSpan.html(userName)); B("#levelup-user-"+idName).append(userNameSpan.html(userName));

View File

@ -92,6 +92,7 @@ func initRequest(w http.ResponseWriter, req *http.Request) {
site.Scripts = make([]string, 0, 0) site.Scripts = make([]string, 0, 0)
site.Scripts = append(site.Scripts, "/assets/js/highcharts.js") site.Scripts = append(site.Scripts, "/assets/js/highcharts.js")
site.Scripts = append(site.Scripts, "/assets/js/B.js") site.Scripts = append(site.Scripts, "/assets/js/B.js")
site.Scripts = append(site.Scripts, "/assets/js/B_purecss.js")
site.InlineScript = "" site.InlineScript = ""