Skip to content

fixed button layout #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TrystanLea merged 1 commit into from
Feb 6, 2019
Merged

fixed button layout #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions graph.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,10 @@
}
.feed-options-show-options,
.feed-options-show-stats{
cursor: pointer;
}

.feed-options-show-options {
float:right;
padding:10px;
width:150px;
text-align:center;
border-left: 1px solid #eee;
}

.feed-options-show-stats {
float: right;
margin: 5px;
position: absolute;
right: 0;
z-index: 2;
}

#vis-mode-toggle, #vis-mode-user, #vis-mode-groups{
Expand Down
8 changes: 4 additions & 4 deletions graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,17 +515,17 @@ function graph_init_editor()
$(".feed-options-show-stats").click(function(event){
$("#feed-options-table").hide();
$("#feed-stats-table").show();
$(".feed-options-show-options").show();
$(".feed-options-show-stats").hide();
$(".feed-options-show-options").removeClass('hide');
$(".feed-options-show-stats").addClass('hide');
event.preventDefault();
});


$(".feed-options-show-options").click(function(event){
$("#feed-options-table").show();
$("#feed-stats-table").hide();
$(".feed-options-show-options").hide();
$(".feed-options-show-stats").show();
$(".feed-options-show-options").addClass('hide');
$(".feed-options-show-stats").removeClass('hide');
event.preventDefault();
});
}
Expand Down
4 changes: 2 additions & 2 deletions view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@

<div class="feed-options hide">
<div class="feed-options-header">
<div class="feed-options-show-options hide"><?php echo _('Show options') ?></div>
<div class="feed-options-show-stats"><?php echo _('Show statistics') ?></div>
<div class="feed-options-show-options btn btn-default hide"><?php echo _('Show options') ?></div>
<div class="feed-options-show-stats btn btn-default"><?php echo _('Show statistics') ?></div>
<a href="#tables" class="feed-options-title">
<span class="caret pull-left"></span>
<?php echo _('Feeds in view') ?>
Expand Down