Download as
Browse Code »

Commit 2e83de1924ad3429b812d17498b009a8b924795d

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

fixed layout for ipad

Showing 5 changed files with 30 additions and 15 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @2e83de1
@@ -82,12 +82,16 @@ a { @@ -82,12 +82,16 @@ a {
82 82
83 .container { 83 .container {
84 width:$min_app_width; 84 width:$min_app_width;
85 - margin-top:50px;  
86 - padding:$app_padding; 85 + padding-top:0;
  86 + z-index:5;
  87 +}
  88 +
  89 +.container .content {
  90 + margin:0 $app_padding;
87 } 91 }
88 92
89 .container .sidebar { 93 .container .sidebar {
90 - width: 220px; 94 + width: 200px;
91 height:100%; 95 height:100%;
92 min-height:450px; 96 min-height:450px;
93 float:right; 97 float:right;
@@ -95,10 +99,8 @@ a { @@ -95,10 +99,8 @@ a {
95 99
96 nav.main_menu { 100 nav.main_menu {
97 border-radius: 4px; 101 border-radius: 4px;
98 - width: 100%;  
99 margin: auto; 102 margin: auto;
100 - margin-top:30px;  
101 - margin-bottom:30px; 103 + margin:30px $app_padding;
102 background:#f1f1f1; 104 background:#f1f1f1;
103 border:1px solid #ccc; 105 border:1px solid #ccc;
104 height:38px; 106 height:38px;
@@ -154,7 +156,6 @@ aside.projects, @@ -154,7 +156,6 @@ aside.projects,
154 aside.project-side 156 aside.project-side
155 { 157 {
156 margin-left: 0; 158 margin-left: 0;
157 - padding-left: 20px;  
158 } 159 }
159 160
160 img.avatar { 161 img.avatar {
@@ -327,3 +328,7 @@ img.lil_av { @@ -327,3 +328,7 @@ img.lil_av {
327 .borders { 328 .borders {
328 border: 1px solid #ccc; 329 border: 1px solid #ccc;
329 } 330 }
  331 +
  332 +.well.padded {
  333 + padding:29px;
  334 +}
app/assets/stylesheets/main.scss
  Diff comments   View file @2e83de1
@@ -9,8 +9,8 @@ $active_bg_color:#79C3E0; @@ -9,8 +9,8 @@ $active_bg_color:#79C3E0;
9 $active_bd_color: #2FA0BB; 9 $active_bd_color: #2FA0BB;
10 $border_color:#CCC; 10 $border_color:#CCC;
11 $lite_border_color:#EEE; 11 $lite_border_color:#EEE;
12 -$min_app_width:960px;  
13 -$max_app_width:960px; 12 +$min_app_width:980px;
  13 +$max_app_width:980px;
14 $app_padding:20px; 14 $app_padding:20px;
15 $bg_color: #FFF; 15 $bg_color: #FFF;
16 $styled_border_color: #2FA0BB; 16 $styled_border_color: #2FA0BB;
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @2e83de1
@@ -216,3 +216,8 @@ input.git_clone_url { @@ -216,3 +216,8 @@ input.git_clone_url {
216 #new_issue_dialog textarea{ 216 #new_issue_dialog textarea{
217 height: 100px; 217 height: 100px;
218 } 218 }
  219 +
  220 +.project_list_url {
  221 + width:270px;
  222 + background:#fff !important;
  223 +}
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @2e83de1
1 body header { 1 body header {
2 - position:absolute;  
3 width:100%; 2 width:100%;
4 padding:0; 3 padding:0;
5 margin:0; 4 margin:0;
@@ -19,9 +18,15 @@ body header { @@ -19,9 +18,15 @@ body header {
19 min-width:$min_app_width; 18 min-width:$min_app_width;
20 max-width:$max_app_width; 19 max-width:$max_app_width;
21 position:relative; 20 position:relative;
22 - padding:15px $app_padding; 21 + padding:15px 0;
  22 +
  23 + .top_panel_content {
  24 + margin:0 $app_padding;
  25 + }
23 } 26 }
24 27
  28 +
  29 +
25 .project_name { 30 .project_name {
26 float:left; 31 float:left;
27 width:400px; 32 width:400px;
app/views/projects/_tile.html.haml
  Diff comments   View file @2e83de1
1 - @projects.in_groups_of(2, false) do |projects| 1 - @projects.in_groups_of(2, false) do |projects|
2 .row 2 .row
3 - projects.each_with_index do |project, i| 3 - projects.each_with_index do |project, i|
4 - .span5.well 4 + %div.span5.well.padded
5 = link_to project_path(project) do 5 = link_to project_path(project) do
6 - %h3= truncate(project.name, :length => 20)  
7 - %p.title.repository.git_url_wrapper 6 + %h3= truncate(project.name, :length => 28)
  7 + %p
8 %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' } 8 %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' }
9 9
10 - %a.btn{:href => tree_project_ref_path(project, project.root_ref)} Browse code 10 + %a.btn.info{:href => tree_project_ref_path(project, project.root_ref)} Browse code
11 %a.btn{:href => project_commits_path(project)} Commits 11 %a.btn{:href => project_commits_path(project)} Commits