fixed layout for ipad. changed main width
This commit is contained in:
parent
c0e622eae2
commit
0cd873c2d3
|
@ -71,14 +71,12 @@ a {
|
|||
|
||||
/** LAYOUT **/
|
||||
|
||||
.container-fluid {
|
||||
min-width:$min_app_width;
|
||||
max-width:$max_app_width;
|
||||
margin:auto;
|
||||
.container {
|
||||
width:$min_app_width;
|
||||
margin-top:62px;
|
||||
}
|
||||
|
||||
.container-fluid .sidebar {
|
||||
.container .sidebar {
|
||||
width: 250px;
|
||||
height:100%;
|
||||
min-height:450px;
|
||||
|
@ -133,12 +131,6 @@ nav.main_menu {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
.container-fluid > .content {
|
||||
margin-left: 0px;
|
||||
margin-top:20px;
|
||||
}
|
||||
|
||||
aside.projects,
|
||||
aside.project-side
|
||||
{
|
||||
|
|
|
@ -9,8 +9,8 @@ $active_bg_color:#79C3E0;
|
|||
$active_bd_color: #2FA0BB;
|
||||
$border_color:#CCC;
|
||||
$lite_border_color:#EEE;
|
||||
$min_app_width:980px;
|
||||
$max_app_width:980px;
|
||||
$min_app_width:960px;
|
||||
$max_app_width:960px;
|
||||
$app_padding:20px;
|
||||
$bg_color: #FFF;
|
||||
$styled_border_color: #2FA0BB;
|
||||
|
|
|
@ -17,6 +17,4 @@
|
|||
|
||||
- if @project.wall_enabled
|
||||
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
|
||||
@Wall
|
||||
- if @project.common_notes.today.count > 0
|
||||
%span.label= @project.common_notes.today.count
|
||||
Wall
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
%body.admin
|
||||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => "Admin area"
|
||||
.container-fluid
|
||||
.container
|
||||
%nav.main_menu
|
||||
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
|
||||
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
%body.application
|
||||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => "Dashboard"
|
||||
.container-fluid
|
||||
.container
|
||||
= render :partial => "layouts/app_menu"
|
||||
.content
|
||||
.row
|
||||
|
|
|
@ -3,4 +3,4 @@
|
|||
= render "layouts/head"
|
||||
%body.login-page
|
||||
= render :partial => "layouts/flash"
|
||||
.container-fluid= yield
|
||||
.container= yield
|
||||
|
|
|
@ -4,15 +4,13 @@
|
|||
%body.profile
|
||||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => "Profile"
|
||||
.container-fluid
|
||||
.container
|
||||
%nav.main_menu
|
||||
= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
|
||||
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
|
||||
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
|
||||
= link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
|
||||
Keys
|
||||
- unless current_user.keys.empty?
|
||||
%span.label= current_user.keys.count
|
||||
.content
|
||||
.row
|
||||
.span12= yield
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
%body.project
|
||||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => @project.name
|
||||
.container-fluid
|
||||
.container
|
||||
= render :partial => "layouts/project_menu"
|
||||
.content
|
||||
- if @full_content
|
||||
|
|
Loading…
Reference in a new issue