Showing 11 changed files with 21 additions and 28 deletions
+7 -2
public/css/common.css
... ...
@@ -240,7 +240,7 @@ a:hover {
240 240
 .labels-tag {
241 241
   border-radius:5px;
242 242
   display:inline-block;
243
-  padding:7px 12px;
243
+  padding:5px 10px;
244 244
   font-weight:bold;
245 245
   border:1px solid #dddddd;
246 246
 }
... ...
@@ -1952,12 +1952,17 @@ button.close {
1952 1952
   cursor: default;
1953 1953
 }
1954 1954
 
1955
-.btn-fork {
1955
+.btn-fork, .btn-new {
1956 1956
   font-size:13px;
1957 1957
   padding:5px 20px;
1958 1958
   height:28px;
1959 1959
 }
1960 1960
 
1961
+.btn-delete {
1962
+  padding:1px 10px;
1963
+  height:20px;
1964
+}
1965
+
1961 1966
 .btn-primary {
1962 1967
   color: #ffffff;
1963 1968
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+1 -1
templates/auto/_login.html.ep
... ...
@@ -131,7 +131,7 @@
131 131
         </div>
132 132
         <div>
133 133
           <div>
134
-            <button type="submit" class="btn">Login</button>
134
+            <button type="submit" class="btn btn-green btn-new">Login</button>
135 135
           </div>
136 136
         </div>
137 137
       </div>
+2 -14
templates/auto/_new.html.ep
... ...
@@ -101,9 +101,6 @@
101 101
       <div class="new-title">
102 102
         Create a new repository
103 103
       </div>
104
-      <div class="new-description">
105
-        A repository contains all the files for your project, including the revision history.
106
-      </div>
107 104
     </div>
108 105
     <form action="<%= url_for->query(op => 'create') %>" method="post">
109 106
       <div class="new-repository">
... ...
@@ -143,30 +140,21 @@
143 140
           <div>
144 141
             <%= radio_button private => 0, checked => undef %><span>Public</span>
145 142
           </div>
146
-          <div class="last-child">
147
-            Anyone can see this repository. You choose who can commit.
148
-          </div>
149 143
         </li>
150 144
         <li>
151 145
           <div>
152 146
             <%= radio_button private => 1 %><span>Private</span>
153 147
           </div>
154
-          <div class="last-child">
155
-            You choose who can see and commit to this repository.
156
-          </div>
157 148
         </li>
158 149
       </ul>
159 150
       
160 151
       <div class="new-readme">
161 152
         <div>
162
-          <%= check_box readme => 1 %><span>Initialize this this repository with a README<span>
163
-        </div>
164
-        <div class="last-child">
165
-          This will let you immediately clone the repository to your computer. Skip this step if you’re importing an existing repository.
153
+          <%= check_box readme => 1 %><span>Initialize this repository with a README<span>
166 154
         </div>
167 155
       </div>
168 156
       
169
-      <input type="submit" class="btn btn-green" value="Create repository">
157
+      <input type="submit" class="btn btn-green btn-new" value="Create repository">
170 158
     </form>
171 159
   </div>
172 160
   %= include '/include/footer';
+1 -1
templates/auto/_start.html.ep
... ...
@@ -94,7 +94,7 @@
94 94
           </div>
95 95
         </div>
96 96
         <div>
97
-          <button type="submit" class="btn btn-green" style="margin-top:20px">Create Admin User</button>
97
+          <button type="submit" class="btn btn-green btn-new" style="margin-top:20px">Create Admin User</button>
98 98
         </div>
99 99
       </div>
100 100
     </form>
+1 -1
templates/auto/reset-password.html.ep
... ...
@@ -129,7 +129,7 @@
129 129
           </div>
130 130
         </div>
131 131
         <div style="margin-top:20px">
132
-          <button type="submit" class="btn btn-green">Reset Password</button>
132
+          <button type="submit" class="btn btn-green btn-new">Reset Password</button>
133 133
         </div>
134 134
       </div>
135 135
     </form>
+1 -1
templates/issues.html.ep
... ...
@@ -70,7 +70,7 @@
70 70
       </div>
71 71
       <div class="issues-button-container-right">
72 72
         % if ($api->logined) {
73
-          <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-green">New issue</a>
73
+          <a href="<%= url_for("/$user_id/$project_id/issues/new") %>" class="btn btn-green btn-new">New issue</a>
74 74
         % }
75 75
       </div>
76 76
     </div>
+1 -1
templates/labels.html.ep
... ...
@@ -193,7 +193,7 @@
193 193
   %= include '/include/errors', errors => $errors;
194 194
   % if ($can_write_access) {
195 195
     <div class="labels-new-panel">
196
-      <div class="labels-new-btn btn btn-green">
196
+      <div class="labels-new-btn btn btn-green btn-new">
197 197
         New label
198 198
       </div>
199 199
     </div>
+2 -2
templates/pull.html.ep
... ...
@@ -469,7 +469,7 @@
469 469
             <div class="pull-request-form-button">
470 470
               <form action="<%= url_for %>" method="post">
471 471
                 <%= hidden_field op => 'merge' %>
472
-                <%= submit_button 'Merge pull request', class => "btn btn-green" %>
472
+                <%= submit_button 'Merge pull request', class => "btn btn-green btn-new" %>
473 473
                 <span style="margin-left:5px">
474 474
                   You can also view <a href="javascript:void(0)" onclick="$('#command-line-instructions').toggle()" >command line instructions</a>.
475 475
                 </span>
... ...
@@ -564,7 +564,7 @@ git push origin <%= $base_branch %>
564 564
                   % } else {
565 565
                     <input type="submit" value="Reopen pull request" onclick="$(this).closest('form').find('[name=op]').val('reopen-issue'); $(this).closest('form').submit();" class="btn">
566 566
                   % }
567
-                  <input type="submit" value="Comment" onclick="$(this).closest('form').find('[name=op]').val('add-comment'); $(this).closest('form').submit();" class="btn btn-green">
567
+                  <input type="submit" value="Comment" onclick="$(this).closest('form').find('[name=op]').val('add-comment'); $(this).closest('form').submit();" class="btn btn-green btn-new">
568 568
                 </div>
569 569
               </div>
570 570
             </div>
+2 -2
templates/pulls.html.ep
... ...
@@ -50,9 +50,9 @@
50 50
     % if ($api->logined) {
51 51
       <div class="pulls-button-container">
52 52
         % if ($original_project) {
53
-          <a href="<%= url_for("/$original_project->{'user.id'}/$original_project->{id}/compare/$original_project->{default_branch}...$user_id:$default_branch") %>" class="btn btn-green">New pull request</a>
53
+          <a href="<%= url_for("/$original_project->{'user.id'}/$original_project->{id}/compare/$original_project->{default_branch}...$user_id:$default_branch") %>" class="btn btn-green btn-new">New pull request</a>
54 54
         % } else {
55
-          <a href="<%= url_for("/$user_id/$project_id/compare") %>" class="btn btn-green">New pull request</a>
55
+          <a href="<%= url_for("/$user_id/$project_id/compare") %>" class="btn btn-green btn-new">New pull request</a>
56 56
         % }
57 57
       </div>
58 58
     % }
+1 -1
templates/settings/collaboration.html.ep
... ...
@@ -152,7 +152,7 @@
152 152
             <form action="<%= url_for->query(op => 'add') %>" method="post">
153 153
               <div>
154 154
                 <%= text_field 'collaborator' %>
155
-                <input type="submit" value="Add"" >
155
+                <input type="submit" value="Add" class="btn" >
156 156
               </div>
157 157
             </form>
158 158
           </div>
+2 -2
templates/user-settings/ssh.html.ep
... ...
@@ -195,7 +195,7 @@
195 195
                 <form action="<%= url_for->query(op => 'delete') %>" method="post">
196 196
                   <div>
197 197
                     <b><%= $key->{title} %></b>
198
-                    <a class="btn btn-small btn-danger" href="javascript:void(0)" onclick="$(this).closest('form').submit()">Delete</a>
198
+                    <a class="btn btn-danger btn-delete" href="javascript:void(0)" onclick="$(this).closest('form').submit()">Delete</a>
199 199
                     <%= hidden_field 'row-id' => $key->{row_id} %>
200 200
                   </div>
201 201
                 </form>
... ...
@@ -228,7 +228,7 @@
228 228
               <div>
229 229
                 <%= text_area 'key' %>
230 230
               </div>
231
-              <input type="submit" class="btn btn-green" value="Add key">
231
+              <input type="submit" class="btn btn-green btn-new" value="Add key">
232 232
             </form>
233 233
           </div>
234 234
         </div>