Download as
Browse Code »

Commit 0cd873c2d3724bc373e1d8b9e5b32c01e32c1927

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

fixed layout for ipad. changed main width

Showing 8 changed files with 11 additions and 23 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @0cd873c
... ... @@ -71,14 +71,12 @@ a {
71 71  
72 72 /** LAYOUT **/
73 73  
74   -.container-fluid {
75   - min-width:$min_app_width;
76   - max-width:$max_app_width;
77   - margin:auto;
  74 +.container {
  75 + width:$min_app_width;
78 76 margin-top:62px;
79 77 }
80 78  
81   -.container-fluid .sidebar {
  79 +.container .sidebar {
82 80 width: 250px;
83 81 height:100%;
84 82 min-height:450px;
... ... @@ -133,12 +131,6 @@ nav.main_menu {
133 131 }
134 132 }
135 133  
136   -
137   -.container-fluid > .content {
138   - margin-left: 0px;
139   - margin-top:20px;
140   -}
141   -
142 134 aside.projects,
143 135 aside.project-side
144 136 {
... ...
app/assets/stylesheets/main.scss
  Diff comments   View file @0cd873c
... ... @@ -9,8 +9,8 @@ $active_bg_color:#79C3E0;
9 9 $active_bd_color: #2FA0BB;
10 10 $border_color:#CCC;
11 11 $lite_border_color:#EEE;
12   -$min_app_width:980px;
13   -$max_app_width:980px;
  12 +$min_app_width:960px;
  13 +$max_app_width:960px;
14 14 $app_padding:20px;
15 15 $bg_color: #FFF;
16 16 $styled_border_color: #2FA0BB;
... ...
app/views/layouts/_project_menu.html.haml
  Diff comments   View file @0cd873c
... ... @@ -17,6 +17,4 @@
17 17  
18 18 - if @project.wall_enabled
19 19 = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
20   - @Wall
21   - - if @project.common_notes.today.count > 0
22   - %span.label= @project.common_notes.today.count
  20 + Wall
... ...
app/views/layouts/admin.html.haml
  Diff comments   View file @0cd873c
... ... @@ -4,7 +4,7 @@
4 4 %body.admin
5 5 = render "layouts/flash"
6 6 = render "layouts/head_panel", :title => "Admin area"
7   - .container-fluid
  7 + .container
8 8 %nav.main_menu
9 9 = link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
10 10 = link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
... ...
app/views/layouts/application.html.haml
  Diff comments   View file @0cd873c
... ... @@ -4,7 +4,7 @@
4 4 %body.application
5 5 = render "layouts/flash"
6 6 = render "layouts/head_panel", :title => "Dashboard"
7   - .container-fluid
  7 + .container
8 8 = render :partial => "layouts/app_menu"
9 9 .content
10 10 .row
... ...
app/views/layouts/devise.html.haml
  Diff comments   View file @0cd873c
... ... @@ -3,4 +3,4 @@
3 3 = render "layouts/head"
4 4 %body.login-page
5 5 = render :partial => "layouts/flash"
6   - .container-fluid= yield
  6 + .container= yield
... ...
app/views/layouts/profile.html.haml
  Diff comments   View file @0cd873c
... ... @@ -4,15 +4,13 @@
4 4 %body.profile
5 5 = render "layouts/flash"
6 6 = render "layouts/head_panel", :title => "Profile"
7   - .container-fluid
  7 + .container
8 8 %nav.main_menu
9 9 = link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
10 10 = link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
11 11 = link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
12 12 = link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
13 13 Keys
14   - - unless current_user.keys.empty?
15   - %span.label= current_user.keys.count
16 14 .content
17 15 .row
18 16 .span12= yield
... ...
app/views/layouts/project.html.haml
  Diff comments   View file @0cd873c
... ... @@ -4,7 +4,7 @@
4 4 %body.project
5 5 = render "layouts/flash"
6 6 = render "layouts/head_panel", :title => @project.name
7   - .container-fluid
  7 + .container
8 8 = render :partial => "layouts/project_menu"
9 9 .content
10 10 - if @full_content
... ...