From 2c05ce154b34a6d4cc4b0498bc69c6e58bc8702f Mon Sep 17 00:00:00 2001 From: Brian Buller Date: Mon, 9 Nov 2015 17:58:12 -0600 Subject: [PATCH] Merging changes from remote push --- assets/css/statbot.css | 9 +++++++++ assets/js/levelup_main.js | 2 +- statbotweb.go | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/assets/css/statbot.css b/assets/css/statbot.css index 621cdd0..8a87fa1 100644 --- a/assets/css/statbot.css +++ b/assets/css/statbot.css @@ -294,6 +294,11 @@ Hides the menu at `48em`, but modify this based on your app's needs. #layout.active .menu-link { left: 150px; } + + + .levelup-user { + width: 48%; + } } @media (max-width: 48em) { @@ -307,4 +312,8 @@ Hides the menu at `48em`, but modify this based on your app's needs. position: relative; left: 150px; } + + .levelup-user { + width: 98%; + } } diff --git a/assets/js/levelup_main.js b/assets/js/levelup_main.js index 99e120d..67ffef5 100644 --- a/assets/js/levelup_main.js +++ b/assets/js/levelup_main.js @@ -87,7 +87,7 @@ function buildList() { userName = levelUpStats.users[i].name, idName = userName.replace('.','_'); - B("#userXpList").append(B('
').attr('id',"levelup-user-"+idName).addClass('levelup-user pure-u-1 pure-u-md-1-3').attr('data-username',userName)); + B("#userXpList").append(B('
').attr('id',"levelup-user-"+idName).addClass('levelup-user pure-u-1 pure-u-md-11-24').attr('data-username',userName)); var userNameSpan = B("").attr('id','levelup-user-'+idName+'-name').addClass('levelup-username'); B("#levelup-user-"+idName).append(B("
").attr('id','levelup-user-'+idName+'-level').addClass('levelup-level').html(userLevel)); B("#levelup-user-"+idName).append(userNameSpan.html(userName)); diff --git a/statbotweb.go b/statbotweb.go index 41a5cdc..560443c 100644 --- a/statbotweb.go +++ b/statbotweb.go @@ -92,6 +92,7 @@ func initRequest(w http.ResponseWriter, req *http.Request) { site.Scripts = make([]string, 0, 0) 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_purecss.js") site.InlineScript = ""