| ... | ... |
@@ -2722,4 +2722,70 @@ button.close {
|
| 2722 | 2722 |
} |
| 2723 | 2723 |
.compare-commits-commit-id a {
|
| 2724 | 2724 |
color:#767676; |
| 2725 |
-} |
|
| 2725 |
+} |
|
| 2726 |
+ |
|
| 2727 |
+.network-mybranch {
|
|
| 2728 |
+ background-color: #f5f5f5; |
|
| 2729 |
+ border: 1px solid #e3e3e3; |
|
| 2730 |
+ padding:10px 10px 14px 10px; |
|
| 2731 |
+ margin-bottom:20px; |
|
| 2732 |
+ border-radius:3px; |
|
| 2733 |
+} |
|
| 2734 |
+.network-mybranch-label {
|
|
| 2735 |
+ border-radius: 3px; |
|
| 2736 |
+ display: inline-block; |
|
| 2737 |
+ padding: 2px 4px; |
|
| 2738 |
+ font-size: 11.844px; |
|
| 2739 |
+ font-weight: bold; |
|
| 2740 |
+ line-height: 14px; |
|
| 2741 |
+ color: #fff; |
|
| 2742 |
+ text-shadow: 0 -1px 0 rgba(0,0,0,0.25); |
|
| 2743 |
+ white-space: nowrap; |
|
| 2744 |
+ vertical-align: baseline; |
|
| 2745 |
+ background-color: #3a87ad; |
|
| 2746 |
+ width:100px; |
|
| 2747 |
+ text-align:center; |
|
| 2748 |
+ margin-right:10px; |
|
| 2749 |
+} |
|
| 2750 |
+ |
|
| 2751 |
+.network-mybranch select, .network-member-branch select {
|
|
| 2752 |
+ border:1px solid #d8d8d8; |
|
| 2753 |
+ border-radius: 3px; |
|
| 2754 |
+ padding:6px 5px; |
|
| 2755 |
+ width:30%; |
|
| 2756 |
+} |
|
| 2757 |
+ |
|
| 2758 |
+.network-member-branch {
|
|
| 2759 |
+ |
|
| 2760 |
+} |
|
| 2761 |
+ |
|
| 2762 |
+.network-member-branch li {
|
|
| 2763 |
+ border-bottom:1px solid #d8d8d8; |
|
| 2764 |
+ padding:10px 10px 14px 10px; |
|
| 2765 |
+ overflow:hidden; |
|
| 2766 |
+} |
|
| 2767 |
+.network-member-branch-label {
|
|
| 2768 |
+ border-radius: 3px; |
|
| 2769 |
+ display: inline-block; |
|
| 2770 |
+ padding: 3px 4px; |
|
| 2771 |
+ font-size: 11.844px; |
|
| 2772 |
+ font-weight: bold; |
|
| 2773 |
+ line-height: 14px; |
|
| 2774 |
+ color: #fff; |
|
| 2775 |
+ text-shadow: 0 -1px 0 rgba(0,0,0,0.25); |
|
| 2776 |
+ white-space: nowrap; |
|
| 2777 |
+ vertical-align: baseline; |
|
| 2778 |
+ background-color: #468847; |
|
| 2779 |
+ width:100px; |
|
| 2780 |
+ text-align:center; |
|
| 2781 |
+ margin-right:10px; |
|
| 2782 |
+} |
|
| 2783 |
+.network-member-branch li > :first-child {
|
|
| 2784 |
+ float:left; |
|
| 2785 |
+ width:80%; |
|
| 2786 |
+} |
|
| 2787 |
+.network-member-branch li > .last-child {
|
|
| 2788 |
+ float:left; |
|
| 2789 |
+ width:20%; |
|
| 2790 |
+ text-align:right; |
|
| 2791 |
+} |
| ... | ... |
@@ -52,10 +52,10 @@ |
| 52 | 52 |
|
| 53 | 53 |
%= include '/include/header'; |
| 54 | 54 |
|
| 55 |
- <div class="container" style="min-heigth:500px"> |
|
| 56 |
- <h3>Members of the <%= $project %> Network</h3> |
|
| 57 |
- <div class="well" style="padding:5px 10px 0 10px;margin-bottom:20px"> |
|
| 58 |
- <span class="label label-info">My branch</span> |
|
| 55 |
+ <div class="container"> |
|
| 56 |
+ <div class="topic1">Members of the <%= $project %> Network</div> |
|
| 57 |
+ <div class="network-mybranch"> |
|
| 58 |
+ <span class="network-mybranch-label">My branch</span> |
|
| 59 | 59 |
<a href="<%= url_for("/$user") %>"><%= $user %></a>
|
| 60 | 60 |
<span>/</span> |
| 61 | 61 |
<a href="<%= url_for("/$user/$project") %>"><%= $project %></a>
|
| ... | ... |
@@ -63,35 +63,34 @@ |
| 63 | 63 |
% param('branch', $default_branch);
|
| 64 | 64 |
%= select_field 'branch' => $branches, style => 'margin-top:5px;width:150px'; |
| 65 | 65 |
</div> |
| 66 |
- <div style="margin-bottom:30px"> |
|
| 66 |
+ <ul class="network-member-branch"> |
|
| 67 | 67 |
% if (@$members) {
|
| 68 | 68 |
% for my $member (@$members) {
|
| 69 |
- <div class="row" name="remote" style="font-size:18px;"> |
|
| 69 |
+ <li name="remote"> |
|
| 70 | 70 |
% my $mid = $member->{id};
|
| 71 | 71 |
% my $mproject = $member->{project};
|
| 72 | 72 |
% my $mbranches = $member->{branches};
|
| 73 |
- <div class="span8" style="padding-left:5px"> |
|
| 74 |
- <span class="label label-success">Member branch</span> |
|
| 73 |
+ <div> |
|
| 74 |
+ <span class="network-member-branch-label">Member branch</span> |
|
| 75 | 75 |
<a name="remote-member" href="<%= url_for("/$mid") %>"><%= $mid %></a>
|
| 76 | 76 |
<span>/</span> |
| 77 | 77 |
<a name="remote-project" href="<%= url_for("/$mid/$mproject") %>"><%= $mproject %></a>
|
| 78 | 78 |
<span>/</span> |
| 79 | 79 |
%= select_field 'remote-branch' => $mbranches, style => 'margin-top:5px;margin-bottom:7px;width:150px'; |
| 80 | 80 |
</div> |
| 81 |
- <div class="text-right"> |
|
| 81 |
+ <div class="last-child"> |
|
| 82 | 82 |
<button name="compare-btn" class="btn" style="margin-top:5px">Compare</button> |
| 83 |
- % if ($api->logined($user)) {
|
|
| 83 |
+ % if ($api->logined($user)) {
|
|
| 84 | 84 |
<button name="import-btn" class="btn" style="margin-top:5px">Import</button> |
| 85 |
- % } |
|
| 85 |
+ % } |
|
| 86 | 86 |
</div> |
| 87 |
- </div> |
|
| 88 |
- <hr style="margin:0"> |
|
| 87 |
+ </li> |
|
| 89 | 88 |
% } |
| 90 | 89 |
% } else {
|
| 91 |
- <div class="well"> |
|
| 90 |
+ <li> |
|
| 92 | 91 |
No Members. |
| 93 |
- </div> |
|
| 92 |
+ </li> |
|
| 94 | 93 |
% } |
| 95 |
- </div> |
|
| 94 |
+ </ul> |
|
| 96 | 95 |
</div> |
| 97 | 96 |
%= include '/include/footer'; |