Download as
Browse Code »

Commit 18a496142b7b22166025535829776ea09cd39e52

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

Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme

Showing 5 changed files with 32 additions and 64 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @18a4961
... ... @@ -63,7 +63,7 @@
63 63 color: $style_color;
64 64 text-shadow: 0 1px 1px #FFF;
65 65 font-family: 'Yanone', sans-serif;
66   - font-size: 26px;
67   - line-height: 42px;
  66 + font-size: 24px;
  67 + line-height: 36px;
68 68 font-weight: normal;
69 69 }
... ...
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @18a4961
... ... @@ -29,7 +29,7 @@
29 29 a{
30 30 color: $style_color;
31 31 }
32   -
  32 +
33 33 > span {
34 34 font-family: $monospace_font;
35 35 font-size: 14px;
... ... @@ -124,7 +124,7 @@
124 124 .wrap{
125 125 display: inline-block;
126 126 }
127   -
  127 +
128 128 .frame {
129 129 display: inline-block;
130 130 background-color: #fff;
... ... @@ -149,7 +149,7 @@
149 149  
150 150 .view.swipe{
151 151 position: relative;
152   -
  152 +
153 153 .swipe-frame{
154 154 display: block;
155 155 margin: auto;
... ... @@ -228,7 +228,7 @@
228 228 bottom: 0px;
229 229 left: 50%;
230 230 margin-left: -150px;
231   -
  231 +
232 232 .drag-track{
233 233 display: block;
234 234 position: absolute;
... ... @@ -237,7 +237,7 @@
237 237 width: 276px;
238 238 background: url('onion_skin_sprites.gif') -4px -20px repeat-x;
239 239 }
240   -
  240 +
241 241 .dragger {
242 242 display: block;
243 243 position: absolute;
... ... @@ -248,7 +248,7 @@
248 248 background: url('onion_skin_sprites.gif') 0px -34px repeat-x;
249 249 cursor: pointer;
250 250 }
251   -
  251 +
252 252 .transparent {
253 253 display: block;
254 254 position: absolute;
... ... @@ -258,7 +258,7 @@
258 258 width: 10px;
259 259 background: url('onion_skin_sprites.gif') -2px 0px no-repeat;
260 260 }
261   -
  261 +
262 262 .opaque {
263 263 display: block;
264 264 position: absolute;
... ... @@ -275,19 +275,19 @@
275 275  
276 276 padding: 10px;
277 277 text-align: center;
278   -
  278 +
279 279 background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
280 280 background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
281 281 background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
282 282 background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
283   -
  283 +
284 284 ul, li{
285 285 list-style: none;
286 286 margin: 0;
287 287 padding: 0;
288 288 display: inline-block;
289 289 }
290   -
  290 +
291 291 li{
292 292 color: grey;
293 293 border-left: 1px solid #c1c1c1;
... ... @@ -322,12 +322,12 @@
322 322 }
323 323 .commit-author, .commit-committer{
324 324 display: block;
325   - color: #999;
326   - font-weight: normal;
  325 + color: #999;
  326 + font-weight: normal;
327 327 font-style: italic;
328 328 }
329 329 .commit-author strong, .commit-committer strong{
330   - font-weight: bold;
  330 + font-weight: bold;
331 331 font-style: normal;
332 332 }
333 333  
... ... @@ -337,7 +337,6 @@
337 337 */
338 338 .commit {
339 339 .browse_code_link_holder {
340   - @extend .span2;
341 340 float: right;
342 341 }
343 342  
... ...
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @18a4961
... ... @@ -5,15 +5,16 @@
5 5 header {
6 6 &.navbar-gitlab {
7 7 .navbar-inner {
8   - height: 45px;
9   - padding: 5px;
  8 + height: 40px;
  9 + padding: 3px;
10 10 background: #F1F1F1;
  11 + filter: none;
11 12  
12 13 .nav > li > a {
13 14 color: $style_color;
14 15 text-shadow: 0 1px 0 #fff;
15   - font-size: 18px;
16   - padding: 12px;
  16 + font-size: 16px;
  17 + padding: 10px;
17 18 }
18 19  
19 20 /** NAV block with links and profile **/
... ... @@ -25,7 +26,6 @@ header {
25 26 }
26 27  
27 28 z-index: 10;
28   - /*height: 60px;*/
29 29  
30 30 /**
31 31 *
... ... @@ -34,7 +34,7 @@ header {
34 34 */
35 35 .app_logo {
36 36 float: left;
37   - margin-right: 15px;
  37 + margin-right: 9px;
38 38 position: relative;
39 39 top: -5px;
40 40 padding-top: 5px;
... ... @@ -42,10 +42,10 @@ header {
42 42 a {
43 43 float: left;
44 44 padding: 0px;
45   - margin: 0 10px;
  45 + margin: 0 6px;
46 46  
47 47 h1 {
48   - background: url('logo_dark.png') no-repeat 0px 2px;
  48 + background: url('logo_dark.png') no-repeat 0px 1px;
49 49 float: left;
50 50 height: 40px;
51 51 width: 40px;
... ... @@ -79,7 +79,6 @@ header {
79 79 .search {
80 80 margin-right: 45px;
81 81 margin-left: 10px;
82   - margin-top: 2px;
83 82  
84 83 .search-input {
85 84 @extend .span2;
... ... @@ -105,7 +104,7 @@ header {
105 104 .account-box {
106 105 position: absolute;
107 106 right: 0;
108   - top: 6px;
  107 + top: 4px;
109 108 z-index: 10000;
110 109 width: 128px;
111 110 font-size: 11px;
... ... @@ -240,7 +239,7 @@ header {
240 239 .app_logo {
241 240 a {
242 241 h1 {
243   - background: url('logo_white.png') no-repeat center center;
  242 + background: url('logo_white.png') no-repeat center 1px;
244 243 color: #fff;
245 244 text-shadow: 0 1px 1px #111;
246 245 }
... ... @@ -261,11 +260,11 @@ header {
261 260  
262 261 .separator {
263 262 float: left;
264   - height: 60px;
  263 + height: 46px;
265 264 width: 1px;
266 265 background: white;
267 266 border-left: 1px solid #DDD;
268   - margin-top: -10px;
  267 + margin-top: -3px;
269 268 margin-left: 10px;
270 269 margin-right: 10px;
271 270 }
... ...
app/assets/stylesheets/themes/ui_mars.scss
  Diff comments   View file @18a4961
... ... @@ -8,28 +8,20 @@
8 8 *
9 9 */
10 10 .ui_mars {
11   -
12 11 /*
13 12 * Application Header
14 13 *
15 14 */
16 15 header {
17   -
  16 + @extend .header-dark;
18 17 &.navbar-gitlab {
19 18 .navbar-inner {
20 19 background: #474D57 url('bg-header.png') repeat-x bottom;
21 20 border-bottom: 1px solid #444;
22   -
23   - .nav > li > a {
24   - color: #eee;
25   - text-shadow: 0 1px 0 #444;
26   - }
27 21 }
28 22 }
29 23  
30 24 .search {
31   - float: right;
32   - margin-right: 45px;
33 25 .search-input {
34 26 border: 1px solid rgba(0, 0, 0, 0.7);
35 27 background-color: #D2D5DA;
... ... @@ -43,31 +35,9 @@
43 35 .search-input::-webkit-input-placeholder {
44 36 color: #666;
45 37 }
46   - .app_logo {
47   - a {
48   - h1 {
49   - background: url('logo_white.png') no-repeat center center;
50   - color: #eee;
51   - text-shadow: 0 1px 1px #111;
52   - }
53   - }
54   - &:hover {
55   - background-color: #41464e;
56   - }
57   - }
58   - .project_name {
59   - color: #eee;
60   - text-shadow: 0 1px 1px #111;
  38 + .separator {
  39 + background: #31363E;
  40 + border-left: 1px solid #666;
61 41 }
62 42 }
63   -
64   - .separator {
65   - background: #31363E;
66   - border-left: 1px solid #666;
67   - }
68   -
69   - /*
70   - * End of Application Header
71   - *
72   - */
73 43 }
... ...
app/views/commits/_commit.html.haml
  Diff comments   View file @18a4961
... ... @@ -6,7 +6,7 @@
6 6 = link_to commit.short_id(8), project_commit_path(@project, commit), class: "commit_short_id"
7 7 = commit.author_link avatar: true, size: 24
8 8  
9   - = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, commit.id), class: "row_title"
  9 + = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "row_title"
10 10  
11 11 %span.committed_ago
12 12 = time_ago_in_words(commit.committed_date)
... ...