social_stream 0.4.2 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (78) hide show
  1. data/app/controllers/activities_controller.rb +1 -0
  2. data/app/controllers/avatars_controller.rb +17 -10
  3. data/app/controllers/comments_controller.rb +2 -0
  4. data/app/controllers/conversations_controller.rb +98 -103
  5. data/app/controllers/groups_controller.rb +3 -1
  6. data/app/controllers/likes_controller.rb +2 -0
  7. data/app/controllers/messages_controller.rb +4 -0
  8. data/app/controllers/posts_controller.rb +2 -2
  9. data/app/controllers/ties_controller.rb +6 -0
  10. data/app/helpers/subjects_helper.rb +32 -7
  11. data/app/helpers/ties_helper.rb +7 -2
  12. data/app/models/activity.rb +1 -1
  13. data/app/models/actor.rb +5 -8
  14. data/app/models/relation.rb +65 -0
  15. data/app/models/tie.rb +27 -7
  16. data/app/views/activities/_child.html.erb +1 -5
  17. data/app/views/activities/_root.html.erb +2 -4
  18. data/app/views/avatars/_form.html.erb +5 -16
  19. data/app/views/avatars/_precrop.html.erb +24 -17
  20. data/app/views/avatars/index.html.erb +47 -36
  21. data/app/views/avatars/new.html.erb +19 -3
  22. data/app/views/contacts/index.html.erb +1 -1
  23. data/app/views/contacts/index.js.erb +2 -0
  24. data/app/views/conversations/_conversation_full.html.erb +2 -1
  25. data/app/views/conversations/_index.html.erb +0 -7
  26. data/app/views/conversations/_show.html.erb +0 -7
  27. data/app/views/conversations/index.html.erb +9 -1
  28. data/app/views/conversations/index.js.erb +1 -0
  29. data/app/views/conversations/show.html.erb +1 -1
  30. data/app/views/conversations/show.js.erb +2 -0
  31. data/app/views/groups/_new.html.erb +9 -2
  32. data/app/views/groups/new.html.erb +5 -1
  33. data/app/views/layouts/_header.erb +23 -1
  34. data/app/views/layouts/_representation.html.erb +1 -1
  35. data/app/views/messages/new.html.erb +1 -1
  36. data/app/views/messages/new.js.erb +3 -0
  37. data/app/views/profiles/_profile.html.erb +18 -13
  38. data/app/views/profiles/edit.html.erb +29 -4
  39. data/app/views/profiles/update.js.erb +3 -3
  40. data/app/views/subjects/_toolbar_home_menu_options.html.erb +1 -1
  41. data/app/views/subjects/_toolbar_home_menu_options_subjects.html.erb +2 -2
  42. data/app/views/subjects/_toolbar_logo.html.erb +14 -2
  43. data/app/views/subjects/_toolbar_message_menu.html.erb +1 -1
  44. data/app/views/subjects/_toolbar_profile_menu_tie_options.html.erb +18 -7
  45. data/app/views/ties/_edit.html.erb +102 -0
  46. data/app/views/ties/_new.html.erb +48 -19
  47. data/app/views/ties/edit.html.erb +1 -0
  48. data/config/locales/en.yml +42 -27
  49. data/config/routes.rb +0 -6
  50. data/lib/generators/social_stream/templates/public/images/btn/arrowBlue.png +0 -0
  51. data/lib/generators/social_stream/templates/public/images/btn/shadow.png +0 -0
  52. data/lib/generators/social_stream/templates/public/javascripts/addContact.js +100 -0
  53. data/lib/generators/social_stream/templates/public/javascripts/avatars.js +8 -0
  54. data/lib/generators/social_stream/templates/public/javascripts/hoverIntent.js +84 -0
  55. data/lib/generators/social_stream/templates/public/javascripts/main.js +10 -1
  56. data/lib/generators/social_stream/templates/public/javascripts/menu.js +22 -6
  57. data/lib/generators/social_stream/templates/public/stylesheets/default/activities.css +2 -2
  58. data/lib/generators/social_stream/templates/public/stylesheets/default/addContact.css +29 -0
  59. data/lib/generators/social_stream/templates/public/stylesheets/default/avatars.css +79 -0
  60. data/lib/generators/social_stream/templates/public/stylesheets/default/base.css +44 -5
  61. data/lib/generators/social_stream/templates/public/stylesheets/default/header.css +151 -1
  62. data/lib/generators/social_stream/templates/public/stylesheets/default/home.css +1 -1
  63. data/lib/generators/social_stream/templates/public/stylesheets/default/jquery-ui.css +1 -1
  64. data/lib/generators/social_stream/templates/public/stylesheets/default/messages.css +6 -4
  65. data/lib/social_stream.rb +1 -1
  66. data/lib/social_stream/ability.rb +20 -0
  67. data/lib/social_stream/models/subject.rb +5 -1
  68. data/lib/social_stream/test_helpers/controllers.rb +55 -0
  69. data/lib/social_stream/version.rb +1 -1
  70. data/social_stream.gemspec +1 -1
  71. data/spec/controllers/comments_controller_spec.rb +38 -0
  72. data/spec/controllers/groups_controller_spec.rb +75 -5
  73. data/spec/factories/comment.rb +4 -0
  74. data/spec/models/tie_spec.rb +25 -15
  75. metadata +18 -10
  76. data/app/controllers/pshb_controller.rb +0 -55
  77. data/app/views/ties/new.js.erb +0 -12
  78. data/lib/social_stream/relations.rb +0 -46
@@ -1,9 +1,25 @@
1
1
  function initMenu() {
2
- $('.menu ul').hide();
3
- $('.menu li a').click(
4
- function() {
5
- $(this).next().slideToggle('normal');
2
+ $('.menu ul').hide();
3
+ $('.menu li a').click( function() {
4
+ $(this).next().slideToggle('normal');
5
+ }
6
+ );
7
+ //Logo menu for current subject
8
+ //Full Caption Sliding (Hidden to Visible)
9
+ $('.logo_grid.logo_full').hover( function() {
10
+ $(".logo_menu", this).stop().animate({top:'101px'},{queue:false,duration:160});
11
+ }, function() {
12
+ $(".logo_menu", this).stop().animate({top:'1119px'},{queue:false,duration:160});
13
+ });
6
14
  }
7
- );
15
+
16
+ function expandSubMenu(id) {
17
+ $('#' + id + '_menu').next().show();
8
18
  }
9
- $(document).ready(function() {initMenu();});
19
+
20
+ $(document).ready(function() {
21
+ initMenu();
22
+ });
23
+
24
+
25
+
@@ -13,9 +13,9 @@
13
13
  #securities{ display:inline-block; text-align:left;}
14
14
 
15
15
  /******************* WALL - ACTIVITY ***************/
16
- .activity { text-align:left; display: block; vertical-align: top; padding: 10px 5px 0px 0px;
16
+ .activity { text-align:left; display: block; vertical-align: top; padding: 2px 0px 0px 0px;
17
17
  display: inline-block; color: #000; width: 100%; font-size: 13px; color: #2A3890;}
18
- .actor_logo { width: 38px; padding: 8px 0px 8px 5px; display: inline-block; vertical-align: top;}
18
+ .actor_logo { width: 38px; padding: 8px 0px 5px 5px; display: inline-block; vertical-align: top;}
19
19
  .activity_content { padding: 8px 0px 0px 0px; display: inline-block; color: #000; width: 90%;}
20
20
  .actor_name { font-weight: bold; color: #2A3890; font-size: 13px;}
21
21
  .post a { color: #2A3890;}
@@ -0,0 +1,29 @@
1
+ .desc { color:white;}
2
+ .desc a {color:white;}
3
+
4
+ .dropdown { margin:0px; padding:0px; }
5
+ .dropdown dd, .dropdown dt, .dropdown ul { margin:0px; padding:0px; }
6
+ .dropdown dd { position:relative; }
7
+ .dropdown a, .dropdown a:visited { color:#1F4A75; text-decoration:none; outline:none;}
8
+ .dropdown dt a:hover { border: 1px solid white;}
9
+ .dropdown dt a {background:#DFECF1 url(/images/btn/arrowBlue.png) no-repeat scroll right center; display:block; padding-right:20px;
10
+ border:1px solid #1F4A75; width:150px;}
11
+ .dropdown dt a span {cursor:pointer; display:block; padding:5px;}
12
+ .dropdown dd ul { background:#DFECF1 none repeat scroll 0 0; border:1px solid #1F4A75; color:#1F4A75; display:none;
13
+ left:0px; padding:5px 0px; position:absolute; top:2px; width:auto; min-width:170px; list-style:none;}
14
+ .dropdown span.value { display:none;}
15
+ .dropdown dd ul li a { padding:5px; display:block; font-size:1.0em;}
16
+ .dropdown dd ul li a:hover { background-color: #EBF2F4;}
17
+
18
+ .input_select{ height: 20px; width: 90%; background-color: #DFECF1; margin: auto; margin-top:5px; margin-bottom:5px; color: #1F4A75; border: 1px solid #1F4A75; text-align: center; font-size:1.0em;}
19
+ .input_link{ text-align: center; }
20
+
21
+ .select_relations{ text-align: center; padding-right:50px; margin-top: -5px;}
22
+ .relationPermision{ color: #2A3890; }
23
+ #relationPermissions{ text-align: left; margin-top: 15px; }
24
+
25
+ .checkbox_permission {
26
+ margin-top: 5px;
27
+ color: red;
28
+ }
29
+
@@ -0,0 +1,79 @@
1
+ /******************** Common ***********************/
2
+
3
+ /******************** Avatars ***********************/
4
+ .avatars {
5
+ padding-left: 10px;
6
+ }
7
+ .avatar {
8
+ float:left;
9
+ position:relative;
10
+ }
11
+ .avatar .actions {
12
+ }
13
+ .avatar .delete_avatar {
14
+ position:absolute;
15
+ top:5px;
16
+ right:5px;
17
+ display:none;
18
+ }
19
+ .avatar .default {
20
+ border: 5px solid #2A3890;
21
+ }
22
+ .avatar .non_default {
23
+ border: 5px solid #E0EEF5;
24
+ }
25
+ /******************** New form ***********************/
26
+ .new_logo_form {
27
+ }
28
+ /******************** Slide Effect ***********************/
29
+ .boxgrid {
30
+ width: 104px;
31
+ height: 104px;
32
+ float:left;
33
+ overflow: hidden;
34
+ position: relative;
35
+ }
36
+ .boxgrid img {
37
+ position: absolute;
38
+ top: 0;
39
+ left: 0;
40
+ border: 0;
41
+ }
42
+ .boxcaption {
43
+ top: 104px;
44
+ left: 5px;
45
+ float: left;
46
+ position: absolute;
47
+ background: #E0EEF5;
48
+ opacity: .8;
49
+ width: 84px;
50
+ height: 28px;
51
+ /* For IE 5-7 */
52
+ filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
53
+ /* For IE 8 */
54
+ -MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
55
+ }
56
+ .captionfull .boxcaption {
57
+ top: 104px;
58
+ left: 5px;
59
+ padding: 5px;
60
+ }
61
+ /**************** Crop **************/
62
+ #precropDiv {
63
+ width:499px;
64
+ display:inline-block;
65
+ padding: 0px 30px 0px 29px;
66
+ }
67
+ #precropPrev {
68
+ vertical-align:top;
69
+ display:inline-block;
70
+ /*padding: 5px 4px 5px 4px;*/
71
+ }
72
+ #precropPrevImg {
73
+ width:100px;
74
+ height:100px;
75
+ overflow:hidden;
76
+ margin-left:30px;
77
+ border: 1px solid #E0EEF5;
78
+ }
79
+
@@ -11,6 +11,7 @@ div { margin: 0px; padding: 0px; font-family: Helvetica; font-size: 11px;}
11
11
  a:link,a:visited { color: inherit; text-decoration: inherit;}
12
12
  a:hover { text-decoration: underline;}
13
13
  .clearfloat { clear: both; height: 0px;}
14
+ h2{padding-left:10px;}
14
15
 
15
16
 
16
17
  /******* Main Structure SECTION***************************/
@@ -29,7 +30,7 @@ margin-top: auto; margin-bottom:auto;}
29
30
  /************Forms SECTION **************/
30
31
  input.other_blue{ background:#497FC1; border:0px; cursor:pointer; font-size:1.0em; line-height:135%;
31
32
  margin-right:4px; color:white; padding:1px;}
32
- textarea.new_tie_text_area{ width:100%; height: 100px; }
33
+ textarea.new_tie_text_area{ width:100%; height: 100px; color: #2A3890;}
33
34
  .colum_field_title{ text-align: center; }
34
35
  .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;}
35
36
 
@@ -66,7 +67,11 @@ textarea.new_tie_text_area{ width:100%; height: 100px; }
66
67
  .myButtonLarge:active span { background-position: bottom left; padding: 6px 0 4px 18px;}
67
68
 
68
69
  .button{margin: 10px 0 10px 10px;padding: 3px 3px 3px 3px;color:#FFFFFF;background-color: #1F4A75;}
69
-
70
+ .optionHeader {
71
+ color: #fff;
72
+ overflow: hidden;
73
+ background-color: #1F4A75;
74
+ }
70
75
 
71
76
 
72
77
  /************** BLOCK DIV SECTION *********/
@@ -84,7 +89,7 @@ textarea.new_tie_text_area{ width:100%; height: 100px; }
84
89
  .block .row { display: block;}
85
90
  .block .title{ display:inline-block; }
86
91
  .block .sub-block{ display: inline-block; padding-left:3px; width:70%; text-align:left;}
87
- .block .close_add_contact { float:right; vertical-align:top; margin-right: 1%; }
92
+ .block .close_add_contact { float:right; vertical-align:top; margin-right: 1%; }
88
93
 
89
94
  /******BLOCK TAB CONTENT SECTION********/
90
95
  .block .tab { margin-top: 2px; background: #fff; /*border-top: thin solid #D4E4EA;*/
@@ -110,8 +115,8 @@ textarea.new_tie_text_area{ width:100%; height: 100px; }
110
115
  .block .form_row { display: block; padding:5px; padding-left:20px; }
111
116
  .block .label{ display:inline-block; width:49%; }
112
117
  .block .two_columns_container { margin-top: 5px; }
113
- .block .form_column_left { display: block; padding:5px; padding-left:20px; float: left; width:60%; }
114
- .block .form_column_right { display: block; padding:5px; padding-left:20px; float:right; width:30%; }
118
+ .block .form_column_left { display: block; padding:5px; padding-left:20px; float: left; width:60%; text-align: center;}
119
+ .block .form_column_right { display: block; padding: 5px 10px 5px 10px; float:right; width:31%; text-align: center;}
115
120
  .block .form_bottom { display: block; padding:5px; padding-left:20px; clear:both; text-align: center; }
116
121
  .block .select_relations{ padding-top:20px; text-align: center; }
117
122
 
@@ -135,3 +140,37 @@ textarea.new_tie_text_area{ width:100%; height: 100px; }
135
140
 
136
141
  /*************SPACES SECTION *************/
137
142
  .space_center { padding-top: 9px; padding-right: 4px; text-align: center;}
143
+
144
+ /********** Current logo change **********/
145
+ .logo_grid {
146
+ width: 142px;
147
+ height: 119px;
148
+ overflow: hidden;
149
+ position: relative;
150
+ }
151
+ .logo_grid img {
152
+ position: absolute;
153
+ top: 0;
154
+ left: 23px;
155
+ border: 0;
156
+ }
157
+ .logo_caption {
158
+ top: 119px;
159
+ left: 23px;
160
+ float: left;
161
+ position: absolute;
162
+ background: #E0EEF5;
163
+ opacity: .8;
164
+ width: 119px;
165
+ height: 18px;
166
+ /* For IE 5-7 */
167
+ filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
168
+ /* For IE 8 */
169
+ -MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
170
+ }
171
+ .logo_full .logo_caption {
172
+ top: 119px;
173
+ left: 23pxpx;
174
+ padding: 0px;
175
+ }
176
+
@@ -35,13 +35,16 @@
35
35
  li.btn_menu_home{background: transparent url("/images/btn/btn_home.png") no-repeat left center;}
36
36
  li.btn_menu_profile{background: transparent url("/images/btn/btn_profile.png") no-repeat left center;}
37
37
  li.btn_menu_browse{background: transparent url("/images/btn/btn_browse.png") no-repeat left center;}
38
+ #btn_menu_config{background: transparent url("/images/btn/btn_config.png") no-repeat left center;}
38
39
 
39
40
  #menu_account{ vertical-align: top; height:23px; }
40
41
  #menu_account span { float:right; padding-right: 5px; vertical-align: top; padding-top: 5px;}
41
42
  #menu_account ul{ list-style: none; margin: 0px; float:left;}
42
43
  #menu_account ul li{ line-height:20px; padding:5px 0px 5px 20px; vertical-align:top;}
43
44
 
44
- li.btn_menu_config{background: transparent url("/images/btn/btn_config.png") no-repeat left center;}
45
+ #account{display:inline-block;vertical-align: top; height:22px;}
46
+
47
+
45
48
  li.btn_menu_exit{background: transparent url("/images/btn/btn_exit.png") no-repeat left center;}
46
49
  li.btn_menu_representation{}
47
50
  #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0px 3px 0px 3px; margin:0px;}
@@ -50,3 +53,150 @@ li.btn_menu_representation{}
50
53
  .black{color:#000; font-weight:bold;}
51
54
 
52
55
 
56
+
57
+
58
+
59
+
60
+
61
+
62
+
63
+ /*** ESSENTIAL STYLES ***/
64
+ .sf-menu, .sf-menu * {
65
+ margin: 0;
66
+ padding: 0;
67
+ list-style: none;
68
+ }
69
+ .sf-menu {
70
+ /*line-height: 1.0;*/
71
+ }
72
+ .sf-menu ul {
73
+ position: absolute;
74
+ top: -999em;
75
+ width: 10em; /* left offset of submenus need to match (see below) */
76
+ }
77
+ .sf-menu ul li {
78
+ width: 100%;
79
+ }
80
+ .sf-menu li:hover {
81
+ visibility: inherit; /* fixes IE7 'sticky bug' */
82
+ }
83
+ .sf-menu li {
84
+ float: left;
85
+ position: relative;
86
+ }
87
+ .sf-menu a {
88
+ display: block;
89
+ position: relative;
90
+ }
91
+ .sf-menu li:hover ul,
92
+ .sf-menu li.sfHover ul {
93
+ left: 0;
94
+ top: 2.2em; /* match top ul list item height */
95
+ z-index: 99;
96
+ }
97
+ ul.sf-menu li:hover li ul,
98
+ ul.sf-menu li.sfHover li ul {
99
+ top: -999em;
100
+ }
101
+ ul.sf-menu li li:hover ul,
102
+ ul.sf-menu li li.sfHover ul {
103
+ left: 10em; /* match ul width */
104
+ top: 0;
105
+ }
106
+ ul.sf-menu li li:hover li ul,
107
+ ul.sf-menu li li.sfHover li ul {
108
+ top: -999em;
109
+ }
110
+ ul.sf-menu li li li:hover ul,
111
+ ul.sf-menu li li li.sfHover ul {
112
+ left: 10em; /* match ul width */
113
+ top: 0;
114
+ }
115
+
116
+ /*** DEMO SKIN ***/
117
+ .sf-menu {
118
+ float: left;
119
+ /*margin-bottom: 1em; */
120
+ }
121
+ .sf-menu a {
122
+ padding: .55em 1em;
123
+ text-decoration:none;
124
+ padding-left:2em;
125
+ }
126
+ .sf-menu a, .sf-menu a:visited { /* visited pseudo selector so IE6 applies text colour*/
127
+ color: #fff;
128
+ padding-right:0px;
129
+
130
+ }
131
+ .sf-menu li {
132
+ background: #1F4A75;
133
+ }
134
+
135
+ .sf-menu li li {
136
+ background: #1F4A75;
137
+ }
138
+ .sf-menu li li li {
139
+ background: #1F4A75;
140
+ }
141
+ .sf-menu li:hover, .sf-menu li.sfHover,
142
+ .sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active {
143
+ background: #CFDEFF;
144
+ color: #1F4A75;
145
+ outline: 0;
146
+ }
147
+
148
+
149
+
150
+ /*** arrows **/
151
+ .sf-menu a.sf-with-ul {
152
+ padding-right: 1.75em;
153
+ min-width: 1px; /* trigger IE7 hasLayout so spans position accurately */
154
+ }
155
+ .sf-sub-indicator {
156
+ position: absolute;
157
+ display: block;
158
+ right: 0.5em;
159
+ top: 1.05em; /* IE6 only */
160
+ width: 10px;
161
+ height: 12px;
162
+ text-indent: -999em;
163
+ overflow: hidden;
164
+ background: url('/images/btn/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
165
+ }
166
+ a > .sf-sub-indicator { /* give all except IE6 the correct values */
167
+ top: .6em;
168
+ background-position: 0 -100px; /* use translucent arrow for modern browsers*/
169
+ }
170
+ /* apply hovers to modern browsers */
171
+ a:focus > .sf-sub-indicator,
172
+ a:hover > .sf-sub-indicator,
173
+ a:active > .sf-sub-indicator,
174
+ li:hover > a > .sf-sub-indicator,
175
+ li.sfHover > a > .sf-sub-indicator {
176
+ background-position: -10px -100px; /* arrow hovers for modern browsers*/
177
+ }
178
+
179
+ /* point right for anchors in subs */
180
+ .sf-menu ul .sf-sub-indicator { background-position: -15px 0; }
181
+ .sf-menu ul a > .sf-sub-indicator { background-position: 0 0; }
182
+ /* apply hovers to modern browsers */
183
+ .sf-menu ul a:focus > .sf-sub-indicator,
184
+ .sf-menu ul a:hover > .sf-sub-indicator,
185
+ .sf-menu ul a:active > .sf-sub-indicator,
186
+ .sf-menu ul li:hover > a > .sf-sub-indicator,
187
+ .sf-menu ul li.sfHover > a > .sf-sub-indicator {
188
+ background-position: -10px 0; /* arrow hovers for modern browsers*/
189
+ }
190
+
191
+ /*** shadows for all but IE6 ***/
192
+ .sf-shadow ul {
193
+ background: url('/images/btn/shadow.png') no-repeat bottom right;
194
+ padding: 0 6px 9px 0;
195
+ -moz-border-radius-bottomleft: 17px;
196
+ -moz-border-radius-topright: 17px;
197
+ -webkit-border-top-right-radius: 17px;
198
+ -webkit-border-bottom-left-radius: 17px;
199
+ }
200
+ .sf-shadow ul.sf-shadow-off {
201
+ background: transparent;
202
+ }
@@ -15,7 +15,7 @@
15
15
  #toolbar { width: 160px; border-color: #000; vertical-align: top; display: table-cell;padding: 5px 5px 5px 5px;}
16
16
  #toolbarContent{}
17
17
  #wrapper_body{background-color:#fff;}
18
- #content_logo{width: 779px}
18
+ #content_logo{/*width: 779px*/}
19
19
 
20
20
 
21
21
  /*************** HOME ****************/
@@ -340,7 +340,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
340
340
  .ui-widget .ui-widget { font-size: 1em; }
341
341
  .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
342
342
  .ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
343
- .ui-widget-content a { color: #222222/*{fcContent}*/; }
343
+ /*.ui-widget-content a { color: #222222 }*/
344
344
  .ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
345
345
  .ui-widget-header a { color: #222222/*{fcHeader}*/; }
346
346
 
@@ -1,4 +1,5 @@
1
1
  /******************** Common ***********************/
2
+
2
3
  .pagination {
3
4
  padding: 5px 5px 5px 5px;
4
5
  text-align: center;
@@ -38,13 +39,13 @@
38
39
  .message .subject {
39
40
  }
40
41
  .message .date {
42
+ color: #6C6D6F;
41
43
  }
42
44
  .conversation_full .messages .unread .header{
43
- color: #FFF;
44
- background-color: #708EE5;
45
+ background-color: #E0E0FF;
45
46
  }
46
47
  .conversation_full .messages .unread .body{
47
- border: 1px solid #708EE5;
48
+ border: 1px solid #E0E0FF;
48
49
  }
49
50
  .conversation_full .messages .unread .subject{
50
51
  font-weight: bold;
@@ -105,9 +106,10 @@
105
106
  font-weight: bold;
106
107
  }
107
108
  .conversations .conversation .date {
109
+ color: #6C6D6F;
108
110
  }
109
111
  .conversations .conversation .briefing {
110
- color: #2A48A0;
112
+ color: #6C6D6F;
111
113
  }
112
114
  .conversations .conversation .notification {
113
115
  float:left;