Show More
@@ -26,6 +26,10 b' input[type="button"] {' | |||||
26 | -moz-transition: background .3s,color .3s; |
|
26 | -moz-transition: background .3s,color .3s; | |
27 | -o-transition: background .3s,color .3s; |
|
27 | -o-transition: background .3s,color .3s; | |
28 | transition: background .3s,color .3s; |
|
28 | transition: background .3s,color .3s; | |
|
29 | box-shadow: @button-shadow; | |||
|
30 | -webkit-box-shadow: @button-shadow; | |||
|
31 | ||||
|
32 | ||||
29 |
|
33 | |||
30 | a { |
|
34 | a { | |
31 | display: block; |
|
35 | display: block; | |
@@ -80,12 +84,12 b' input[type="button"] {' | |||||
80 |
|
84 | |||
81 | &:hover, |
|
85 | &:hover, | |
82 | &.active { |
|
86 | &.active { | |
83 |
color: |
|
87 | color: @rcblue; | |
84 |
background-color: @ |
|
88 | background-color: @grey7; | |
85 | .border ( @border-thickness, @rcdarkblue ); |
|
89 | .border ( @border-thickness, @rcdarkblue ); | |
86 |
|
90 | |||
87 | a { |
|
91 | a { | |
88 |
color: |
|
92 | color: @rcblue; | |
89 | } |
|
93 | } | |
90 | } |
|
94 | } | |
91 | &:disabled { |
|
95 | &:disabled { |
@@ -14,7 +14,7 b' tr.inline-comments div {' | |||||
14 | max-width: 100%; |
|
14 | max-width: 100%; | |
15 |
|
15 | |||
16 | p { |
|
16 | p { | |
17 |
white-space: normal; |
|
17 | white-space: normal; | |
18 | } |
|
18 | } | |
19 |
|
19 | |||
20 | code, pre, .code, dd { |
|
20 | code, pre, .code, dd { | |
@@ -227,7 +227,7 b' tr.inline-comments div {' | |||||
227 | .delete-comment { |
|
227 | .delete-comment { | |
228 | display: inline-block; |
|
228 | display: inline-block; | |
229 | color: @rcblue; |
|
229 | color: @rcblue; | |
230 |
|
230 | |||
231 | &:hover { |
|
231 | &:hover { | |
232 | cursor: pointer; |
|
232 | cursor: pointer; | |
233 | } |
|
233 | } | |
@@ -377,13 +377,13 b' form.comment-form {' | |||||
377 | position: relative; |
|
377 | position: relative; | |
378 | width: 100%; |
|
378 | width: 100%; | |
379 | min-height: 42px; |
|
379 | min-height: 42px; | |
380 |
|
380 | |||
381 | .status_box, |
|
381 | .status_box, | |
382 | .cancel-button { |
|
382 | .cancel-button { | |
383 | float: left; |
|
383 | float: left; | |
384 | display: inline-block; |
|
384 | display: inline-block; | |
385 | } |
|
385 | } | |
386 |
|
386 | |||
387 | .action-buttons { |
|
387 | .action-buttons { | |
388 | float: right; |
|
388 | float: right; | |
389 | display: inline-block; |
|
389 | display: inline-block; | |
@@ -426,10 +426,10 b' form.comment-form {' | |||||
426 |
|
426 | |||
427 | .comment-form-login { |
|
427 | .comment-form-login { | |
428 | .comment-help { |
|
428 | .comment-help { | |
429 |
padding: 0. |
|
429 | padding: 0.7em; //same as the button | |
430 | } |
|
430 | } | |
431 |
|
431 | |||
432 |
div.clearfix { |
|
432 | div.clearfix { | |
433 | clear: both; |
|
433 | clear: both; | |
434 | width: 100%; |
|
434 | width: 100%; | |
435 | display: block; |
|
435 | display: block; |
@@ -38,7 +38,7 b'' | |||||
38 |
|
38 | |||
39 | .form-control { |
|
39 | .form-control { | |
40 | width: 100%; |
|
40 | width: 100%; | |
41 |
padding: 0. |
|
41 | padding: 0.7em; | |
42 | border: 1px solid #979797; |
|
42 | border: 1px solid #979797; | |
43 | border-radius: 2px; |
|
43 | border-radius: 2px; | |
44 | } |
|
44 | } |
@@ -124,7 +124,6 b'' | |||||
124 | } |
|
124 | } | |
125 |
|
125 | |||
126 | .menulabel { |
|
126 | .menulabel { | |
127 | padding: 0 0 0.4em 0; |
|
|||
128 | line-height: 1em; |
|
127 | line-height: 1em; | |
129 | // for this specifically we do not use a variable |
|
128 | // for this specifically we do not use a variable | |
130 | } |
|
129 | } | |
@@ -502,7 +501,7 b'' | |||||
502 |
|
501 | |||
503 | #context-bar { |
|
502 | #context-bar { | |
504 | display: block; |
|
503 | display: block; | |
505 | margin: 0 auto; |
|
504 | margin: 0 auto 20px 0; | |
506 | padding: 0 @header-padding; |
|
505 | padding: 0 @header-padding; | |
507 | background-color: @grey7; |
|
506 | background-color: @grey7; | |
508 |
|
507 | |||
@@ -513,7 +512,6 b'' | |||||
513 |
|
512 | |||
514 | ul#context-pages { |
|
513 | ul#context-pages { | |
515 | li { |
|
514 | li { | |
516 | line-height: 2em; |
|
|||
517 | list-style-type: none; |
|
515 | list-style-type: none; | |
518 |
|
516 | |||
519 | a { |
|
517 | a { |
@@ -17,7 +17,7 b'' | |||||
17 | .select2-search, |
|
17 | .select2-search, | |
18 | .select2-search input {.box-sizing(border-box);} |
|
18 | .select2-search input {.box-sizing(border-box);} | |
19 | .select2-container .select2-choice{display:block; line-height:1em; -webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;user-select:none; } |
|
19 | .select2-container .select2-choice{display:block; line-height:1em; -webkit-touch-callout:none;-moz-user-select:none;-ms-user-select:none;user-select:none; } | |
20 | .main .select2-container .select2-choice { background-color: white; } |
|
20 | .main .select2-container .select2-choice { background-color: white; box-shadow: @button-shadow;} | |
21 | .select2-container .select2-choice abbr { display: none; width: 12px; height: 12px; position: absolute; right: 24px; top: 8px; font-size: 1px; text-decoration: none; border: 0; background: url('../images/select2.png') right top no-repeat; cursor: pointer; outline: 0; } |
|
21 | .select2-container .select2-choice abbr { display: none; width: 12px; height: 12px; position: absolute; right: 24px; top: 8px; font-size: 1px; text-decoration: none; border: 0; background: url('../images/select2.png') right top no-repeat; cursor: pointer; outline: 0; } | |
22 | .select2-container.select2-allowclear .select2-choice abbr {display: inline-block;} |
|
22 | .select2-container.select2-allowclear .select2-choice abbr {display: inline-block;} | |
23 | .select2-container .select2-choice abbr:hover { background-position: right -11px; cursor: pointer; } |
|
23 | .select2-container .select2-choice abbr:hover { background-position: right -11px; cursor: pointer; } | |
@@ -120,7 +120,7 b' select.select2{height:28px;visibility:hi' | |||||
120 |
|
120 | |||
121 | a { |
|
121 | a { | |
122 | display:block; |
|
122 | display:block; | |
123 |
padding: . |
|
123 | padding: .7em; | |
124 | padding-right: 2em; |
|
124 | padding-right: 2em; | |
125 | position: relative; |
|
125 | position: relative; | |
126 |
|
126 | |||
@@ -129,7 +129,7 b' select.select2{height:28px;visibility:hi' | |||||
129 | content: "\00A0\25BE"; |
|
129 | content: "\00A0\25BE"; | |
130 | right: .1em; |
|
130 | right: .1em; | |
131 | line-height: 1em; |
|
131 | line-height: 1em; | |
132 |
top: 0. |
|
132 | top: 0.2em; | |
133 | width: 1em; |
|
133 | width: 1em; | |
134 | font-size: 20px; |
|
134 | font-size: 20px; | |
135 | } |
|
135 | } | |
@@ -176,7 +176,13 b' select.select2{height:28px;visibility:hi' | |||||
176 |
|
176 | |||
177 | &:hover, |
|
177 | &:hover, | |
178 | &.select2-highlighted { |
|
178 | &.select2-highlighted { | |
179 |
background-color: @ |
|
179 | background-color: @grey7; | |
|
180 | ||||
|
181 | .select2-result-label { | |||
|
182 | &:hover { | |||
|
183 | color: @grey1!important; | |||
|
184 | } | |||
|
185 | } | |||
180 | } |
|
186 | } | |
181 |
|
187 | |||
182 | &.select2-result-with-children { |
|
188 | &.select2-result-with-children { | |
@@ -189,8 +195,7 b' select.select2{height:28px;visibility:hi' | |||||
189 | display:block; |
|
195 | display:block; | |
190 | padding: 8px; |
|
196 | padding: 8px; | |
191 | font-family: @text-regular; |
|
197 | font-family: @text-regular; | |
192 | border-bottom: @border-thickness solid @rclightblue; |
|
198 | color: @grey2; | |
193 | color: @rcblue; |
|
|||
194 | cursor: pointer; |
|
199 | cursor: pointer; | |
195 | } |
|
200 | } | |
196 | &.select2-result-with-children { |
|
201 | &.select2-result-with-children { | |
@@ -205,7 +210,7 b' select.select2{height:28px;visibility:hi' | |||||
205 | ul.select2-result-sub li .select2-result-label { |
|
210 | ul.select2-result-sub li .select2-result-label { | |
206 | padding-left: 16px; |
|
211 | padding-left: 16px; | |
207 | font-family: @text-regular; |
|
212 | font-family: @text-regular; | |
208 |
color: @r |
|
213 | color: @grey2; | |
209 | cursor: pointer; |
|
214 | cursor: pointer; | |
210 | } |
|
215 | } | |
211 | } |
|
216 | } |
@@ -156,6 +156,19 b' pre {' | |||||
156 |
|
156 | |||
157 | // Emphasis & misc |
|
157 | // Emphasis & misc | |
158 | // ------------------------- |
|
158 | // ------------------------- | |
|
159 | .discreet { | |||
|
160 | color: @grey4; | |||
|
161 | font-size: 85%; | |||
|
162 | font-weight: normal; | |||
|
163 | ||||
|
164 | a { | |||
|
165 | color: @grey4; | |||
|
166 | ||||
|
167 | &:hover { | |||
|
168 | color: @rcdarkblue; | |||
|
169 | } | |||
|
170 | } | |||
|
171 | } | |||
159 |
|
172 | |||
160 | small, |
|
173 | small, | |
161 | .small { |
|
174 | .small { | |
@@ -231,7 +244,8 b' mark,' | |||||
231 | clear: both; |
|
244 | clear: both; | |
232 | float: left; |
|
245 | float: left; | |
233 | width: 100%; |
|
246 | width: 100%; | |
234 |
margin: @pagepadding/2 0 |
|
247 | margin: @pagepadding/2 0 0; | |
|
248 | min-height: 25px; | |||
235 |
|
249 | |||
236 | .breadcrumbs { |
|
250 | .breadcrumbs { | |
237 | float: left; |
|
251 | float: left; |
@@ -130,7 +130,9 b'' | |||||
130 | @fields-input-l: 720px; |
|
130 | @fields-input-l: 720px; | |
131 |
|
131 | |||
132 | // BUTTONS |
|
132 | // BUTTONS | |
133 |
@button-padding: . |
|
133 | @button-padding: .7em; | |
|
134 | @button-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.15); | |||
|
135 | ||||
134 |
|
136 | |||
135 | // DEFAULT WIDTHS |
|
137 | // DEFAULT WIDTHS | |
136 | @wrapper-maxwidth: 1600px; |
|
138 | @wrapper-maxwidth: 1600px; |
@@ -23,10 +23,6 b'' | |||||
23 | <%def name="main()"> |
|
23 | <%def name="main()"> | |
24 |
|
24 | |||
25 | <div class="box"> |
|
25 | <div class="box"> | |
26 | <div class="title"> |
|
|||
27 | ${self.repo_group_page_title(c.repo_group)} |
|
|||
28 | </div> |
|
|||
29 |
|
||||
30 | <div class="sidebar-col-wrapper"> |
|
26 | <div class="sidebar-col-wrapper"> | |
31 | ##main |
|
27 | ##main | |
32 | <div class="sidebar"> |
|
28 | <div class="sidebar"> |
@@ -77,6 +77,14 b'' | |||||
77 | <%def name="admin_menu(active=None)"> |
|
77 | <%def name="admin_menu(active=None)"> | |
78 | <div id="context-bar"> |
|
78 | <div id="context-bar"> | |
79 | <div class="wrapper"> |
|
79 | <div class="wrapper"> | |
|
80 | <div class="title"> | |||
|
81 | <div class="title-content"> | |||
|
82 | <div class="title-main"> | |||
|
83 | Admin Panel | |||
|
84 | </div> | |||
|
85 | </div> | |||
|
86 | </div> | |||
|
87 | ||||
80 | <ul id="context-pages" class="navigation horizontal-list"> |
|
88 | <ul id="context-pages" class="navigation horizontal-list"> | |
81 | <% |
|
89 | <% | |
82 | repositories=c.rhodecode_user.repositories_admin |
|
90 | repositories=c.rhodecode_user.repositories_admin | |
@@ -118,7 +126,6 b'' | |||||
118 | </div> |
|
126 | </div> | |
119 | </%def> |
|
127 | </%def> | |
120 |
|
128 | |||
121 |
|
||||
122 | <%def name="dt_info_panel(elements)"> |
|
129 | <%def name="dt_info_panel(elements)"> | |
123 | <dl class="dl-horizontal"> |
|
130 | <dl class="dl-horizontal"> | |
124 | %for dt, dd, title, show_items in elements: |
|
131 | %for dt, dd, title, show_items in elements: | |
@@ -148,7 +155,6 b'' | |||||
148 | </dl> |
|
155 | </dl> | |
149 | </%def> |
|
156 | </%def> | |
150 |
|
157 | |||
151 |
|
||||
152 | <%def name="gravatar(email, size=16)"> |
|
158 | <%def name="gravatar(email, size=16)"> | |
153 | <% |
|
159 | <% | |
154 | if (size > 16): |
|
160 | if (size > 16): | |
@@ -202,7 +208,7 b'' | |||||
202 |
|
208 | |||
203 | ## FORKED |
|
209 | ## FORKED | |
204 | %if repo_instance.fork: |
|
210 | %if repo_instance.fork: | |
205 | <p> |
|
211 | <p class="discreet"> | |
206 | <i class="icon-code-fork"></i> ${_('Fork of')} |
|
212 | <i class="icon-code-fork"></i> ${_('Fork of')} | |
207 | ${h.link_to_if(c.has_origin_repo_read_perm,repo_instance.fork.repo_name, h.route_path('repo_summary', repo_name=repo_instance.fork.repo_name))} |
|
213 | ${h.link_to_if(c.has_origin_repo_read_perm,repo_instance.fork.repo_name, h.route_path('repo_summary', repo_name=repo_instance.fork.repo_name))} | |
208 | </p> |
|
214 | </p> | |
@@ -210,7 +216,7 b'' | |||||
210 |
|
216 | |||
211 | ## IMPORTED FROM REMOTE |
|
217 | ## IMPORTED FROM REMOTE | |
212 | %if repo_instance.clone_uri: |
|
218 | %if repo_instance.clone_uri: | |
213 | <p> |
|
219 | <p class="discreet"> | |
214 | <i class="icon-code-fork"></i> ${_('Clone from')} |
|
220 | <i class="icon-code-fork"></i> ${_('Clone from')} | |
215 | <a href="${h.safe_str(h.hide_credentials(repo_instance.clone_uri))}">${h.hide_credentials(repo_instance.clone_uri)}</a> |
|
221 | <a href="${h.safe_str(h.hide_credentials(repo_instance.clone_uri))}">${h.hide_credentials(repo_instance.clone_uri)}</a> | |
216 | </p> |
|
222 | </p> | |
@@ -218,12 +224,12 b'' | |||||
218 |
|
224 | |||
219 | ## LOCKING STATUS |
|
225 | ## LOCKING STATUS | |
220 | %if repo_instance.locked[0]: |
|
226 | %if repo_instance.locked[0]: | |
221 | <p class="locking_locked"> |
|
227 | <p class="locking_locked discreet"> | |
222 | <i class="icon-repo-lock"></i> |
|
228 | <i class="icon-repo-lock"></i> | |
223 | ${_('Repository locked by %(user)s') % {'user': h.person_by_id(repo_instance.locked[0])}} |
|
229 | ${_('Repository locked by %(user)s') % {'user': h.person_by_id(repo_instance.locked[0])}} | |
224 | </p> |
|
230 | </p> | |
225 | %elif repo_instance.enable_locking: |
|
231 | %elif repo_instance.enable_locking: | |
226 | <p class="locking_unlocked"> |
|
232 | <p class="locking_unlocked discreet"> | |
227 | <i class="icon-repo-unlock"></i> |
|
233 | <i class="icon-repo-unlock"></i> | |
228 | ${_('Repository not locked. Pull repository to lock it.')} |
|
234 | ${_('Repository not locked. Pull repository to lock it.')} | |
229 | </p> |
|
235 | </p> | |
@@ -359,6 +365,10 b'' | |||||
359 | <!--- REPO GROUP CONTEXT BAR --> |
|
365 | <!--- REPO GROUP CONTEXT BAR --> | |
360 | <div id="context-bar"> |
|
366 | <div id="context-bar"> | |
361 | <div class="wrapper"> |
|
367 | <div class="wrapper"> | |
|
368 | <div class="title"> | |||
|
369 | ${self.repo_group_page_title(c.repo_group)} | |||
|
370 | </div> | |||
|
371 | ||||
362 | <ul id="context-pages" class="navigation horizontal-list"> |
|
372 | <ul id="context-pages" class="navigation horizontal-list"> | |
363 | <li class="${is_active('home')}"><a class="menulink" href="${h.route_path('repo_group_home', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Group Home')}</div></a></li> |
|
373 | <li class="${is_active('home')}"><a class="menulink" href="${h.route_path('repo_group_home', repo_group_name=c.repo_group.group_name)}"><div class="menulabel">${_('Group Home')}</div></a></li> | |
364 | % if is_admin or group_admin: |
|
374 | % if is_admin or group_admin: |
General Comments 0
You need to be logged in to leave comments.
Login now