Showing 1 changed files with 17 additions and 17 deletions
+17 -17
templates/branches.html.ep
... ...
@@ -5,7 +5,7 @@
5 5
   # Parameters
6 6
   my $user = param('user');
7 7
   my $project = param('project');
8
-  my $op = param('op');
8
+  my $op = param('op') || '';
9 9
   
10 10
   # Git
11 11
   my $git = $self->app->git;
... ...
@@ -100,13 +100,13 @@
100 100
           $('#no-merged-branch-message').hide();
101 101
           $('#merged-branch-message').show();
102 102
           $('.no-merged-branch').css('display', 'none');
103
-          $('.merged-branch').css('display', 'inline');
103
+          $('.merged-branch').css('display', 'block');
104 104
         }
105 105
         else {
106 106
           $(this).text('View merged branches');
107 107
           $('#no-merged-branch-message').show();
108 108
           $('#merged-branch-message').hide();
109
-          $('.no-merged-branch').css('display', 'inline');
109
+          $('.no-merged-branch').css('display', 'block');
110 110
           $('.merged-branch').css('display', 'none');
111 111
         }
112 112
         display_no_merged = !display_no_merged;
... ...
@@ -140,9 +140,9 @@
140 140
     %= include '/include/project_header';
141 141
     %= include '/include/code_menu', display => 'branches';
142 142
     
143
-    <h3>Branches</h3>
143
+    <h3 style="font-size:19px">Branches</h3>
144 144
     
145
-    <div class="muted">
145
+    <div style="margin-bottom:10px">
146 146
       Showing
147 147
       <span id="no-merged-branch-message">
148 148
          <%= $no_merged_branches_count %> branches not merged
... ...
@@ -153,24 +153,24 @@
153 153
       into <%= $default_branch->{name} %>.
154 154
       <a id="toggle-branch" href="#">View merged branches</a>
155 155
     </div>
156
-    <div class="bk-black" style="padding:5px">
156
+    <div class="bk-black" style="padding:5px 10px">
157 157
       <div class="row">
158
-        <div class="span8">
159
-          <div class="font-white">
158
+        <div class="span8" style="line-height:1.2em">
159
+          <div style="color:white;font-size:16px;">
160 160
             <b><%= $default_branch->{name} %></b>
161 161
           </div>
162
-          <div class="muted">
162
+          <div class="muted" style="font-size:12px">
163 163
             Last updated
164 164
             <span title="<%= $default_branch->{commit}{age_string_datetime} %>">
165 165
               <%= $default_branch->{commit}{age_string} %>
166 166
             </span>
167 167
             by
168
-            <span title="<%= $default_branch->{commit}{author_email} %>">
168
+            <span title="<%= $default_branch->{commit}{author_email} %>" style="color:white">
169 169
               <%= $default_branch->{commit}{author_name} %>
170 170
             </span>
171 171
           </div>
172 172
         </div>
173
-        <div class="text-right font-white" style="padding-top:10px">
173
+        <div class="text-right font-white" style="padding-top:6px">
174 174
           Base branch
175 175
         </div>
176 176
       </div>
... ...
@@ -179,15 +179,15 @@
179 179
       % my $branch = $branches->[$i];
180 180
       % my $bname = $branch->{name};
181 181
       % next if $bname eq $default_branch->{name};
182
-      <div class="<%= $branch->{no_merged} ? 'no-merged-branch' : 'merged-branch' %> border-bottom-gray" style="padding:5px">
182
+      <div class="<%= $branch->{no_merged} ? 'no-merged-branch' : 'merged-branch' %> border-bottom-gray" style="padding:10px 0px 5px 0px;<%= $branch->{no_merged} ? '' : 'display:none' %>">
183 183
         <div class="row">
184
-          <div class="span8">
185
-            <div>
184
+          <div class="span8" style="line-height:1.2em">
185
+            <div style="font-size:16px;">
186 186
               <a href="<%= url_for("/$user/$project/tree/$bname") %>">
187
-                <%= $bname %>
187
+                <b><%= $bname %></b>
188 188
               </a>
189 189
             </div>
190
-            <div class="muted">
190
+            <div style="font-size:12px">
191 191
               Last updated
192 192
               <span title="<%= $branch->{commit}{age_string_datetime} %>">
193 193
                 <%= $branch->{commit}{age_string} %>
... ...
@@ -198,7 +198,7 @@
198 198
               </span>
199 199
             </div>
200 200
           </div>
201
-          <div class="text-right" style="padding-top:5px">
201
+          <div class="text-right" style="padding-top:0px">
202 202
             % if ($api->logined($user)) {
203 203
               <form action="<%= url_for->query(op => 'delete') %>" method="post" style="display:inline-block">
204 204
                 <input type="submit" class="btn delete-branch" style="color:#900;" value="Delete branch">