Download as
Browse Code »

Commit fed0da80768a09ca54fc4dd0f9355a0429f2ab34

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

Cleaning css. layout is broken

Showing 15 changed files with 220 additions and 333 deletions   Show diff stats
app/assets/stylesheets/commits.css.scss
  Diff comments   View file @fed0da8
1 1 /* Commit Page */
2   -body.project-page.commits-page .commit-info{float: right;}
3   -body.project-page.commits-page .commit-info data{
  2 +.commit-info{float: right;}
  3 +.commit-info data{
4 4 padding: 4px 10px;
5 5 font-size: 11px;
6 6 }
7   -body.project-page.commits-page .commits-date {display: block; width: 100%; margin-bottom: 20px}
8   -body.project-page.commits-page .commits-date .data {padding: 0}
9   -body.project-page.commits-page a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
10   -body.project-page.commits-page .commits-date a.commit {padding: 10px; border-bottom: none; overflow: hidden; display: block;}
11   -body.project-page.commits-page .commits-date a.commit:last-child{border-bottom: 0}
12   -body.project-page.commits-page .commits-date a.commit img{float: left; margin-right: 10px;}
13   -body.project-page.commits-page .commits-date a.commit span.commit-title{display: block;}
14   -body.project-page.commits-page .commits-date a.commit span.commit-title{margin-bottom: 10px}
15   -body.project-page.commits-page .commits-date a.commit span.commit-author{color: #999; font-weight: normal; font-style: italic;}
16   -body.project-page.commits-page .commits-date a.commit span.commit-author strong{font-weight: bold; font-style: normal;}
  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;}
17 17  
18 18 /* eo Commit Page */
19 19 /** Commit diff view **/
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @fed0da8
1 1 @import "bootstrap";
2 2  
  3 +/** GITLAB colors **/
3 4 $text_color:#222;
4 5 $lite_text_color: #666;
5 6 $link_color:#111;
... ... @@ -86,38 +87,61 @@ $blue_link: "#2fa0bb";
86 87 padding:0 !important;
87 88 }
88 89  
89   -/* General */
  90 +/** LAYOUT **/
90 91  
91   -body.collapsed {
92   - background-color: $bg_color;
  92 +.container-fluid {
  93 + max-width:980px;
  94 + margin:auto;
  95 + margin-top:80px;
  96 +}
  97 +
  98 +.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;
  111 + border-right: 1px solid $border_color;
93 112  
94   - #container{
95   - margin: auto;
96   - margin-top:51px;
97   - width: $app_width;
98   - border-top: 0;
99   - background-color: $bg_color;
  113 + aside {
  114 + width: 109px
100 115 }
101 116 }
102 117  
  118 +.container-fluid > .content {
  119 + margin-left: 130px;
  120 +}
  121 +
  122 +/** GITLAB reset **/
103 123 a {
104 124 color: $link_color;
105 125 &:hover { text-decoration:none; }
106 126 }
107 127  
  128 +@import "top_panel.scss";
  129 +@import "projects.css.scss";
108 130  
109 131 @import "style.scss";
110   -@import "projects.css.scss";
111 132 @import "commits.css.scss";
112 133 @import "notes.css.scss";
113 134 @import "merge_requests.css.scss";
114   -@import "highlight.css.scss";
115   -@import "highlight.black.css.scss";
  135 +
116 136 @import "issues.css.scss";
117 137 @import "commits.css.scss";
118 138  
119   -@import "top_panel.scss";
120 139 @import "dashboard.scss";
121 140 @import "tree.scss";
122 141 @import "tags.scss";
123 142 @import "buttons.scss";
  143 +
  144 +/** CODE HIGHTLIGHT **/
  145 +@import "highlight.css.scss";
  146 +@import "highlight.black.css.scss";
  147 +
... ...
app/assets/stylesheets/dashboard.scss
  Diff comments   View file @fed0da8
1   -body.dashboard-page h2.icon span{ background-position: 9px -69px; }
2   -body.dashboard-page header{margin-bottom: 0}
3   -body.dashboard-page .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;}
4   -body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
5   -body.dashboard-page .news-feed h2{float: left;}
  1 +.application h2.icon span{ background-position: 9px -69px; }
  2 +.application header{margin-bottom: 0}
  3 +.application .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;}
  4 +.application .application-content{ position: relative; float: left; width: 100%; height: 100%; }
  5 +.application .news-feed h2{float: left;}
6 6  
7   -body.dashboard-page aside{
  7 +body.application aside{
8 8 min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 260px; float: left; border-right: 1px solid $border_color; padding:20px; padding-right:0;
9 9 h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
10 10 h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}
... ... @@ -15,13 +15,13 @@ body.dashboard-page aside{
15 15 .project-list li a span.arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999}
16 16 }
17 17  
18   -body.dashboard-page .news-feed .project-updates {
  18 +body.application .news-feed .project-updates {
19 19 margin-bottom: 20px; display: block; width: 100%;
20 20 .data{ padding: 0}
21 21 a.project-update {padding: 10px; overflow: hidden; display: block;}
22 22 a.project-update:last-child{border-bottom: 0}
23 23 a.project-update img{float: left; margin-right: 10px;}
24   - a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
  24 + a.project-update span.update-title, .application .news-feed .project-updates li a span.update-author{display: block;}
25 25 a.project-update span.update-title{margin-bottom: 10px}
26 26 a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
27 27 a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
... ...
app/assets/stylesheets/issues.css.scss
  Diff comments   View file @fed0da8
... ... @@ -58,20 +58,6 @@
58 58 padding: 0;
59 59 }
60 60  
61   -body.project-page .merge-request-form-holder table.no-borders tr,
62   -body.project-page .merge-request-form-holder table.no-borders td,
63   -body.project-page .issue-form-holder table.no-borders tr,
64   -body.project-page .issue-form-holder table.no-borders td,
65   -body.project-page .new_snippet table tr,
66   -body.project-page .new_snippet table td,
67   -body.project-page .edit_snippet table tr,
68   -body.project-page .edit_snippet table td
69   -{
70   - &:hover {
71   - background:none;
72   - }
73   -}
74   -
75 61  
76 62 #issues-table {
77 63 tr {
... ...
app/assets/stylesheets/notes.css.scss
  Diff comments   View file @fed0da8
... ... @@ -33,12 +33,12 @@
33 33 #notes-list .note .delete-note { display:none; }
34 34 #notes-list .note:hover .delete-note { display:block; }
35 35  
36   -body.project-page #notes-list .note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
37   -body.project-page #notes-list .note img{float: left; margin-right: 10px;}
38   -body.project-page #notes-list .note span.note-title{display: block;}
39   -body.project-page #notes-list .note span.note-title{margin-bottom: 10px}
40   -body.project-page #notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
41   -body.project-page #notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
  36 +#notes-list .note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
  37 +#notes-list .note img{float: left; margin-right: 10px;}
  38 +#notes-list .note span.note-title{display: block;}
  39 +#notes-list .note span.note-title{margin-bottom: 10px}
  40 +#notes-list .note span.note-author{color: #999; font-weight: normal; font-style: italic;}
  41 +#notes-list .note span.note-author strong{font-weight: bold; font-style: normal;}
42 42  
43 43  
44 44 .note .note-title { margin-left:55px; }
... ...
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @fed0da8
1   -body.project-page h2.icon .project-name, body.project-page h2.icon d{border: 1px solid #eee; padding: 5px 30px 5px 10px; border-radius: 5px; position: relative;}
2   -body.project-page h2.icon .project-name i.arrow{float: right;
3   - position: absolute;
4   - right: 10px;
5   - top: 13px;
6   - display: block;
7   - background: url('images.png') no-repeat -97px -29px;
8   - width: 4px;
9   - height: 5px;
10   -}
11   -
12   -body.project-page h2.icon span{ background-position: -78px -68px; }
13   -body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; padding-bottom: 10px;}
14   -body.project-page .page-title{margin-bottom: 0}
15   -
16   -body.project-page .project-sidebar {
17   - width: 110px;
18   - left: 0;
19   - top: 0;
20   - height: 100%;
21   - bottom: 0;
22   - position: absolute;
23   - float: left;
24   - display: inline-block;
25   - background: #FFF;
26   - padding: $app_padding;
27   - padding-right:0px;
28   - margin: 0;
29   - border-right: 1px solid $border_color;
30   -}
31   -
32   -body.projects-page input.text.git-url { font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 0 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px; width: 136px}
33   -body.projects-page input.text.git-url {margin:10px 0 0 }
34 1 .git_url_wrapper { margin-right:50px }
35 2  
36   -.projects_selector:hover > .project-box{ -moz-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); -webkit-box-shadow:0px 0px 10px rgba(0, 0, 0, .1); box-shadow:0px 0px 10px rgba(0, 0, 0, .1); }
37   -
38   -
39   -/* New project Page */
40   -.new-project-page .container table{background: white}
41   -body.project-page .project-sidebar aside{width: 109px}
42   -body.project-page .project-sidebar aside a{
  3 +.sidebar aside a{
43 4 display: block;
44 5 position: relative;
45 6 padding: 15px 10px;
46 7 margin: 10px 0 0 0;
47 8  
48   -
49   -}
50   -body.project-page .project-sidebar aside a span.number{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}
51   -body.project-page .project-sidebar aside a.current {
52   - color: white;
53   - background: $active_bg_color;
54   - border: 1px solid $active_bd_color;
55   - border-radius:5px;
56   -
57   -
58   - -webkit-border-top-right-radius: 0;
59   - -webkit-border-bottom-right-radius: 0;
60   - -moz-border-radius-topright: 0px;
61   - -moz-border-radius-bottomright: 0px;
62   - border-top-right-radius: 0;
63   - border-bottom-right-radius: 0;
64   - margin-right: -1px;
  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 + }
65 26 }
66   -body.project-page .project-content{ padding: $app_padding; display: block; margin-left: 130px; min-height: 600px}
67   -body.project-page .project-content h2{ margin-top: 6px}
68   -body.project-page .project-content .button.right{margin-left: 20px}
69   -body.project-page table .commit a{color: #{$blue_link}}
70   -body.project-page table th, body.project-page table td{ border-bottom: 1px solid #DEE2E3;}
71   -body.project-page .fixed{position: fixed; }
72   -
73   -
74 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; }
75 31  
76 32 /** File stat **/
77 33 .file_stats {
... ... @@ -146,7 +102,7 @@ input.ssh_project_url {
146 102  
147 103 .filter .left { margin-right:15px; }
148 104  
149   -body.project-page table .commit {
  105 +body table .commit {
150 106 a.tree-commit-link {
151 107 color:#444;
152 108 &:hover {
... ... @@ -187,22 +143,6 @@ body.project-page table .commit {
187 143 }
188 144 }
189 145  
190   -/** Snippets **/
191   -.new_snippet textarea,
192   -.edit_snippet textarea {
193   - height:300px;
194   - padding: 8px;
195   - width: 95%;
196   -}
197   -.snippet .action-links {
198   - display:none;
199   - a {
200   - margin-left:10px;
201   - }
202   -}
203   -.snippet:hover .action-links { display:block; }
204   -
205   -
206 146 #holder {
207 147 background:#FAFAFA;
208 148 border: 1px solid #EEE;
... ... @@ -214,31 +154,19 @@ body.project-page table .commit {
214 154 /* Project Dashboard Page */
215 155 html, body { height: 100%; }
216 156  
217   -body.dashboard.project-page .news-feed h2{float: left;}
218   -body.dashboard.project-page .news-feed .project-updates {margin-bottom: 20px; display: block; width: 100%;}
219   -body.dashboard.project-page .news-feed .project-updates .data{ padding: 0}
220   -body.dashboard.project-page .news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
221   -body.dashboard.project-page .news-feed .project-updates a.project-update:last-child{border-bottom: 0}
222   -body.dashboard.project-page .news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
223   -body.dashboard.project-page .news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
224   -body.dashboard.project-page .news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px}
225   -body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
226   -body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
  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;}
227 167 /* eo Dashboard Page */
228 168  
229 169  
230   -/** Merge requests */
231   -body.project-page .merge-request-commits {margin-bottom: 20px; display: block; width: 100%;}
232   -body.project-page .merge-request-commits .data{ padding: 0}
233   -body.project-page .merge-request-commits a.commit {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
234   -body.project-page .merge-request-commits a.commit:last-child{border-bottom: 0}
235   -body.project-page .merge-request-commits a.commit img{float: left; margin-right: 10px;}
236   -body.project-page .merge-request-commits a.commit span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
237   -body.project-page .merge-request-commits a.commit span.update-title{margin-bottom: 10px}
238   -body.project-page .merge-request-commits a.commit span.update-author{color: #999; font-weight: normal; font-style: italic;}
239   -body.project-page .merge-request-commits a.commit span.update-author strong{font-weight: bold; font-style: normal;}
240   -
241   -
242 170 /** Update entry **/
243 171 .update-data { padding: 0 }
244 172 .update-data { width:100%; }
... ... @@ -252,19 +180,19 @@ a.update-item span.update-author{color: #999; font-weight: normal; font-style: i
252 180 a.update-item span.update-author strong{font-weight: bold; font-style: normal;}
253 181  
254 182  
255   -body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
  183 +body .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
256 184  
257 185 body.projects-page input.text.git-url.project_list_url { width:165px; }
258 186  
259 187  
260   -body.project-page table.no-borders th {
  188 +body table.no-borders th {
261 189 background:none;
262 190 border-bottom:1px solid #CCC;
263 191 color:#333;
264 192 }
265 193  
266   -body.project-page table.no-borders tr,
267   -body.project-page table.no-borders td{
  194 +body table.no-borders tr,
  195 +body table.no-borders td{
268 196 border:none;
269 197 }
270 198  
... ... @@ -454,9 +382,3 @@ a.project-update.titled {
454 382 font-size:11px;
455 383 margin: 10px 0;
456 384 }
457   -
458   -
459   -
460   -.new-project-hodler {
461   - padding:20px;
462   -}
... ...
app/assets/stylesheets/style.scss
  Diff comments   View file @fed0da8
... ... @@ -365,93 +365,6 @@ header{margin-bottom: 0; clear: both; position:relative;}
365 365 .page-title a.grey-button{float: right;}
366 366 .right{float: right;}
367 367  
368   -/* Account box */
369   -header .account-box{
370   - position: absolute;
371   - right: 0;
372   - top: 8px;
373   - z-index: 10000;
374   - width: 128px;
375   - font-size: 11px;
376   - float: right;
377   - display: block;
378   - cursor: pointer;}
379   -header .account-box img{
380   - border-radius: 4px;
381   - right: 20px;
382   - position: absolute;
383   - width: 33px; height: 33px;
384   - display: block; top:0;}
385   -header .account-box img:after{
386   - content: " ";
387   - display: block;
388   - position: absolute;
389   - top: 0;
390   - right: 0;
391   -left: 0;
392   - bottom: 0;
393   -float: right;
394   - border-radius: 5px;
395   - border: 1px solid rgba(255, 255, 255, .1);
396   - border-bottom: 0;
397   - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
398   - background: -moz-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
399   - background: linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
400   - -webkit-background-origin: border-box;
401   - -moz-background-origin: border;
402   - background-origin: border-box;
403   -}
404   -
405   -.account-box.hover{height: 138px;}
406   -
407   -.account-box:hover > .account-links{display: block;}
408   -header .account-links{
409   - 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;}
410   -header .account-links:before {
411   - content: ".";
412   - width:0;
413   - height:0;
414   - position:absolute;
415   - border:5px solid transparent;
416   - border-color:rgba(255,255,255,0);
417   - border-bottom-color:#fafafa;
418   - text-indent:-9999px;
419   - top:-10px;
420   - line-height:0;
421   - right:10px;
422   - z-index:10;
423   -}
424   -
425   -/* Inspired by http://maxvoltar.com/temp/nowplaying/ */
426   -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); }
427   -header .account-links a{color: #666; padding: 6px 10px; display: block; text-shadow: none; border-bottom: 1px solid #eee}
428   -header .account-links a:hover{
429   - background: #3aacec;
430   - background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#39acec), to(#279ada), color-stop(.05, #4cbefe));
431   - background: -moz-linear-gradient(top, #39acec, #4cbefe 5%, #279ada);
432   - background: linear-gradient(top, #39acec, #4cbefe 5%, #279ada);
433   - color: #fff;
434   - text-shadow: #1488c8 0 -1px 0;
435   -}
436   -.account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute}
437   -header .account-links a:first-child{
438   - -webkit-border-top-left-radius: 5px;
439   - -webkit-border-top-right-radius: 5px;
440   - -moz-border-radius-topleft: 5px;
441   - -moz-border-radius-topright: 5px;
442   - border-top-left-radius: 5px;
443   - border-top-right-radius: 5px;
444   -}
445   -
446   -header .account-links a:last-child{
447   - -webkit-border-bottom-right-radius: 5px;
448   - -webkit-border-bottom-left-radius: 5px;
449   - -moz-border-radius-bottomright: 5px;
450   - -moz-border-radius-bottomleft: 5px;
451   - border-bottom-right-radius: 5px;
452   - border-bottom-left-radius: 5px;
453   - border-bottom: 0;
454   -}
455 368  
456 369 .big-message{
457 370 background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.041, #eccb40), to(#ffee4d));
... ... @@ -592,29 +505,6 @@ body, button, input, select, textarea {
592 505 font-family: "helvetica", "arial", "freesans", "clean", sans-serif;
593 506 }
594 507  
595   -/** FORM INPUTS **/
596   -.new_merge_request,
597   -.edit_merge_request,
598   -.user_new,
599   -.new_key,
600   -.new_issue,
601   -.new_note,
602   -.edit_user,
603   -.edit_issue,
604   -.new_project,
605   -.new_snippet,
606   -.edit_snippet,
607   -.edit_project {
608   - input[type='text'],
609   - input[type='email'],
610   - input[type='password'],
611   - textarea {
612   - width:400px;
613   - padding:8px;
614   - font-size:14px;
615   - @include round-borders-all(4px);
616   - }
617   -}
618 508  
619 509 .text_field {
620 510 width:400px;
... ...
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @fed0da8
... ... @@ -144,3 +144,93 @@ body header {
144 144 border-radius:3px;
145 145 float:left;
146 146 }
  147 +
  148 +
  149 +
  150 +/* Account box */
  151 +header .account-box{
  152 + position: absolute;
  153 + right: 0;
  154 + top: 8px;
  155 + z-index: 10000;
  156 + width: 128px;
  157 + font-size: 11px;
  158 + float: right;
  159 + display: block;
  160 + cursor: pointer;}
  161 +header .account-box img{
  162 + border-radius: 4px;
  163 + right: 20px;
  164 + position: absolute;
  165 + width: 33px; height: 33px;
  166 + display: block; top:0;}
  167 +header .account-box img:after{
  168 + content: " ";
  169 + display: block;
  170 + position: absolute;
  171 + top: 0;
  172 + right: 0;
  173 +left: 0;
  174 + bottom: 0;
  175 +float: right;
  176 + border-radius: 5px;
  177 + border: 1px solid rgba(255, 255, 255, .1);
  178 + border-bottom: 0;
  179 + background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(255, 255, 255, .15)), to(rgba(0, 0, 0, .25))), -webkit-gradient(linear, left top, right bottom, color-stop(0, rgba(255, 255, 255, 0)), color-stop(0.5, rgba(255, 255, 255, .1)), color-stop(0.501, rgba(255, 255, 255, 0)), color-stop(1, rgba(255, 255, 255, 0)));
  180 + background: -moz-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), -moz-linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
  181 + background: linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .25)), linear-gradient(left top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1) 50%, rgba(255, 255, 255, 0) 50%, rgba(255, 255, 255, 0));
  182 + -webkit-background-origin: border-box;
  183 + -moz-background-origin: border;
  184 + background-origin: border-box;
  185 +}
  186 +
  187 +.account-box.hover{height: 138px;}
  188 +
  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;}
  192 +header .account-links:before {
  193 + content: ".";
  194 + width:0;
  195 + height:0;
  196 + position:absolute;
  197 + border:5px solid transparent;
  198 + border-color:rgba(255,255,255,0);
  199 + border-bottom-color:#fafafa;
  200 + text-indent:-9999px;
  201 + top:-10px;
  202 + line-height:0;
  203 + right:10px;
  204 + z-index:10;
  205 +}
  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;
  217 +}
  218 +.account-box.hover .arrow-up{top: 41px; right: 6px; position: absolute}
  219 +header .account-links a:first-child{
  220 + -webkit-border-top-left-radius: 5px;
  221 + -webkit-border-top-right-radius: 5px;
  222 + -moz-border-radius-topleft: 5px;
  223 + -moz-border-radius-topright: 5px;
  224 + border-top-left-radius: 5px;
  225 + border-top-right-radius: 5px;
  226 +}
  227 +
  228 +header .account-links a:last-child{
  229 + -webkit-border-bottom-right-radius: 5px;
  230 + -webkit-border-bottom-left-radius: 5px;
  231 + -moz-border-radius-bottomright: 5px;
  232 + -moz-border-radius-bottomleft: 5px;
  233 + border-bottom-right-radius: 5px;
  234 + border-bottom-left-radius: 5px;
  235 + border-bottom: 0;
  236 +}
... ...
app/views/dashboard/index.html.haml
  Diff comments   View file @fed0da8
1   -- content_for(:body_class, "dashboard-page")
2   -
3   -#dashboard-content.dashboard-content.content
4   - = render "dashboard/sidebar"
5   - #news-feed.news-feed= render "dashboard/projects_feed"
  1 +.news-feed= render "dashboard/projects_feed"
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @fed0da8
1   -- content_for(:body_class, "dashboard-page")
2   -
3   -#dashboard-content.dashboard-content.content
4   - = render "dashboard/sidebar"
5   - #news-feed.news-feed= render "dashboard/issues_feed"
  1 +.news-feed= render "dashboard/issues_feed"
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @fed0da8
1   -- content_for(:body_class, "dashboard-page")
2   -
3   -#dashboard-content.dashboard-content.content
4   - = render "dashboard/sidebar"
5   - #news-feed.news-feed= render "dashboard/merge_requests_feed"
  1 +.news-feed= render "dashboard/merge_requests_feed"
... ...
app/views/layouts/application.html.haml
  Diff comments   View file @fed0da8
... ... @@ -8,12 +8,9 @@
8 8 = stylesheet_link_tag "application"
9 9 = javascript_include_tag "application"
10 10 = csrf_meta_tags
11   - = javascript_tag do
12   - REQ_URI = "#{request.env["REQUEST_URI"]}";
13   - REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
14   - %body{ :class => body_class, :id => yield(:boyd_id)}
  11 + %body.application
15 12 = render :partial => "layouts/flash"
16   - #container
17   - = render :partial => "layouts/head_panel"
18   - = render :partial => "layouts/page_title"
19   - = yield
  13 + = render :partial => "layouts/head_panel"
  14 + .container-fluid
  15 + .sidebar= render :partial => "dashboard/sidebar"
  16 + .content= yield
... ...
app/views/layouts/profile.html.haml
  Diff comments   View file @fed0da8
... ... @@ -8,24 +8,18 @@
8 8 = stylesheet_link_tag "application"
9 9 = javascript_include_tag "application"
10 10 = csrf_meta_tags
11   - = javascript_tag do
12   - REQ_URI = "#{request.env["REQUEST_URI"]}";
13   - REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
14   - %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
  11 + %body.profile
15 12 = render :partial => "layouts/flash"
16   - #container
17   - = render :partial => "layouts/head_panel"
18   - .project-container
19   - .project-sidebar
20   - .fixed
21   - %aside
22   - = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
23   - = link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
24   - = link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
25   - = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
26   - Keys
27   - - unless current_user.keys.empty?
28   - %span{ :class => "number" }= current_user.keys.count
29   -
30   - .project-content
31   - = yield
  13 + = render :partial => "layouts/head_panel"
  14 + .container-fluid
  15 + .sidebar
  16 + .fixed
  17 + %aside
  18 + = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
  19 + = link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
  20 + = link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
  21 + = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
  22 + Keys
  23 + - unless current_user.keys.empty?
  24 + %span{ :class => "number" }= current_user.keys.count
  25 + .content= yield
... ...
app/views/layouts/project.html.haml
  Diff comments   View file @fed0da8
... ... @@ -3,7 +3,8 @@
3 3 %head
4 4 %meta{:charset => "utf-8"}
5 5 %title
6   - GitLab #{" - #{@project.name}" if @project && !@project.new_record?}
  6 + GitLab
  7 + = " - #{@project.name}" if @project && !@project.new_record?
7 8 = favicon_link_tag 'favicon.ico'
8 9 = stylesheet_link_tag "application"
9 10 = javascript_include_tag "application"
... ... @@ -12,14 +13,9 @@
12 13 - if request.path == project_issues_path(@project)
13 14 = auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, :private_token => current_user.private_token), :title => "#{@project.name} issues")
14 15 = csrf_meta_tags
15   - = javascript_tag do
16   - REQ_URI = "#{request.env["REQUEST_URI"]}";
17   - REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
18   - %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
  16 + %body.project
19 17 = render :partial => "layouts/flash"
20   - #container
21   - = render :partial => "layouts/head_panel"
22   - .project-container
23   - = render :partial => "layouts/project_side"
24   - .project-content
25   - = yield
  18 + = render :partial => "layouts/head_panel"
  19 + .container-fluid
  20 + .sidebar= render :partial => "layouts/project_side"
  21 + .content= yield
... ...
app/views/merge_requests/_commits.html.haml
  Diff comments   View file @fed0da8
... ... @@ -6,9 +6,9 @@
6 6 = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
7 7 - else
8 8 = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
9   - %span.update-title
  9 + %span.commit-title
10 10 = truncate commit.safe_message, :length => 60
11   - %span.update-author
  11 + %span.commit-author
12 12 %strong= commit.author_name
13 13 authored
14 14 = time_ago_in_words(commit.created_at)
... ...