social_stream 2.0.0.beta2 → 2.0.0.beta3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (227) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/README.rdoc +5 -4
  4. data/Rakefile +1 -1
  5. data/base/app/assets/images/icons/files_ico-50.png +0 -0
  6. data/base/app/assets/images/icons/files_ico-70.png +0 -0
  7. data/base/app/assets/images/logos/medium/group.png +0 -0
  8. data/base/app/assets/images/logos/medium/user.png +0 -0
  9. data/base/app/assets/images/logos/original/group.png +0 -0
  10. data/base/app/assets/images/logos/original/user.png +0 -0
  11. data/base/app/assets/images/logos/small/group.png +0 -0
  12. data/base/app/assets/images/logos/small/user.png +0 -0
  13. data/base/app/assets/javascripts/social_stream/contact.js +23 -56
  14. data/base/app/assets/javascripts/social_stream/object.js +5 -0
  15. data/base/app/assets/javascripts/social_stream/relation_customs.js +1 -1
  16. data/base/app/assets/javascripts/social_stream/wall.js +1 -0
  17. data/base/app/assets/stylesheets/social_stream-base.css.sass +81 -2
  18. data/base/app/assets/stylesheets/social_stream/base/adjust.css.sass +5 -0
  19. data/base/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass} +1 -5
  20. data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +10 -0
  21. data/base/app/assets/stylesheets/social_stream/base/buttons.css.sass +2 -0
  22. data/base/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass} +0 -0
  23. data/base/app/assets/stylesheets/social_stream/base/contacts.css.sass +10 -0
  24. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +12 -7
  25. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +35 -27
  26. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +13 -3
  27. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass +38 -3
  28. data/base/app/assets/stylesheets/social_stream/base/conversation.css.sass +10 -0
  29. data/base/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +3 -3
  30. data/base/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass +3 -0
  31. data/base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass +4 -1
  32. data/base/app/assets/stylesheets/social_stream/base/explore.css.sass +18 -0
  33. data/base/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass +8 -3
  34. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +1 -0
  35. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass +9 -5
  36. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass +4 -5
  37. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +12 -10
  38. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass +2 -0
  39. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass +2 -0
  40. data/base/app/assets/stylesheets/social_stream/base/footer.css.sass +2 -0
  41. data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +4 -3
  42. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass +16 -0
  43. data/base/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass +17 -0
  44. data/base/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass} +2 -7
  45. data/base/app/assets/stylesheets/social_stream/base/icons.css.sass +2 -0
  46. data/base/app/assets/stylesheets/social_stream/base/icons/icon.css.css +52 -38
  47. data/base/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass +10 -0
  48. data/base/app/assets/stylesheets/social_stream/base/{_jquery-ui.css.sass → jquery-ui/_jquery-ui.css.sass} +0 -0
  49. data/base/app/assets/stylesheets/social_stream/base/layouts.css.sass +2 -0
  50. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +10 -5
  51. data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +4 -2
  52. data/base/app/assets/stylesheets/social_stream/base/logo.css.sass +7 -0
  53. data/base/app/assets/stylesheets/social_stream/base/mixins.css.sass +10 -0
  54. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +11 -12
  55. data/base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +2 -1
  56. data/base/app/assets/stylesheets/social_stream/base/notifications.css.sass +10 -0
  57. data/base/app/assets/stylesheets/social_stream/base/profile.css.sass +10 -0
  58. data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +29 -19
  59. data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +42 -47
  60. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -4
  61. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +12 -4
  62. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
  63. data/base/app/assets/stylesheets/social_stream/base/responsive.css.sass +6 -0
  64. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +7 -4
  65. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +1 -2
  66. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +4 -1
  67. data/base/app/assets/stylesheets/social_stream/base/search.css.sass +2 -0
  68. data/base/app/assets/stylesheets/social_stream/base/select2.css.sass +5 -0
  69. data/base/app/assets/stylesheets/social_stream/base/settings.css.sass +10 -0
  70. data/base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +1 -2
  71. data/base/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +5 -0
  72. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass +2 -1
  73. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +4 -2
  74. data/base/app/assets/stylesheets/social_stream/base/sidebar.css.sass +8 -0
  75. data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +1 -1
  76. data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +4 -1
  77. data/base/app/assets/stylesheets/social_stream/base/timeline.css.sass +14 -0
  78. data/base/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +4 -9
  79. data/base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +4 -2
  80. data/base/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass +34 -0
  81. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass +14 -0
  82. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass +28 -0
  83. data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass +14 -0
  84. data/base/app/assets/stylesheets/social_stream/base/toolbar.css.sass +10 -0
  85. data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +28 -8
  86. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +1 -2
  87. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +14 -2
  88. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss +1 -1
  89. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss +8 -0
  90. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss +4 -0
  91. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf +0 -0
  92. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf +0 -0
  93. data/base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf +0 -0
  94. data/base/app/assets/stylesheets/social_stream/fonts/colorfont.css +4 -4
  95. data/base/app/assets/stylesheets/social_stream/fonts/fonts.css +4 -4
  96. data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass +5 -0
  97. data/base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass +5 -0
  98. data/base/app/controllers/repositories_controller.rb +2 -3
  99. data/base/app/helpers/contacts_helper.rb +30 -17
  100. data/base/app/models/activity_object.rb +16 -17
  101. data/base/app/models/profile.rb +0 -4
  102. data/base/app/views/activities/_root.html.erb +1 -1
  103. data/base/app/views/activities/_timeline_modal.html.erb +2 -2
  104. data/base/app/views/contacts/_contact.html.erb +2 -2
  105. data/base/app/views/contacts/index.html.erb +6 -0
  106. data/base/app/views/explore/_followed.html.erb +6 -6
  107. data/base/app/views/groups/{_new.html.erb → _form.html.erb} +4 -7
  108. data/base/app/views/groups/_new_modal.html.erb +11 -0
  109. data/base/app/views/groups/new.html.erb +5 -1
  110. data/base/app/views/layouts/_footer.html.erb +1 -1
  111. data/base/app/views/layouts/application.html.erb +7 -8
  112. data/base/app/views/profiles/_avatar.html.erb +9 -9
  113. data/base/app/views/profiles/_comunication-info.html.erb +8 -8
  114. data/base/app/views/profiles/_experience.html.erb +15 -15
  115. data/base/app/views/profiles/_personal.html.erb +13 -12
  116. data/base/app/views/profiles/_profile.html.erb +33 -26
  117. data/base/app/views/profiles/_tags.html.erb +8 -12
  118. data/base/app/views/subjects/_subject.html.erb +1 -1
  119. data/base/app/views/toolbar/_logo.html.erb +6 -7
  120. data/base/app/views/toolbar/_profile.html.erb +9 -12
  121. data/base/config/locales/en.yml +462 -444
  122. data/base/config/locales/es.yml +464 -461
  123. data/base/config/locales/pt.yml +504 -379
  124. data/base/config/locales/zh.yml +479 -409
  125. data/base/lib/social_stream/base/version.rb +1 -1
  126. data/base/lib/social_stream/population/actor.rb +10 -0
  127. data/base/lib/social_stream/search.rb +11 -2
  128. data/base/lib/tasks/db/populate.rake +57 -16
  129. data/base/social_stream-base.gemspec +1 -1
  130. data/base/spec/views/profiles_spec.rb +5 -3
  131. data/documents/app/assets/javascripts/social_stream/audio.js.erb +5 -5
  132. data/documents/app/assets/javascripts/social_stream/documents.timeline.js +24 -6
  133. data/documents/app/assets/javascripts/social_stream/documents.wall.js +37 -32
  134. data/documents/app/assets/javascripts/social_stream/video.js +33 -0
  135. data/documents/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass +3 -0
  136. data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass +12 -7
  137. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass +8 -1
  138. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-767px-max.css.sass +27 -2
  139. data/documents/app/assets/stylesheets/social_stream/documents/show/_show.css.sass +29 -0
  140. data/documents/app/assets/stylesheets/social_stream/documents/show/layout/_show.css.sass +36 -0
  141. data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass +27 -12
  142. data/documents/app/views/audios/_audio_processed.html.erb +5 -46
  143. data/documents/app/views/audios/_audio_show.html.erb +16 -57
  144. data/documents/app/views/audios/_player.html.erb +42 -0
  145. data/documents/app/views/common_documents/_index.html.erb +3 -5
  146. data/documents/app/views/videos/_player.html.erb +36 -0
  147. data/documents/app/views/videos/_video_processed.html.erb +5 -43
  148. data/documents/app/views/videos/_video_show.html.erb +10 -60
  149. data/documents/config/locales/en.yml +67 -67
  150. data/documents/config/locales/es.yml +67 -64
  151. data/documents/config/locales/zh.yml +90 -0
  152. data/documents/lib/generators/social_stream/documents/templates/initializer.rb +1 -1
  153. data/documents/lib/social_stream-documents.rb +1 -1
  154. data/documents/lib/social_stream/documents/version.rb +1 -1
  155. data/documents/social_stream-documents.gemspec +1 -1
  156. data/events/app/assets/javascripts/social_stream/fullcalendar.js +14 -2
  157. data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-767px-max.css.sass +12 -9
  158. data/events/app/controllers/events_controller.rb +7 -1
  159. data/events/app/views/events/_details.html.erb +18 -16
  160. data/events/app/views/events/_show_modal.html.erb +10 -0
  161. data/events/app/views/sidebar/_calendar.html.erb +1 -1
  162. data/events/config/locales/en.yml +32 -31
  163. data/events/config/locales/es.yml +32 -32
  164. data/events/config/locales/zh.yml +57 -0
  165. data/events/lib/social_stream/events/version.rb +1 -1
  166. data/events/social_stream-events.gemspec +1 -1
  167. data/lib/social_stream/components.rb +4 -0
  168. data/lib/social_stream/version.rb +1 -1
  169. data/lib/tasks/i18n.rake +55 -0
  170. data/linkser/app/assets/javascripts/social_stream/linkser.wall.js +12 -6
  171. data/linkser/app/assets/stylesheets/social_stream/linkser/repository/layout/_repository.css.sass +1 -0
  172. data/linkser/app/assets/stylesheets/social_stream/linkser/timeline/layout/_timeline-link.css.sass +6 -1
  173. data/linkser/app/views/links/_new_activity.html.erb +0 -1
  174. data/linkser/app/views/links/_timeline.html.erb +1 -1
  175. data/linkser/config/locales/en.yml +12 -11
  176. data/linkser/config/locales/es.yml +12 -11
  177. data/linkser/config/locales/zh.yml +17 -0
  178. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  179. data/linkser/social_stream-linkser.gemspec +1 -1
  180. data/linkser/vendor/assets/jplayer.blue.monday.video.play.hover.png +0 -0
  181. data/linkser/vendor/assets/jplayer.blue.monday.video.play.png +0 -0
  182. data/linkser/vendor/assets/stylesheets/jplayer.blue.monday.png +0 -0
  183. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass +1 -1
  184. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass +1 -1
  185. data/oauth2_server/app/views/site/clients/show.html.erb +5 -1
  186. data/oauth2_server/config/locales/en.yml +16 -15
  187. data/oauth2_server/config/locales/es.yml +20 -19
  188. data/oauth2_server/config/locales/zh.yml +30 -0
  189. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  190. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  191. data/ostatus/Rakefile +1 -2
  192. data/ostatus/config/locales/en.yml +34 -33
  193. data/ostatus/config/locales/zh.yml +35 -0
  194. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  195. data/ostatus/social_stream-ostatus.gemspec +1 -1
  196. data/places/config/locales/en.yml +58 -67
  197. data/places/config/locales/es.yml +60 -61
  198. data/presence/app/assets/stylesheets/social_stream/presence/_toolbar-chat.css.sass +2 -2
  199. data/presence/config/locales/en.yml +45 -43
  200. data/presence/config/locales/es.yml +45 -43
  201. data/presence/config/locales/zh.yml +69 -0
  202. data/presence/lib/social_stream/presence/version.rb +1 -1
  203. data/presence/social_stream-presence.gemspec +1 -1
  204. data/social_stream.gemspec +7 -7
  205. metadata +68 -44
  206. data/base/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf +0 -0
  207. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
  208. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
  209. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
  210. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
  211. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
  212. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
  213. data/base/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf +0 -0
  214. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License - Source Sans Pro.txt +0 -93
  215. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf +0 -0
  216. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf +0 -0
  217. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf +0 -0
  218. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf +0 -0
  219. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf +0 -0
  220. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf +0 -0
  221. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf +0 -0
  222. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf +0 -0
  223. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf +0 -0
  224. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf +0 -0
  225. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf +0 -0
  226. data/base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf +0 -0
  227. data/documents/app/assets/javascripts/social_stream/video.js.erb +0 -42
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass CHANGED
@@ -29,6 +29,7 @@
29
29
  .activities
30
30
  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
31
31
  margin-left: 0
32
+ margin-top: 20px
32
33
 
33
34
 
34
35
 
@@ -69,7 +70,6 @@
69
70
 
70
71
 
71
72
 
72
-
73
73
  #profile
74
74
  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
75
75
  margin-left: 0px
@@ -93,7 +93,6 @@
93
93
  #toolbar
94
94
  h2
95
95
  background-color: #c4c4c4
96
- color: $white
97
96
  font-weight: bold
98
97
  padding-left: 10px
99
98
  border-top-left-radius: 10px
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass CHANGED
@@ -9,7 +9,10 @@
9
9
  ul
10
10
  margin-top: 13px
11
11
 
12
-
12
+ header
13
+ .navbar-inner
14
+ .search-nav
15
+ margin: 0px 0 0 43px
13
16
 
14
17
  footer
15
18
  @extend .hidden-tablet
data/base/app/assets/stylesheets/social_stream/base/search.css.sass ADDED
@@ -0,0 +1,2 @@
1
+ /****************************** Style & Layout
2
+ @import "social_stream/base/search/header"
data/base/app/assets/stylesheets/social_stream/base/select2.css.sass ADDED
@@ -0,0 +1,5 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/select2/sselect2"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/select2/layout/sselect2"
data/base/app/assets/stylesheets/social_stream/base/settings.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/settings/settings"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/settings/layout/settings"
6
+
7
+ /****************************** Responsive
8
+ @import "social_stream/base/settings/responsive/responsive-768px-979px"
9
+ @import "social_stream/base/settings/responsive/responsive-1200px-min"
10
+ @import "social_stream/base/settings/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass CHANGED
@@ -5,8 +5,7 @@
5
5
  @include colorfont-big-size
6
6
  line-height: 32px
7
7
  widht: 100%
8
- .colorfont-overlay
9
- color: #f2f2f2
8
+
10
9
 
11
10
  .accordion
12
11
  .settings_content
data/base/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass CHANGED
@@ -9,6 +9,11 @@
9
9
  h2
10
10
  margin-top: 0
11
11
  width: 100%
12
+ line-height: 50px
13
+ .colorfont
14
+ color: #e2e2e2
15
+ .colorfont-overlay
16
+ color: #ccc
12
17
  .accordion
13
18
  margin-bottom: 0
14
19
  .settings_content
data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass CHANGED
@@ -16,13 +16,14 @@
16
16
 
17
17
  h2
18
18
  background-color: #c4c4c4
19
- color: $white
20
19
  font-weight: bold
21
20
  padding-left: 2%
22
21
  border-top-left-radius: 10px
23
22
  border-top-right-radius: 10px
24
23
  margin-bottom: 0px !important
25
24
  width: 98%
25
+ span.colorfont-overlay
26
+ padding-left: 2%
26
27
 
27
28
  header
28
29
  border-bottom: 1px solid #c4c4c4
data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass CHANGED
@@ -17,12 +17,14 @@
17
17
  margin-left: 20px
18
18
  h2
19
19
  background-color: #c4c4c4
20
- color: $white
21
20
  font-weight: bold
22
21
  border-top-left-radius: 10px
23
22
  border-top-right-radius: 10px
24
23
  margin: 0px !important
25
-
24
+ padding-left: 2%
25
+ width: 98%
26
+ span.colorfont-overlay
27
+ padding-left: 2%
26
28
  header
27
29
  border-bottom: 1px solid #c4c4c4
28
30
  padding-left: 20px
data/base/app/assets/stylesheets/social_stream/base/sidebar.css.sass ADDED
@@ -0,0 +1,8 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/sidebar/sidebar"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/sidebar/layout/sidebar"
6
+
7
+ /****************************** Responsive
8
+ @import "social_stream/base/sidebar/responsive/responsive-1200px-min"
data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass CHANGED
@@ -2,7 +2,7 @@
2
2
  #suggestions,
3
3
  #pendings
4
4
  h4
5
- font-size: 35.5px
5
+ font-size: 33.5px
6
6
 
7
7
  .contact
8
8
  .avatar
data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass CHANGED
@@ -30,6 +30,9 @@
30
30
  width: auto
31
31
 
32
32
  #suggestions
33
- margin-top: 20px
33
+ margin-top: 30px
34
+
35
+ #pendings
36
+ margin-top: 40px
34
37
 
35
38
 
data/base/app/assets/stylesheets/social_stream/base/timeline.css.sass ADDED
@@ -0,0 +1,14 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/timeline/timeline"
3
+
4
+ @import "social_stream/base/timeline/wrapper_activities"
5
+
6
+ /****************************** Layout
7
+ @import "social_stream/base/timeline/layout/timeline"
8
+
9
+ @import "social_stream/base/timeline/layout/wrapper_activities"
10
+
11
+ /****************************** Responsive
12
+ @import "social_stream/base/timeline/responsive/responsive-768px-979px"
13
+ @import "social_stream/base/timeline/responsive/responsive-1200px-min"
14
+ @import "social_stream/base/timeline/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass CHANGED
@@ -27,6 +27,9 @@
27
27
  .objects
28
28
  word-wrap: break-word
29
29
  .thumb
30
+ img
31
+ float: left
32
+ z-index: 1
30
33
 
31
34
  .text
32
35
  font-size: 12px
@@ -145,15 +148,7 @@
145
148
  #modal-carousel
146
149
  img
147
150
  @include border-radius(3px)
148
- margin-left: auto
149
- margin-right: auto
150
- max-height: 400px
151
151
  .carousel-control
152
- padding-top: 7%
153
- padding-bottom: 9%
154
- top: 43%
155
- left: 1
156
- height: auto
157
152
  line-height: 0
158
-
153
+
159
154
 
data/base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass CHANGED
@@ -43,7 +43,7 @@
43
43
  .info
44
44
  width: 53%
45
45
  display: inline-block
46
- margin-left: 2%
46
+ margin-left: 1%
47
47
  .description
48
48
  textarea
49
49
  min-height: 80px
@@ -65,9 +65,11 @@
65
65
  display: inline
66
66
  padding: 1px 6px 4px 6px
67
67
  .form-privacy
68
- width: 20%
69
68
  display: inline-block
70
69
  @include btn-add
70
+ .btn-group
71
+ button
72
+ padding: 4px 12px 4px 8px
71
73
 
72
74
 
73
75
  #post_text
data/base/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass CHANGED
@@ -4,6 +4,7 @@
4
4
  #home,
5
5
  #time-line,
6
6
  .timeline
7
+ @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
7
8
  .comments
8
9
  .media
9
10
  padding-bottom: 13px
@@ -159,3 +160,36 @@
159
160
  img
160
161
  display: inline
161
162
 
163
+ .timeline
164
+ .more
165
+ @include see-more
166
+ a
167
+ width: 54%
168
+ position: absolute
169
+ z-index: 2
170
+ float: left
171
+ .loading
172
+ z-index: 200
173
+ position: relative
174
+ .modal
175
+ top: 4% !important
176
+ .modal-body
177
+ height: auto
178
+ max-height: 600px
179
+ #modal-carousel
180
+ img
181
+ margin-left: auto
182
+ margin-right: auto
183
+ .carousel-control
184
+ padding-top: 7%
185
+ padding-bottom: 9%
186
+ top: 43%
187
+ left: 1
188
+ height: auto
189
+ top: 81%
190
+ .carousel-indicators
191
+ position: relative
192
+ top: 13px
193
+ left: 3px
194
+ right: 0
195
+
data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass ADDED
@@ -0,0 +1,14 @@
1
+ //
2
+ // Responsive: Large desktop and up
3
+ // --------------------------------------------------
4
+
5
+
6
+ @media (min-width: 1200px)
7
+
8
+ .timeline
9
+ .modal
10
+ .modal-body
11
+ max-height: 700px
12
+ .more
13
+ a
14
+ width: 53%
data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass ADDED
@@ -0,0 +1,28 @@
1
+ //
2
+ // Responsive: Landscape phone to desktop/tablet
3
+ // --------------------------------------------------
4
+
5
+
6
+ @media (max-width: 767px)
7
+
8
+ .timeline
9
+ .more
10
+ a
11
+ width: 89% !important
12
+ .modal
13
+ .modal-body
14
+ max-height: 400px
15
+
16
+
17
+
18
+
19
+
20
+ // UP TO LANDSCAPE PHONE
21
+ // ---------------------
22
+
23
+ @media (max-width: 480px)
24
+
25
+ .timeline
26
+ .more
27
+ a
28
+ width: 85% !important
data/base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass ADDED
@@ -0,0 +1,14 @@
1
+ //
2
+ // Responsive: Tablet to desktop
3
+ // --------------------------------------------------
4
+
5
+
6
+ @media (min-width: 768px) and (max-width: 979px)
7
+
8
+ .timeline
9
+ .modal
10
+ .modal-body
11
+ max-height: 500px
12
+ .more
13
+ a
14
+ width: 91%
data/base/app/assets/stylesheets/social_stream/base/toolbar.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/toolbar/toolbar"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/toolbar/layout/toolbar"
6
+
7
+ /****************************** Responsive
8
+ @import "social_stream/base/toolbar/responsive/responsive-768px-979px"
9
+ @import "social_stream/base/toolbar/responsive/responsive-1200px-min"
10
+ @import "social_stream/base/toolbar/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass CHANGED
@@ -1,17 +1,20 @@
1
1
  .toolbar-profile
2
2
  .toolbar_menu
3
3
  ul
4
- background: $white
4
+ background: #f9f9f9
5
5
  li
6
6
  @include btn-primary
7
7
  @include border-radius(5px)
8
8
  padding: 4px 7px
9
+ margin-bottom: 5px
10
+ a
11
+ @include ellipsis
9
12
  .icon_tool16-info
10
13
  background-position: -192px -110px
11
14
  .icon_navbar-resources
12
- background-position: -175px -8px
15
+ background-position: -175px -12px
13
16
  .icon_navbar-message
14
- background-position: -55px -8px
17
+ background-position: -55px -11px
15
18
  &:hover
16
19
  .icon_tool16-info
17
20
  background-position: -192px -235px
@@ -58,7 +61,18 @@
58
61
 
59
62
 
60
63
 
61
- #toolbar
64
+ #toolbar
65
+ h5
66
+ position: relative
67
+ margin-top: 7px
68
+ margin-bottom: 16px
69
+ font-size: 16px
70
+ @include ellipsis
71
+ a
72
+ color: #666
73
+ &:hover
74
+ text-decoration: none
75
+ color: #444
62
76
  .contact-button
63
77
  @include btn-add
64
78
 
@@ -89,11 +103,17 @@
89
103
  @include ellipsis
90
104
  img
91
105
  @include border-radius(5px)
92
- h5
106
+ .subject-name-phone
107
+ position: relative
108
+ margin-top: 7px
109
+ margin-bottom: 16px
110
+ font-size: 16px
111
+ @include ellipsis
93
112
  a
94
- text-decoration: none
95
- color: $black
96
- text-aling: center
113
+ color: #666
114
+ &:hover
115
+ text-decoration: none
116
+ color: #444
97
117
 
98
118
  .logo_caption
99
119
  font-size: 15px
data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass CHANGED
@@ -6,9 +6,8 @@
6
6
  @media (min-width: 1200px)
7
7
 
8
8
  #toolbar
9
- width: 9.9%
9
+ width: 145px
10
10
  float: left
11
- margin-left: 3.25%
12
11
  h5
13
12
  a
14
13
  font-size: 25px
data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass CHANGED
@@ -8,15 +8,27 @@
8
8
 
9
9
  #toolbar
10
10
  width: 100%
11
+ margin-bottom: 20px
11
12
  .user
12
13
  width: 39%
13
14
  float: left
14
- #avatar_profile
15
- float: left
15
+ #avatar_profile
16
+ float: left
17
+ .subject-name-phone
18
+ position: absolute
19
+ margin-left: 16px
20
+ margin-top: -2px
21
+ font-size: 20px
22
+ margin-bottom: 0px
23
+ @include ellipsis
24
+ width: 178px
16
25
  .toolbar_menu
17
26
  display: inline-block
18
27
  width: 47%
19
28
  margin-left: 4%
29
+ margin-top: 27px
30
+ ul
31
+ margin-top: -6px
20
32
 
21
33
 
22
34