Skip to content

Commit

Permalink
style tweaks for history
Browse files Browse the repository at this point in the history
  • Loading branch information
dshuffma-ibm committed Mar 27, 2017
1 parent 085a814 commit fc378fb
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion busters_css.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"public/css/singlecsshash":"f9673c2940f08fc17758d6f85a7d85d4"}
{"public/css/singlecsshash":"9cbb843ee5b19e655abe03a5498edac4"}
2 changes: 1 addition & 1 deletion busters_js.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"public/js/singlejshash":"dafffbdc7e17c6d8a896b59ac51d25e3"}
{"public/js/singlejshash":"f392bdb8ee6300c53a037b29c0d09f92"}
4 changes: 3 additions & 1 deletion public/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,9 @@ strong {
font-size: 20px;
font-weight: 100;
color: #a1a7ad;
margin-top: 55px; }
margin-top: 55px;
text-align: center;
margin-left: -150px; }

.auditingMarble {
border-color: #2EB9D6; }
Expand Down
2 changes: 1 addition & 1 deletion public/css/main.min.css

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions public/js/ui_events.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,21 @@ $(document).on('ready', function () {
function auditMarble(that, open) {
var marble_id = $(that).attr('id');
$('.auditingMarble').removeClass('auditingMarble');
$(that).addClass('auditingMarble');

if(!auditingMarble || marbles[marble_id].name != auditingMarble.name) {//different marble than before!
$('.txHistoryWrap').html(''); //clear
$('.txHistoryWrap').html('');//clear
fixCss();
}

auditingMarble = marbles[marble_id];
console.log('\nuser clicked on marble', marble_id);

if (open || $('#auditContentWrap').is(':visible')) {
$(that).addClass('auditingMarble');
$('#auditContentWrap').fadeIn();
$('#marbleId').html(marble_id);
var color = marbles[marble_id].color;
for (var i in bgcolors) $('.auditMarble').removeClass(bgcolors[i]); //reset
for (var i in bgcolors) $('.auditMarble').removeClass(bgcolors[i]); //reset
$('.auditMarble').addClass(color.toLowerCase() + 'bg');

var obj2 = {
Expand All @@ -257,8 +258,9 @@ $(document).on('ready', function () {
$('#auditContentWrap').fadeOut(300);
$('#auditHandle').children().removeClass('fa-angle-down').addClass('fa-angle-up');

$('.auditingMarble').removeClass('auditingMarble'); //reset
$('.txHistoryWrap').html(''); //clear
$('.auditingMarble').removeClass('auditingMarble'); //reset
$('.txHistoryWrap').html('<div class="auditHint">Click a Marble to Audit Its Transactions</div>');//clear
$('#marbleId').html('-');
fixCss();
auditingMarble = null;
}
Expand Down
2 changes: 2 additions & 0 deletions scss/audit.scss
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ $left_width: 175px;
font-weight: 100;
color: #a1a7ad;
margin-top: 55px;
text-align: center;
margin-left: -150px;
}

.auditingMarble{
Expand Down

0 comments on commit fc378fb

Please sign in to comment.