Show More
@@ -408,8 +408,8 b' div.codeblock {' | |||||
408 |
|
408 | |||
409 | overflow: auto; |
|
409 | overflow: auto; | |
410 | padding: 0px; |
|
410 | padding: 0px; | |
411 |
border: @border-thickness solid |
|
411 | border: @border-thickness solid @grey6; | |
412 |
background: |
|
412 | background: @grey7; | |
413 | .border-radius(@border-radius); |
|
413 | .border-radius(@border-radius); | |
414 |
|
414 | |||
415 | #remove_gist { |
|
415 | #remove_gist { |
@@ -1817,7 +1817,6 b' BIN_FILENODE = 7' | |||||
1817 | } |
|
1817 | } | |
1818 |
|
1818 | |||
1819 | #changeset_compare_view_content { |
|
1819 | #changeset_compare_view_content { | |
1820 | margin-bottom: @space; |
|
|||
1821 | clear: both; |
|
1820 | clear: both; | |
1822 | width: 100%; |
|
1821 | width: 100%; | |
1823 | box-sizing: border-box; |
|
1822 | box-sizing: border-box; |
@@ -63,10 +63,6 b'' | |||||
63 | &.user-profile { |
|
63 | &.user-profile { | |
64 | float: left; |
|
64 | float: left; | |
65 |
|
65 | |||
66 | .panel-heading { |
|
|||
67 | margin-bottom: @padding; |
|
|||
68 | } |
|
|||
69 |
|
||||
70 | .panel-body { |
|
66 | .panel-body { | |
71 | &:extend(.clearfix); |
|
67 | &:extend(.clearfix); | |
72 | } |
|
68 | } |
@@ -225,6 +225,7 b'' | |||||
225 | .right-label-summary { |
|
225 | .right-label-summary { | |
226 | float: left; |
|
226 | float: left; | |
227 | margin-top: 7px; |
|
227 | margin-top: 7px; | |
|
228 | width: ~"calc(100% - 160px)"; | |||
228 | } |
|
229 | } | |
229 | } |
|
230 | } | |
230 |
|
231 |
@@ -5,12 +5,13 b'' | |||||
5 | <a href="${h.route_path('my_account_edit')}" class="panel-edit">${_('Edit')}</a> |
|
5 | <a href="${h.route_path('my_account_edit')}" class="panel-edit">${_('Edit')}</a> | |
6 | </div> |
|
6 | </div> | |
7 |
|
7 | |||
8 | <div class="panel-body"> |
|
8 | <div class="panel-body fields"> | |
9 |
<div class="field |
|
9 | <div class="field"> | |
10 |
<div class="l |
|
10 | <div class="label"> | |
11 | ${_('Photo')}: |
|
11 | ${_('Photo')}: | |
12 | </div> |
|
12 | </div> | |
13 |
<div class=" |
|
13 | <div class="input"> | |
|
14 | <div class="text-as-placeholder"> | |||
14 | %if c.visual.use_gravatar: |
|
15 | %if c.visual.use_gravatar: | |
15 | ${base.gravatar(c.user.email, 100)} |
|
16 | ${base.gravatar(c.user.email, 100)} | |
16 | %else: |
|
17 | %else: | |
@@ -19,37 +20,46 b'' | |||||
19 | %endif |
|
20 | %endif | |
20 | </div> |
|
21 | </div> | |
21 | </div> |
|
22 | </div> | |
22 | <div class="fieldset"> |
|
23 | </div> | |
23 |
|
|
24 | <div class="field"> | |
|
25 | <div class="label"> | |||
24 | ${_('Username')}: |
|
26 | ${_('Username')}: | |
25 | </div> |
|
27 | </div> | |
26 |
<div class=" |
|
28 | <div class="input"> | |
|
29 | <div class="text-as-placeholder"> | |||
27 | ${c.user.username} |
|
30 | ${c.user.username} | |
28 | </div> |
|
31 | </div> | |
29 | </div> |
|
32 | </div> | |
30 | <div class="fieldset"> |
|
33 | </div> | |
31 |
|
|
34 | <div class="field"> | |
|
35 | <div class="label"> | |||
32 | ${_('First Name')}: |
|
36 | ${_('First Name')}: | |
33 | </div> |
|
37 | </div> | |
34 |
<div class=" |
|
38 | <div class="input"> | |
|
39 | <div class="text-as-placeholder"> | |||
35 | ${c.user.first_name} |
|
40 | ${c.user.first_name} | |
36 | </div> |
|
41 | </div> | |
37 | </div> |
|
42 | </div> | |
38 | <div class="fieldset"> |
|
43 | </div> | |
39 |
|
|
44 | <div class="field"> | |
|
45 | <div class="label"> | |||
40 | ${_('Last Name')}: |
|
46 | ${_('Last Name')}: | |
41 | </div> |
|
47 | </div> | |
42 |
<div class=" |
|
48 | <div class="input"> | |
|
49 | <div class="text-as-placeholder"> | |||
43 | ${c.user.last_name} |
|
50 | ${c.user.last_name} | |
44 | </div> |
|
51 | </div> | |
45 | </div> |
|
52 | </div> | |
46 | <div class="fieldset"> |
|
53 | </div> | |
47 |
|
|
54 | <div class="field"> | |
|
55 | <div class="label"> | |||
48 | ${_('Email')}: |
|
56 | ${_('Email')}: | |
49 | </div> |
|
57 | </div> | |
50 |
<div class=" |
|
58 | <div class="input"> | |
|
59 | <div class="text-as-placeholder"> | |||
51 | ${c.user.email or _('Missing email, please update your user email address.')} |
|
60 | ${c.user.email or _('Missing email, please update your user email address.')} | |
52 | </div> |
|
61 | </div> | |
53 | </div> |
|
62 | </div> | |
54 | </div> |
|
63 | </div> | |
|
64 | </div> | |||
55 | </div> No newline at end of file |
|
65 | </div> |
@@ -28,11 +28,10 b'' | |||||
28 |
|
28 | |||
29 | <div id="changeset_compare_view_content" class="summary changeset"> |
|
29 | <div id="changeset_compare_view_content" class="summary changeset"> | |
30 | <div class="summary-detail"> |
|
30 | <div class="summary-detail"> | |
31 |
<div class=" |
|
31 | <div class="fieldset"> | |
32 |
<div class=" |
|
32 | <div class="left-label-summary"> | |
33 | <h4> |
|
33 | <p>${_('Commit')}</p> | |
34 | ${_('Commit')} |
|
34 | <div class="right-label-summary"> | |
35 |
|
||||
36 | <code> |
|
35 | <code> | |
37 | ${h.show_id(c.commit)} |
|
36 | ${h.show_id(c.commit)} | |
38 | </code> |
|
37 | </code> | |
@@ -54,9 +53,8 b'' | |||||
54 | <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span> |
|
53 | <span class="tag hidden-${c.commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span> | |
55 | % endif |
|
54 | % endif | |
56 | % endif |
|
55 | % endif | |
57 | </h4> |
|
|||
58 |
|
56 | |||
59 | </div> |
|
57 | ||
60 | <div class="pull-right"> |
|
58 | <div class="pull-right"> | |
61 | <span id="parent_link"> |
|
59 | <span id="parent_link"> | |
62 | <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a> |
|
60 | <a href="#parentCommit" title="${_('Parent Commit')}"><i class="icon-left icon-no-margin"></i>${_('parent')}</a> | |
@@ -66,41 +64,44 b'' | |||||
66 | <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a> |
|
64 | <a href="#childCommit" title="${_('Child Commit')}">${_('child')}<i class="icon-right icon-no-margin"></i></a> | |
67 | </span> |
|
65 | </span> | |
68 | </div> |
|
66 | </div> | |
|
67 | ||||
69 | </div> |
|
68 | </div> | |
|
69 | </div> | |||
|
70 | </div> | |||
|
71 | ||||
|
72 | ||||
70 |
|
73 | |||
71 | <div class="fieldset"> |
|
74 | <div class="fieldset"> | |
72 | <div class="left-label"> |
|
75 | <div class="left-label-summary"> | |
73 | ${_('Description')}: |
|
76 | <p>${_('Description')}:</p> | |
74 | </div> |
|
77 | <div class="right-label-summary"> | |
75 | <div class="right-content"> |
|
|||
76 | <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div> |
|
78 | <div id="trimmed_message_box" class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div> | |
77 | <div id="message_expand" style="display:none;"> |
|
79 | <div id="message_expand" style="display:none;"> | |
78 | ${_('Expand')} |
|
80 | ${_('Expand')} | |
79 | </div> |
|
81 | </div> | |
80 | </div> |
|
82 | </div> | |
81 | </div> |
|
83 | </div> | |
|
84 | </div> | |||
82 |
|
85 | |||
83 | %if c.statuses: |
|
86 | %if c.statuses: | |
84 | <div class="fieldset"> |
|
87 | <div class="fieldset"> | |
85 | <div class="left-label"> |
|
88 | <div class="left-label-summary"> | |
86 | ${_('Commit status')}: |
|
89 | <p>${_('Commit status')}:</p> | |
87 | </div> |
|
90 | <div class="right-label-summary"> | |
88 | <div class="right-content"> |
|
|||
89 | <div class="changeset-status-ico"> |
|
91 | <div class="changeset-status-ico"> | |
90 | <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div> |
|
92 | <div class="${'flag_status %s' % c.statuses[0]} pull-left"></div> | |
91 | </div> |
|
93 | </div> | |
92 | <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div> |
|
94 | <div title="${_('Commit status')}" class="changeset-status-lbl">[${h.commit_status_lbl(c.statuses[0])}]</div> | |
93 | </div> |
|
95 | </div> | |
94 | </div> |
|
96 | </div> | |
|
97 | </div> | |||
95 | %endif |
|
98 | %endif | |
96 |
|
99 | |||
97 | <div class="fieldset"> |
|
100 | <div class="fieldset"> | |
98 | <div class="left-label"> |
|
101 | <div class="left-label-summary"> | |
99 | ${_('References')}: |
|
102 | <p>${_('References')}:</p> | |
100 | </div> |
|
103 | <div class="right-label-summary"> | |
101 | <div class="right-content"> |
|
|||
102 | <div class="tags"> |
|
104 | <div class="tags"> | |
103 |
|
||||
104 | %if c.commit.merge: |
|
105 | %if c.commit.merge: | |
105 | <span class="mergetag tag"> |
|
106 | <span class="mergetag tag"> | |
106 | <i class="icon-merge"></i>${_('merge')} |
|
107 | <i class="icon-merge"></i>${_('merge')} | |
@@ -129,12 +130,12 b'' | |||||
129 | </div> |
|
130 | </div> | |
130 | </div> |
|
131 | </div> | |
131 | </div> |
|
132 | </div> | |
|
133 | </div> | |||
132 |
|
134 | |||
133 | <div class="fieldset"> |
|
135 | <div class="fieldset"> | |
134 | <div class="left-label"> |
|
136 | <div class="left-label-summary"> | |
135 | ${_('Diff options')}: |
|
137 | <p>${_('Diff options')}:</p> | |
136 | </div> |
|
138 | <div class="right-label-summary"> | |
137 | <div class="right-content"> |
|
|||
138 | <div class="diff-actions"> |
|
139 | <div class="diff-actions"> | |
139 | <a href="${h.route_path('repo_commit_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id)}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> |
|
140 | <a href="${h.route_path('repo_commit_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id)}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"> | |
140 | ${_('Raw Diff')} |
|
141 | ${_('Raw Diff')} | |
@@ -150,12 +151,12 b'' | |||||
150 | </div> |
|
151 | </div> | |
151 | </div> |
|
152 | </div> | |
152 | </div> |
|
153 | </div> | |
|
154 | </div> | |||
153 |
|
155 | |||
154 | <div class="fieldset"> |
|
156 | <div class="fieldset"> | |
155 | <div class="left-label"> |
|
157 | <div class="left-label-summary"> | |
156 | ${_('Comments')}: |
|
158 | <p>${_('Comments')}:</p> | |
157 | </div> |
|
159 | <div class="right-label-summary"> | |
158 | <div class="right-content"> |
|
|||
159 | <div class="comments-number"> |
|
160 | <div class="comments-number"> | |
160 | %if c.comments: |
|
161 | %if c.comments: | |
161 | <a href="#comments">${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>, |
|
162 | <a href="#comments">${_ungettext("%d Commit comment", "%d Commit comments", len(c.comments)) % len(c.comments)}</a>, | |
@@ -170,12 +171,12 b'' | |||||
170 | </div> |
|
171 | </div> | |
171 | </div> |
|
172 | </div> | |
172 | </div> |
|
173 | </div> | |
|
174 | </div> | |||
173 |
|
175 | |||
174 | <div class="fieldset"> |
|
176 | <div class="fieldset"> | |
175 | <div class="left-label"> |
|
177 | <div class="left-label-summary"> | |
176 | ${_('Unresolved TODOs')}: |
|
178 | <p>${_('Unresolved TODOs')}:</p> | |
177 | </div> |
|
179 | <div class="right-label-summary"> | |
178 | <div class="right-content"> |
|
|||
179 | <div class="comments-number"> |
|
180 | <div class="comments-number"> | |
180 | % if c.unresolved_comments: |
|
181 | % if c.unresolved_comments: | |
181 | % for co in c.unresolved_comments: |
|
182 | % for co in c.unresolved_comments: | |
@@ -187,21 +188,23 b'' | |||||
187 | </div> |
|
188 | </div> | |
188 | </div> |
|
189 | </div> | |
189 | </div> |
|
190 | </div> | |
190 |
|
191 | </div> | ||
191 | </div> <!-- end summary-detail --> |
|
|||
192 |
|
192 | |||
193 | <div id="commit-stats" class="sidebar-right"> |
|
193 | <div class="fieldset"> | |
194 |
<div class="summary |
|
194 | <div class="left-label-summary"> | |
195 | <h4 class="item"> |
|
195 | <p>${_('Author')}</p> | |
196 | ${_('Author')} |
|
196 | ||
197 | </h4> |
|
197 | <div class="right-label-summary"> | |
198 | </div> |
|
|||
199 | <div class="sidebar-right-content"> |
|
|||
200 | ${self.gravatar_with_user(c.commit.author)} |
|
198 | ${self.gravatar_with_user(c.commit.author)} | |
201 | <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div> |
|
199 | <div class="user-inline-data">- ${h.age_component(c.commit.date)}</div> | |
202 | </div> |
|
200 | </div> | |
203 | </div><!-- end sidebar --> |
|
201 | </div> | |
|
202 | ||||
|
203 | <div class="clear-fix"></div> | |||
|
204 | ||||
|
205 | </div> <!-- end summary-detail --> | |||
204 | </div> <!-- end summary --> |
|
206 | </div> <!-- end summary --> | |
|
207 | </div> | |||
205 | <div class="cs_files"> |
|
208 | <div class="cs_files"> | |
206 | <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/> |
|
209 | <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/> | |
207 | ${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])} |
|
210 | ${cbdiffs.render_diffset_menu(c.changes[c.commit.raw_id])} |
General Comments 0
You need to be logged in to leave comments.
Login now