developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small change

This commit is contained in:
devin 2012-04-28 01:49:02 +08:00
parent a23f290831
commit 03f19b80b4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/desktopmain.css
View File

@ -358,7 +358,7 @@ a:focus { outline: none; }
} }
.group{ .group{
float: left; float: left;
margin-right: 36px; margin-right: 24px;
max-width: 800px; max-width: 800px;
/*max-height:540px;*/ /*max-height:540px;*/
} }
@ -472,5 +472,5 @@ a:focus { outline: none; }
} }
.grp{ .grp{
min-height:540px; min-height:528px;
} }

4
app/models/user/user.rb
View File

@ -17,7 +17,11 @@ class User
has_many :managing_apps,:class_name => "AppManager" has_many :managing_apps,:class_name => "AppManager"
has_one :desktop, :autosave => true, :dependent => :destroy has_one :desktop, :autosave => true, :dependent => :destroy
<<<<<<< HEAD
has_many :other_accounts, :autosave => true, :dependent => :destroy has_many :other_accounts, :autosave => true, :dependent => :destroy
=======
#has_many :otheraccount, :autosave => true, :dependent => :destroy
>>>>>>> small change
belongs_to :role belongs_to :role
has_and_belongs_to_many :sub_roles has_and_belongs_to_many :sub_roles
accepts_nested_attributes_for :attribute_values, :allow_destroy => true accepts_nested_attributes_for :attribute_values, :allow_destroy => true