cleanup commits page design ・ b2481d2 ・ Gitprep

- cleanup commits page design;
- Browse files
- Yuki Kimoto commited on 2013-03-15
- 1 parent 3c6a8f4
  
  commit b2481d2405a504d43fce90979b93fa8ebcdb772f

Showing 2 changed files with 61 additions and 115 deletions

+26

templates/layouts/common.html.ep

...	...	@@ -10,6 +10,32 @@
10	10	<link rel="shortcut icon" href="<%= url_for('/git-favicon.png') %>" type="image/png" >
11	11
12	12	%= stylesheet begin
	13	+ /* Font color */
	14	+ .font-black {
	15	+ color: #333;
	16	+ }
	17	+
	18	+ /* Background color */
	19	+ .bk-blue-light {
	20	+ background-color:#E6F1F6;
	21	+ }
	22	+
	23	+ /* Padding */
	24	+ .padding-default {
	25	+ padding:5px;
	26	+ }
	27	+
	28	+ /* border */
	29	+ .border-top-gray {
	30	+ border-top:1px solid #ccc;
	31	+ }
	32	+
	33	+ .border-3-gray {
	34	+ border-left:1px solid #ccc;
	35	+ border-bottom:1px solid #ccc;
	36	+ border-right:1px solid #ccc;
	37	+ }
	38	+
13	39	.corner-left-none {
14	40	border-top-left-radius:0;
15	41	border-bottom-left-radius:0;

+35 -115

templates/main/commits.html.ep

View

@@ -35,107 +35,15 @@
 %>
 
 % layout 'common';
-  %= include '/css/common';
-  
-  %= stylesheet begin
-    
-    /* Commit history */
-    .commit_history {
-      font-weight:bold;
-      margin: 1em 0;
-    }
-    .commit_history a {
-      color:#4183C4;
-    }
-    
-    /* Commit */
-    .commit {
-      border:1px solid gray;
-      border-bottom:none;
-      margin-bottom:15px;
-    }
-    .commit .cdate {
-      border-bottom:1px solid gray;
-      padding:5px;
-      background-color:#E6F1F6;
-      color:#3A505B;
-      font-weight:bold;
-    }
-    .commit .cfirst {
-      overflow:hidden;
-      padding:8px;
-      padding-bottom:1px;
-    }
-    .commit .cfirst_left {
-      float:left;
-      color:black;
-    }
-    .commit .cfirst_left a {
-      color:black;
-      font-weight:bold;
-    }
-    .commit .cfirst_right {
-      float:right;
-    }
-    .commit .cfirst_right a {
-      color:#4183C4;
-    }
-    .commit .csecond {
-      overflow:hidden;
-      border-bottom:1px solid gray;
-      padding:8px;
-      padding-top:1px;
-    }
-    .commit .csecond_left {
-      float:left;
-    }
-    .commit .csecond_right {
-      float:right;
-    }
-    .commit .csecond_right a {
-      color:#4183C4;
-    }
-    
-    /* Pagenation */
-    .pagination {
-      overflow:hidden;
-      border-radius:3px;
-      border:1px solid gray;
-      display:inline-block;
-      color:black
-    }
-    .pagination .pleft {
-      border-right:1px solid gray;
-      padding:5px;
-      display:block;
-      float:left
-    }
-    .pagination .pright {
-      padding:5px;
-      display:block;
-      float:left;
-    }
-    .pagination a {
-      color:black;
-      height:100%;
-    }
-    .pagination a:hover {
-      background-color:#4183C4;
-    }
-    .pagination .pdisable {
-      color:gray;
-      cursor:default;
-    }    
-  % end
   
   %= include '/include/header';
 
-  <div class="main_panel">
-    %= include '/include/sub_header';
+  <div class="container">
+    %= include '/include/project_header';
     
     %= include '/include/code_menu', display => 'commits';
         
-    <div class="commit_history">
+    <div style="font-weight:bold;margin-bottom:5px">
       % if (defined $blob) {
         History for
         %= include '/include/page_path', type => 'blob', Path => $blob, operation => 'commits';
@@ -147,32 +55,44 @@
         Commit History
       % }
     </div>
-    
+
     % for my $date (reverse sort keys %$commits_date) {
-      <div class="commit">
+      <div style="padding-bottom:20px">
         % my $commits = $commits_date->{$date};
         
-        <div class="cdate"><%= $date %></div>
+        <div class="row">
+          <div class="span12 padding-default bk-blue-light border-top-gray border-3-gray">
+            <b><%= $date %></b>
+          </div>
+        </div>
         % for my $commit (sort {$a->{author_epoch} <=> $b->{author_epoch}} @$commits) {
-          <div class="ccontent">
-            <div class="cfirst">
-              <div class="cfirst_left">
-                <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
-                  <%= $commit->{title_short} %>
-                </a>
-              </div>
-              <div class="cfirst_right a_dec_on a_blue">
-                <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
-                  <%= substr($commit->{id}, 0, 10) %>
-                </a>
+          <div class="row">
+            <div class="span12 padding-default border-3-gray" style="padding-bottom:0;border-bottom:none">
+              <div class="row">
+                <div class="span8">
+                  <a class="font-black" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
+                    <b><%= $commit->{title_short} %></b>
+                  </a>
+                </div>
+                <div class="span4 text-right">
+                  <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
+                    <%= substr($commit->{id}, 0, 10) %>
+                  </a>
+                </div>
               </div>
             </div>
-            <div class="csecond">
-              <div class="csecond_left">yuki-kimoto authored 7 days ago</div>
-              <div class="csecond_right">
-                <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
-                  Browse code
-                </a>
+          </div>
+          <div class="row">
+            <div class="span12 padding-default border-3-gray">
+              <div class="row">
+                <div class="span8 muted">
+                  yuki-kimoto authored 7 days ago
+                </div>
+                <div class="span4 text-right">
+                  <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
+                    Browse code
+                  </a>
+                </div>
               </div>
             </div>
           </div>

...	...	@@ -35,107 +35,15 @@
35	35	%>
36	36
37	37	% layout 'common';
38		- %= include '/css/common';
39		-
40		- %= stylesheet begin
41		-
42		- /* Commit history */
43		- .commit_history {
44		- font-weight:bold;
45		- margin: 1em 0;
46		- }
47		- .commit_history a {
48		- color:#4183C4;
49		- }
50		-
51		- /* Commit */
52		- .commit {
53		- border:1px solid gray;
54		- border-bottom:none;
55		- margin-bottom:15px;
56		- }
57		- .commit .cdate {
58		- border-bottom:1px solid gray;
59		- padding:5px;
60		- background-color:#E6F1F6;
61		- color:#3A505B;
62		- font-weight:bold;
63		- }
64		- .commit .cfirst {
65		- overflow:hidden;
66		- padding:8px;
67		- padding-bottom:1px;
68		- }
69		- .commit .cfirst_left {
70		- float:left;
71		- color:black;
72		- }
73		- .commit .cfirst_left a {
74		- color:black;
75		- font-weight:bold;
76		- }
77		- .commit .cfirst_right {
78		- float:right;
79		- }
80		- .commit .cfirst_right a {
81		- color:#4183C4;
82		- }
83		- .commit .csecond {
84		- overflow:hidden;
85		- border-bottom:1px solid gray;
86		- padding:8px;
87		- padding-top:1px;
88		- }
89		- .commit .csecond_left {
90		- float:left;
91		- }
92		- .commit .csecond_right {
93		- float:right;
94		- }
95		- .commit .csecond_right a {
96		- color:#4183C4;
97		- }
98		-
99		- /* Pagenation */
100		- .pagination {
101		- overflow:hidden;
102		- border-radius:3px;
103		- border:1px solid gray;
104		- display:inline-block;
105		- color:black
106		- }
107		- .pagination .pleft {
108		- border-right:1px solid gray;
109		- padding:5px;
110		- display:block;
111		- float:left
112		- }
113		- .pagination .pright {
114		- padding:5px;
115		- display:block;
116		- float:left;
117		- }
118		- .pagination a {
119		- color:black;
120		- height:100%;
121		- }
122		- .pagination a:hover {
123		- background-color:#4183C4;
124		- }
125		- .pagination .pdisable {
126		- color:gray;
127		- cursor:default;
128		- }
129		- % end
130	38
131	39	%= include '/include/header';
132	40
133		- <div class="main_panel">
134		- %= include '/include/sub_header';
	41	+ <div class="container">
	42	+ %= include '/include/project_header';
135	43
136	44	%= include '/include/code_menu', display => 'commits';
137	45
138		- <div class="commit_history">
	46	+ <div style="font-weight:bold;margin-bottom:5px">
139	47	% if (defined $blob) {
140	48	History for
141	49	%= include '/include/page_path', type => 'blob', Path => $blob, operation => 'commits';
...	...	@@ -147,32 +55,44 @@
147	55	Commit History
148	56	% }
149	57	</div>
150		-
	58	+
151	59	% for my $date (reverse sort keys %$commits_date) {
152		- <div class="commit">
	60	+ <div style="padding-bottom:20px">
153	61	% my $commits = $commits_date->{$date};
154	62
155		- <div class="cdate"><%= $date %></div>
	63	+ <div class="row">
	64	+ <div class="span12 padding-default bk-blue-light border-top-gray border-3-gray">
	65	+ <b><%= $date %></b>
	66	+ </div>
	67	+ </div>
156	68	% for my $commit (sort {$a->{author_epoch} <=> $b->{author_epoch}} @$commits) {
157		- <div class="ccontent">
158		- <div class="cfirst">
159		- <div class="cfirst_left">
160		- <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
161		- <%= $commit->{title_short} %>
162		- </a>
163		- </div>
164		- <div class="cfirst_right a_dec_on a_blue">
165		- <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
166		- <%= substr($commit->{id}, 0, 10) %>
167		- </a>
	69	+ <div class="row">
	70	+ <div class="span12 padding-default border-3-gray" style="padding-bottom:0;border-bottom:none">
	71	+ <div class="row">
	72	+ <div class="span8">
	73	+ <a class="font-black" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
	74	+ <b><%= $commit->{title_short} %></b>
	75	+ </a>
	76	+ </div>
	77	+ <div class="span4 text-right">
	78	+ <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
	79	+ <%= substr($commit->{id}, 0, 10) %>
	80	+ </a>
	81	+ </div>
168	82	</div>
169	83	</div>
170		- <div class="csecond">
171		- <div class="csecond_left">yuki-kimoto authored 7 days ago</div>
172		- <div class="csecond_right">
173		- <a class="ubar" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
174		- Browse code
175		- </a>
	84	+ </div>
	85	+ <div class="row">
	86	+ <div class="span12 padding-default border-3-gray">
	87	+ <div class="row">
	88	+ <div class="span8 muted">
	89	+ yuki-kimoto authored 7 days ago
	90	+ </div>
	91	+ <div class="span4 text-right">
	92	+ <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
	93	+ Browse code
	94	+ </a>
	95	+ </div>
176	96	</div>
177	97	</div>
178	98	</div>