Download as
Browse Code »

Commit 2efc1068f05d54fec2d0dc0a08b91b8f2bc9e088

Authored by Dmitriy Zaporozhets
1 parent c90f1d5c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

css fixes for .entry class

Showing 6 changed files with 19 additions and 403 deletions   Show diff stats
app/assets/stylesheets/projects.css.scss.bak
View file @c90f1d5
... ... @@ -1,384 +0,0 @@
1   -.git_url_wrapper { margin-right:50px }
2   -
3   -.sidebar aside a{
4   - display: block;
5   - position: relative;
6   - padding: 15px 10px;
7   - margin: 10px 0 0 0;
8   -
9   - span.number{
10   - float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px;
11   - }
12   - &.current {
13   - color: white;
14   - background: $active_bg_color;
15   - border: 1px solid $active_bd_color;
16   - border-radius:5px;
17   -
18   - -webkit-border-top-right-radius: 0;
19   - -webkit-border-bottom-right-radius: 0;
20   - -moz-border-radius-topright: 0px;
21   - -moz-border-radius-bottomright: 0px;
22   - border-top-right-radius: 0;
23   - border-bottom-right-radius: 0;
24   - margin-right: -1px;
25   - }
26   -}
27   -
28   -body table .commit a{color: #{$blue_link}}
29   -body table th, body table td{ border-bottom: 1px solid #DEE2E3;}
30   -body .fixed{position: fixed; }
31   -
32   -/** File stat **/
33   -.file_stats {
34   - span {
35   - img {
36   - width:14px;
37   - float:left;
38   - margin-right: 6px;
39   - padding:2px 0;
40   - }
41   - }
42   -}
43   -
44   -.round-borders {
45   - @include round-borders-all(4px);
46   - padding: 4px 0px;
47   -}
48   -
49   -table.round-borders {
50   - float:left;
51   - text-align: left;
52   -}
53   -
54   -
55   -
56   -/** PROJECTS **/
57   -input.ssh_project_url {
58   - padding:5px;
59   - margin:0px;
60   - float:right;
61   - width:400px;
62   - text-align:center;
63   -}
64   -
65   -#projects-list .project {
66   - height:50px;
67   -}
68   -
69   -#tree-slider .tree-item,
70   -#projects-list .project,
71   -#snippets-table .snippet,
72   -#issues-table .issue{
73   - cursor:pointer;
74   -}
75   -
76   -.clear {
77   - clear: both;
78   -}
79   -
80   -
81   -
82   -#user_projects_limit{
83   - width: 60px;
84   -}
85   -
86   -.handle:hover{
87   - cursor: move;
88   -}
89   -
90   -.project-refs-form {
91   - span {
92   - background: none !important;
93   - position:static !important;
94   - width:auto !important;
95   - height: auto !important;
96   - }
97   -}
98   -
99   -.project-refs-select {
100   - width:200px;
101   -}
102   -
103   -.filter .left { margin-right:15px; }
104   -
105   -body table .commit {
106   - a.tree-commit-link {
107   - color:#444;
108   - &:hover {
109   - text-decoration:underline;
110   - }
111   - }
112   -}
113   -
114   -/** NEW PROJECT **/
115   -.new-project-hodler {
116   - .icon span { background-position: -31px -70px; }
117   - td { border-bottom: 1px solid #DEE2E3; }
118   -}
119   -
120   -/** Feed entry **/
121   -.commit,
122   -.snippet,
123   -.message {
124   - .title {
125   - color:#666;
126   - a { color:#666 !important; }
127   - p { margin-top:0px; }
128   - }
129   - .author { color: #999 }
130   -}
131   -
132   -/** JQuery UI **/
133   -.ui-autocomplete { @include round-borders-all(5px); }
134   -.ui-menu-item { cursor: pointer }
135   -.ui-selectmenu{
136   - @include round-borders-all(4px);
137   - margin-right:10px;
138   - font-size:1.5em;
139   - height:auto;
140   - font-weight:bold;
141   - .ui-selectmenu-status {
142   - padding:3px 10px;
143   - }
144   -}
145   -
146   -#holder {
147   - background:#FAFAFA;
148   - border: 1px solid #EEE;
149   - cursor: move;
150   - height: 70%;
151   - overflow: hidden;
152   -}
153   -
154   -/* Project Dashboard Page */
155   -html, body { height: 100%; }
156   -
157   -.news-feed h2{float: left;}
158   -.news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;}
159   -.news-feed .project-updates .data{ padding: 0}
160   -.news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
161   -.news-feed .project-updates a.project-update:last-child{border-bottom: 0}
162   -.news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
163   -.news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
164   -.news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px}
165   -.news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
166   -.news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
167   -/* eo Dashboard Page */
168   -
169   -
170   -/** Update entry **/
171   -.update-data { padding: 0 }
172   -.update-data { width:100%; }
173   -.update-data.ui-box .data { padding:0; }
174   -a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
175   -a.update-item:last-child{border-bottom: 0}
176   -a.update-item img{float: left; margin-right: 10px;}
177   -a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
178   -a.update-item span.update-title{margin-bottom: 10px}
179   -a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;}
180   -a.update-item span.update-author strong{font-weight: bold; font-style: normal;}
181   -
182   -
183   -body .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
184   -
185   -body.projects-page input.text.git-url.project_list_url { width:165px; }
186   -
187   -
188   -body table.no-borders th {
189   - background:none;
190   - border-bottom:1px solid #CCC;
191   - color:#333;
192   -}
193   -
194   -body table.no-borders tr,
195   -body table.no-borders td{
196   - border:none;
197   -}
198   -
199   -.ajax-tab-loading {
200   - padding:40px;
201   - display:none;
202   -}
203   -
204   -#tree-content-holder { float:left; width:100%; }
205   -
206   -#tree-readme-holder {
207   - float:left;
208   - width:100%;
209   -
210   - .readme {
211   - @include round-borders-all(4px);
212   - padding: 4px 15px;
213   - background:#F7F7F7;
214   - }
215   -}
216   -
217   -
218   -
219   -/* Commit Page */
220   -.entity-info {float: right;}
221   -.entity-button{
222   - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
223   - background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
224   - background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
225   - background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
226   - box-shadow: 0 -1px 0 white inset;
227   - display: block;
228   - border: 1px solid #eee;
229   - border-radius: 5px;
230   - margin-bottom: 2px;
231   - position: relative;
232   - padding: 4px 10px;
233   - font-size: 11px;
234   - padding-right: 20px;
235   -}
236   -
237   -.entity-button i{
238   - background: url('images.png') no-repeat -138px -27px;
239   - width: 6px;
240   - height: 9px;
241   - float: right;
242   - position: absolute;
243   - top: 6px;
244   - right: 5px;
245   -}
246   -.box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;}
247   -
248   -h4.dash-tabs {
249   - margin: 0;
250   - border-bottom: 1px solid #ccc;
251   - padding: 10px 10px;
252   - font-size: 11px;
253   - padding-left:20px;
254   - font-weight: bold; text-transform: uppercase;
255   - background: #F7F7F7;
256   - margin-bottom:20px;
257   - height:13px;
258   -
259   -}
260   -
261   -.dash-button {
262   - border-right: 1px solid #ddd;
263   - background:none;
264   - padding: 10px 15px;
265   - float:left;
266   - position:relative;
267   - top:-10px;
268   - left:0px;
269   - height:13px;
270   -
271   - &:first-child {
272   - border-left: 1px solid #ddd;
273   - }
274   - &.active {
275   - background: #eaeaea;
276   - }
277   -}
278   -
279   -
280   -.dashboard-loader {
281   - float:right;
282   - margin-right:30px;
283   - display:none;
284   -}
285   -
286   -
287   -.merge-tabs {
288   - margin: 0;
289   - border: 1px solid #ccc;
290   - padding: 5px;
291   - font-size: 12px;
292   - background: #F7F7F7;
293   - margin-bottom:20px;
294   - height:26px;
295   -
296   - -moz-border-radius: 4px;
297   - -webkit-border-radius: 4px;
298   - border-radius: 4px;
299   -
300   - .tab {
301   - font-weight: bold;
302   - border-right: 1px solid #ddd;
303   - background:none;
304   - padding: 10px;
305   - min-width:60px;
306   - float:left;
307   - position:relative;
308   - top:-5px;
309   - left:-5px;
310   - height:16px;
311   - padding-left:34px;
312   -
313   - span {
314   - width: 20px;
315   - height: 20px;
316   - display: inline-block;
317   - position: absolute;
318   - left: 8px;
319   - top: 8px;
320   - }
321   -
322   - &.active {
323   - background: #eaeaea;
324   - }
325   - }
326   -}
327   -.merge-tabs.repository .tab span{ background: url("images.png") no-repeat -38px -77px; }
328   -.activities-tab span { background: url("images.png") no-repeat -161px -1px; }
329   -.stat-tab span,
330   -.team-tab span,
331   -.snippets-tab span { background: url("images.png") no-repeat -38px -77px; }
332   -.files-tab span { background: url("images.png") no-repeat -112px -23px; }
333   -
334   -.merge-notes-tab span { background: url("images.png") no-repeat -161px -1px; }
335   -.merge-commits-tab span { background: url("images.png") no-repeat -86px 1px; }
336   -.merge-diffs-tab span { background: url("images.png") no-repeat -118px 1px; }
337   -.merge-tabs .dashboard-loader { padding:8px; }
338   -
339   -.user-mention {
340   - color: #2FA0BB;
341   - font-weight: bold;
342   -}
343   -
344   -.author {
345   - color: #999;
346   -}
347   -
348   -
349   -
350   -
351   -.dark_scheme_box {
352   - padding:20px 0;
353   -
354   - label {
355   - float:left;
356   - box-shadow: 0 0px 5px rgba(0,0,0,.3);
357   -
358   - img {
359   - }
360   - }
361   -}
362   -
363   -a.project-update.titled {
364   - position: relative;
365   - padding-left: 235px !important;
366   -
367   - .title-block {
368   - padding: 10px;
369   - width: 205px;
370   - position: absolute;
371   - left: 0;
372   - top: 0;
373   - }
374   -}
375   -
376   -.add_new {
377   - float: right;
378   - background: #A6B807;
379   - color: white;
380   - padding: 4px 10px;
381   - @include round-borders-all(4px);
382   - font-size:11px;
383   - margin: 10px 0;
384   -}
app/assets/stylesheets/reset_bootstrap.scss
  Diff comments   View file @2efc106
... ... @@ -11,28 +11,28 @@ a {
11 11 padding: 7px 15px;
12 12 margin-bottom: 18px;
13 13 color: #404040;
14   - background-color: #eedc94;
15   - background-repeat: repeat-x;
16   - background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
17   - background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
18   - background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
19   - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
20   - background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
21   - background-image: -o-linear-gradient(top, #fceec1, #eedc94);
22   - background-image: linear-gradient(top, #fceec1, #eedc94);
23   - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0);
  14 + filter:none;
  15 +
24 16 text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
25   - border-color: #eedc94 #eedc94 #e4c652;
26   - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%);
27 17 text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
28   - border-width: 1px;
29   - border-style: solid;
  18 +
30 19 -webkit-border-radius: 4px;
31 20 -moz-border-radius: 4px;
32 21 border-radius: 4px;
  22 +
33 23 -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
34 24 -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
35 25 box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
  26 +
36 27 background:#F1F1F1;
37   - border-color:#ccc;
  28 + border: 1px solid #ccc;
  29 +
  30 + p {
  31 + margin-bottom: 0;
  32 + img {
  33 + position:relative;
  34 + top:3px;
  35 + }
  36 + }
38 37 }
  38 +
... ...
app/views/dashboard/_issues_feed.html.haml
  Diff comments   View file @2efc106
1 1 - @issues.each do |issue|
2   - .alert-message.entry
  2 + .entry
3 3 = link_to [issue.project, issue] do
4 4 %p
5 5 %strong
... ...
app/views/dashboard/_merge_requests_feed.html.haml
  Diff comments   View file @2efc106
1 1 - @merge_requests.each do |merge_request|
2   - .alert-message.entry
  2 + .entry
3 3 = link_to [merge_request.project, merge_request] do
4 4 %p
5 5 %strong
... ...
app/views/projects/show.html.haml
  Diff comments   View file @2efc106
1 1 = render "project_head"
2 2 - @activities.each do |update|
3   - .alert-message.entry
  3 + .entry
4 4 = link_to dashboard_feed_path(@project, update) do
5 5 - if update.kind_of? Note
6 6 %p
... ...
app/views/repositories/_feed.html.haml
  Diff comments   View file @2efc106
1 1 - commit = update
2   -.alert-message.entry
  2 +.entry
3 3 = link_to project_commits_path(@project, :ref => commit.head.name) do
4 4 %p
5 5 %strong
... ...