Download as
Browse Code »

Commit bef29f0797af43e1102579c75b598501555019fd

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

project, commits page with bootstrap

Showing 10 changed files with 225 additions and 500 deletions   Show diff stats
app/assets/javascripts/merge_requests.js
  Diff comments   View file @bef29f0
... ... @@ -4,17 +4,17 @@ var MergeRequest = {
4 4  
5 5 init:
6 6 function() {
7   - $(".merge-tabs a").live("click", function() {
8   - $(".merge-tabs a").removeClass("active");
9   - $(this).addClass("active");
  7 + $(".tabs a").live("click", function() {
  8 + $(".tabs a").parent().removeClass("active");
  9 + $(this).parent().addClass("active");
10 10 });
11 11  
12   - $(".merge-tabs a.merge-notes-tab").live("click", function() {
  12 + $(".tabs a.merge-notes-tab").live("click", function() {
13 13 $(".merge-request-commits, .merge-request-diffs").hide();
14 14 $(".merge-request-notes").show();
15 15 });
16 16  
17   - $(".merge-tabs a.merge-commits-tab").live("click", function() {
  17 + $(".tabs a.merge-commits-tab").live("click", function() {
18 18 if(!MergeRequest.commits_loaded) {
19 19 MergeRequest.loadCommits();
20 20 }
... ... @@ -22,7 +22,7 @@ var MergeRequest = {
22 22 $(".merge-request-commits").show();
23 23 });
24 24  
25   - $(".merge-tabs a.merge-diffs-tab").live("click", function() {
  25 + $(".tabs a.merge-diffs-tab").live("click", function() {
26 26 if(!MergeRequest.diffs_loaded) {
27 27 MergeRequest.loadDiff();
28 28 }
... ...
app/assets/stylesheets/buttons.scss
  Diff comments   View file @bef29f0
... ... @@ -116,26 +116,3 @@ input.button{margin-bottom: 1.5em}
116 116 .button-green{background: #A6B807; color: white}
117 117  
118 118  
119   -.commit-button{
120   - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
121   - background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
122   - background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
123   - background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
124   - box-shadow: 0 -1px 0 white inset;
125   - display: block;
126   - border: 1px solid #eee;
127   - border-radius: 5px;
128   - margin-bottom: 2px;
129   - position: relative;
130   - padding-right: 20px !important;
131   -}
132   -
133   -.commit-button i{
134   - background: url('images.png') no-repeat -138px -27px;
135   - width: 6px;
136   - height: 9px;
137   - float: right;
138   - position: absolute;
139   - top: 6px;
140   - right: 5px;
141   -}
... ...
app/assets/stylesheets/commits.css.scss
  Diff comments   View file @bef29f0
1   -/* Commit Page */
2   -.commit-info{float: right;}
3   -.commit-info data{
4   - padding: 4px 10px;
5   - font-size: 11px;
6   -}
7   -.commits-date {display: block; width: 100%; margin-bottom: 20px}
8   -.commits-date .data {padding: 0}
9   -a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
10   -a.commit {padding: 10px; border-bottom: none; overflow: hidden; display: block;}
11   -a.commit:last-child{border-bottom: 0}
12   -a.commit img{float: left; margin-right: 10px;}
13   -a.commit .commit-title{display: block;}
14   -a.commit .commit-title{margin-bottom: 10px}
15   -a.commit .commit-author{color: #999; font-weight: normal; font-style: italic;}
16   -a.commit .commit-author strong{font-weight: bold; font-style: normal;}
  1 +/**
  2 + *
  3 + * COMMIT SHOw
  4 + *
  5 + */
  6 +
17 7  
18   -/* eo Commit Page */
19   -/** Commit diff view **/
20 8 .diff_file {
21 9 border:1px solid #CCC;
22 10 margin-bottom:1em;
... ... @@ -49,6 +37,11 @@ a.commit .commit-author strong{font-weight: bold; font-style: normal;}
49 37 border:none;
50 38 margin:0px;
51 39 padding:0px;
  40 + tr {
  41 + td {
  42 + font-size:12px;
  43 + }
  44 + }
52 45 }
53 46 .old_line, .new_line {
54 47 margin:0px;
... ... @@ -87,14 +80,6 @@ a.commit .commit-author strong{font-weight: bold; font-style: normal;}
87 80 }
88 81 }
89 82  
90   -pre.commit_message {
91   - white-space: pre-wrap;
92   - font-family: "Helvetica", sans-serif;
93   - color: #555;
94   - font-weight:bold;
95   - font-size:15px;
96   -}
97   -
98 83 /** COMMIT BLOCK **/
99 84 .commit-title{display: block;}
100 85 .commit-title{margin-bottom: 10px}
... ... @@ -124,45 +109,50 @@ ul.bordered-list li:last-child { border:none }
124 109 }
125 110 }
126 111  
127   -.per_line_form {
128   - font-family: "Helvetica", sans-serif;
129   - background: #2FA0BB;
130   -
131   - td {
132   - padding:0;
133   - }
134 112  
135   - form {
136   - margin:5px;
137   - width: 756px;
138   - border: 1px solid #CCC;
139   - padding: 20px;
140   - background: white;
141   - }
  113 +tr.line_notes_row {
  114 + border-bottom:1px solid #DDD;
142 115 }
143 116  
  117 +/**
  118 + *
  119 + * COMMIT LIST
  120 + *
  121 + */
144 122  
145   -tr.line_notes_row {
146   - font-family: "Helvetica", sans-serif;
147   - &:hover {
148   - background:none;
149   - }
150   - td {
151   - margin:0px;
152   - padding:0px;
153   - border-bottom:1px solid #DEE2E3;
154   -
  123 +.commit-info{float: right;}
  124 +.commit-info data{
  125 + padding: 4px 10px;
  126 + font-size: 11px;
  127 +}
  128 +a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  129 +a.commit:last-child {border-bottom: 0}
  130 +a.commit img{float: left; margin-right: 10px;}
  131 +a.commit .commit-title{display: block;}
  132 +a.commit .commit-title{margin-bottom: 10px}
  133 +a.commit .commit-author{color: #999; font-weight: normal; font-style: italic;}
  134 +a.commit .commit-author strong{font-weight: bold; font-style: normal;}
155 135  
156   - ul {
157   - display:block;
158   - list-style:none;
159   - margin:0px;
160   - padding:0px;
  136 +.commit-button{
  137 + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
  138 + background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
  139 + background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
  140 + background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
  141 + box-shadow: 0 -1px 0 white inset;
  142 + display: block;
  143 + border: 1px solid #eee;
  144 + border-radius: 5px;
  145 + margin-bottom: 2px;
  146 + position: relative;
  147 + padding-right: 20px !important;
  148 +}
161 149  
162   - li {
163   - border-top:1px solid #DEE2E3;
164   - padding:10px;
165   - }
166   - }
167   - }
  150 +.commit-button i{
  151 + background: url('images.png') no-repeat -138px -27px;
  152 + width: 6px;
  153 + height: 9px;
  154 + float: right;
  155 + position: absolute;
  156 + top: 6px;
  157 + right: 5px;
168 158 }
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @bef29f0
... ... @@ -9,7 +9,8 @@ $active_bg_color:#79C3E0;
9 9 $active_bd_color: #2FA0BB;
10 10 $border_color:#CCC;
11 11 $lite_border_color:#EEE;
12   -$app_width:980px;
  12 +$min_app_width:940px;
  13 +$max_app_width:980px;
13 14 $app_padding:20px;
14 15 $bg_color: #FFF;
15 16 $styled_border_color: #2FA0BB;
... ... @@ -90,58 +91,40 @@ $blue_link: "#2fa0bb";
90 91 /** LAYOUT **/
91 92  
92 93 .container-fluid {
93   - max-width:980px;
  94 + min-width:$min_app_width;
  95 + max-width:$max_app_width;
94 96 margin:auto;
95   - margin-top:80px;
  97 + margin-top:60px;
96 98 }
97 99  
98 100 .container-fluid > .sidebar {
99   - width: 110px;
100   - left: 0;
101   - top: 0;
102   - height: 100%;
103   - bottom: 0;
104   - position: absolute;
105   - float: left;
106   - display: inline-block;
107   - background: #FFF;
108   - padding: $app_padding;
109   - padding-right:0px;
110   - margin: 0;
  101 + width: 140px;
111 102 border-right: 1px solid $border_color;
112   -
113   - aside {
114   - width: 109px
115   - }
  103 + height:100%;
116 104 }
117 105  
118 106 .container-fluid > .content {
119   - margin-left: 130px;
120   -}
121   -
122   -/** GITLAB reset **/
123   -a {
124   - color: $link_color;
125   - &:hover { text-decoration:none; }
  107 + margin-left: 160px;
126 108 }
127 109  
  110 +@import "reset_bootstrap.scss";
128 111 @import "top_panel.scss";
129 112 @import "projects.css.scss";
130   -
131   -@import "style.scss";
132 113 @import "commits.css.scss";
133   -@import "notes.css.scss";
134   -@import "merge_requests.css.scss";
135 114  
136   -@import "issues.css.scss";
137   -@import "commits.css.scss";
  115 +//@import "style.scss";
  116 +//@import "notes.css.scss";
  117 +//@import "merge_requests.css.scss";
  118 +
  119 +//@import "issues.css.scss";
  120 +//@import "commits.css.scss";
138 121  
139   -@import "dashboard.scss";
140   -@import "tree.scss";
141   -@import "tags.scss";
142   -@import "buttons.scss";
  122 +//@import "dashboard.scss";
  123 +//@import "tree.scss";
  124 +//@import "tags.scss";
  125 +//@import "buttons.scss";
143 126  
144 127 /** CODE HIGHTLIGHT **/
145   -@import "highlight.css.scss";
146   -@import "highlight.black.css.scss";
  128 +//@import "highlight.css.scss";
  129 +//@import "highlight.black.css.scss";
147 130  
... ...
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @bef29f0
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;
  1 +.git_url_wrapper {
  2 + margin-right:50px
  3 +}
8 4  
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;
  5 +.sidebar {
  6 + .fixed {
  7 + position:fixed;
11 8 }
12   - &.current {
13   - color: white;
14   - background: $active_bg_color;
15   - border: 1px solid $active_bd_color;
16   - border-radius:5px;
17 9  
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;
  10 + aside a {
  11 + display:block;
  12 + position:relative;
  13 + padding:15px 10px;
  14 + margin:10px 0 0 0;
  15 + font-size:13px;
  16 + font-weight:bold;
25 17 }
26 18 }
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 19 .file_stats {
34 20 span {
35 21 img {
36 22 width:14px;
37 23 float:left;
38   - margin-right: 6px;
  24 + margin-right:6px;
39 25 padding:2px 0;
40 26 }
41 27 }
42 28 }
43 29  
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;
  30 +.handle:hover {
  31 + cursor:move;
74 32 }
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 33 .project-refs-form {
91 34 span {
92   - background: none !important;
  35 + background:none !important;
93 36 position:static !important;
94 37 width:auto !important;
95   - height: auto !important;
  38 + height:auto !important;
96 39 }
97 40 }
98   -
99 41 .project-refs-select {
100 42 width:200px;
101 43 }
102 44  
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   - }
  45 +/* Project Dashboard Page */
  46 +.news-feed h2 {
  47 + float:left;
112 48 }
113   -
114   -/** NEW PROJECT **/
115   -.new-project-hodler {
116   - .icon span { background-position: -31px -70px; }
117   - td { border-bottom: 1px solid #DEE2E3; }
  49 +.news-feed .project-updates {
  50 + margin-bottom:20px;
  51 + display:block;
  52 + width:100%;
118 53 }
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 }
  54 +.news-feed .project-updates .data {
  55 + padding:0
130 56 }
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);
  57 +.news-feed .project-updates a.project-update {
  58 + padding:10px;
  59 + border-bottom:1px solid #eee;
  60 + overflow:hidden;
  61 + display:block;
  62 +}
  63 +.news-feed .project-updates a.project-update:last-child {
  64 + border-bottom:0
  65 +}
  66 +.news-feed .project-updates a.project-update img {
  67 + float:left;
137 68 margin-right:10px;
138   - font-size:1.5em;
139   - height:auto;
  69 +}
  70 +.news-feed .project-updates a.project-update span.update-title,.dashboard-page .news-feed .project-updates li a span.update-author {
  71 + display:block;
  72 +}
  73 +.news-feed .project-updates a.project-update span.update-title {
  74 + margin-bottom:10px
  75 +}
  76 +.news-feed .project-updates a.project-update span.update-author {
  77 + color:#999;
  78 + font-weight:normal;
  79 + font-style:italic;
  80 +}
  81 +.news-feed .project-updates a.project-update span.update-author strong {
140 82 font-weight:bold;
141   - .ui-selectmenu-status {
142   - padding:3px 10px;
143   - }
  83 + font-style: normal;
144 84 }
145   -
146   -#holder {
147   - background:#FAFAFA;
148   - border: 1px solid #EEE;
149   - cursor: move;
150   - height: 70%;
151   - overflow: hidden;
  85 +/** UPDATE ITEM **/
  86 +.update-data {
  87 + padding:0
152 88 }
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;
  89 +.update-data {
  90 + width:100%;
192 91 }
193   -
194   -body table.no-borders tr,
195   -body table.no-borders td{
196   - border:none;
  92 +a.update-item {
  93 + padding:10px;
  94 + border-bottom:1px solid #eee;
  95 + overflow:hidden;
  96 + display:block;
197 97 }
198   -
  98 +a.update-item:last-child {
  99 + border-bottom:0
  100 +}
  101 +a.update-item img {
  102 + float:left;
  103 + margin-right:10px;
  104 +}
  105 +a.update-item span.update-title,.dashboard-page .news-feed .project-updates li a span.update-author {
  106 + display:block;
  107 +}
  108 +a.update-item span.update-title {
  109 + margin-bottom:10px
  110 +}
  111 +a.update-item span.update-author {
  112 + color:#999;
  113 + font-weight:normal;
  114 + font-style:italic;
  115 +}
  116 +a.update-item span.update-author strong {
  117 + font-weight:bold;
  118 + font-style:normal;
  119 +}
  120 +/** END UPDATE ITEM **/
199 121 .ajax-tab-loading {
200 122 padding:40px;
201 123 display:none;
202 124 }
203   -
204   -#tree-content-holder { float:left; width:100%; }
205   -
  125 +#tree-content-holder {
  126 + float:left;
  127 + width:100%;
  128 +}
206 129 #tree-readme-holder {
207 130 float:left;
208 131 width:100%;
209   -
210 132 .readme {
211 133 @include round-borders-all(4px);
212   - padding: 4px 15px;
213   - background:#F7F7F7;
  134 + padding:4px 15px;
  135 + background: #F7F7F7;
214 136 }
215 137 }
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;
  138 +.dashboard-loader {
265 139 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;
  140 + margin:10px;
283 141 display:none;
284 142 }
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   - }
  143 +.user-mention {
  144 + color:#2FA0BB;
  145 + font-weight:bold;
361 146 }
362 147  
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;
  148 +a.project-update.titled {
  149 + position:relative;
  150 + padding-left:35% !important;
  151 + .title-block {
  152 + padding:10px;
  153 + width:35%;
  154 + position:absolute;
  155 + left:0;
  156 + top:0;
373 157 }
374 158 }
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 0 → 100644
  Diff comments   View file @bef29f0
... ... @@ -0,0 +1,4 @@
  1 +a {
  2 + color: $link_color;
  3 + &:hover { text-decoration:none; }
  4 +}
... ...
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @bef29f0
... ... @@ -65,7 +65,8 @@ body header {
65 65  
66 66 .wrapper {
67 67 margin:auto;
68   - width:$app_width;
  68 + min-width:$min_app_width;
  69 + max-width:$max_app_width;
69 70 position:relative;
70 71  
71 72 .top_panel_content {
... ... @@ -185,10 +186,9 @@ float: right;
185 186 }
186 187  
187 188 .account-box.hover{height: 138px;}
188   -
189 189 .account-box:hover > .account-links{display: block;}
190   -header .account-links{
191   - background: #79C3E0; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;}
  190 +header .account-links{ background: #79C3E0; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;}
  191 +
192 192 header .account-links:before {
193 193 content: ".";
194 194 width:0;
... ... @@ -196,7 +196,7 @@ header .account-links:before {
196 196 position:absolute;
197 197 border:5px solid transparent;
198 198 border-color:rgba(255,255,255,0);
199   - border-bottom-color:#fafafa;
  199 + border-bottom-color:#333;
200 200 text-indent:-9999px;
201 201 top:-10px;
202 202 line-height:0;
... ... @@ -204,17 +204,22 @@ header .account-links:before {
204 204 z-index:10;
205 205 }
206 206  
207   -/* Inspired by http://maxvoltar.com/temp/nowplaying/ */
208   -header .account-links{background: white; display: none; z-index: 100000; border-radius: 5px; width: 100px; position: absolute; right: 20px; top: 46px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); }
209   -header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee}
210   -header .account-links a:hover{
211   - background: #3aacec;
212   - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#39acec), to(#279ada), color-stop(.05, #4cbefe));
213   - background: -moz-linear-gradient(top, #39acec, #4cbefe 5%, #279ada);
214   - background: linear-gradient(top, #39acec, #4cbefe 5%, #279ada);
215   - color: #fff;
216   - text-shadow: #1488c8 0 -1px 0;
  207 +header .account-links{
  208 + background: #333;
  209 + display: none;
  210 + z-index: 100000;
  211 + border-radius: 5px;
  212 + width: 100px;
  213 + position: absolute;
  214 + right: 20px;
  215 + top: 46px;
  216 + margin-top: 0;
  217 + float: right;
  218 + box-shadow: 0 1px 1px rgba(0,0,0,.2);
217 219 }
  220 +
  221 +header .account-links a{color: #EEE; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #555}
  222 +header .account-links a:hover{ background: #444;}
218 223 .account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute}
219 224 header .account-links a:first-child{
220 225 -webkit-border-top-left-radius: 5px;
... ...
app/views/layouts/_project_side.html.haml
  Diff comments   View file @bef29f0
... ... @@ -13,7 +13,5 @@
13 13 Issues
14 14 = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
15 15 Wall
16   - - if @project.common_notes.today.count > 0
17   - %span{ :class => "number" }= @project.common_notes.today.count
18 16 = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
19 17 Requests
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @bef29f0
... ... @@ -26,31 +26,26 @@
26 26 = @merge_request.created_at.stamp("Aug 21, 2011 9:23pm")
27 27  
28 28 %hr
29   - %br
30   - %h3
31   - = simple_format @merge_request.title
  29 + %div.well= simple_format @merge_request.title
32 30  
33   -.clear
34   -%br
35   -%br
36 31  
37   -.merge-tabs
38   - = link_to "#notes", :class => "merge-notes-tab active tab" do
39   - %span
40   - Notes
41   - = link_to "#commits", "data-url" => commits_project_merge_request_path(@project, @merge_request), :class => "merge-commits-tab tab" do
42   - %span
43   - Commits
44   - = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
45   - %span
46   - Diff
  32 +.tabs
  33 + %li.active
  34 + = link_to "#notes", :class => "merge-notes-tab tab" do
  35 + Notes
  36 + %li
  37 + = link_to "#commits", "data-url" => commits_project_merge_request_path(@project, @merge_request), :class => "merge-commits-tab tab" do
  38 + Commits
  39 + %li
  40 + = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
  41 + Diff
47 42  
48 43 - if can?(current_user, :admin_project, @project) || @merge_request.author == current_user
49 44 .right
50 45 - if @merge_request.closed
51   - = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "red-button"
  46 + = link_to 'Reopen', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => false }, :status_only => true), :method => :put, :class => "btn"
52 47 - else
53   - = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "positive-button", :title => "Close merge request"
  48 + = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn", :title => "Close merge request"
54 49 %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
55 50  
56 51 .merge-request-notes
... ...
app/views/refs/_tree.html.haml
  Diff comments   View file @bef29f0
1   -#tree-breadcrumbs
2   - %div
  1 +%ul.breadcrumb
  2 + %li
3 3 = link_to tree_project_ref_path(@project, @ref, :path => nil), :remote => true do
4 4 = @project.code
5   - - tree.breadcrumbs(6) do |link|
6   - \/
7   - = link
8   -  
  5 + - tree.breadcrumbs(6) do |link|
  6 + \/
  7 + %li= link
9 8 %span.tree_progress
10 9 .clear
11 10 #tree-content-holder
... ...