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/jquery-ui.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/contacts/contacts"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/contacts/layouts/contacts"
6
+
7
+ /****************************** Responsive
8
+ @import "social_stream/base/contacts/responsive/responsive-768px-979px"
9
+ @import "social_stream/base/contacts/responsive/responsive-1200px-min"
10
+ @import "social_stream/base/contacts/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/layouts.css.sass ADDED
@@ -0,0 +1,2 @@
1
+ /****************************** Style & Layout
2
+ @import "social_stream/base/mixins/layout"
data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass CHANGED
@@ -30,11 +30,16 @@ header
30
30
  @extend .hidden-tablet
31
31
  float: left
32
32
  margin-top: 16px
33
- margin-left: 39px
33
+ margin-left: 10%
34
34
  position: absolute
35
- z-index: 40
35
+ z-index: 4
36
+ width: 80%
37
+ &:hover
38
+ z-index: 60
36
39
  .icon_tool16-searcher
37
40
  background-position: -220px -181px
41
+ background-image: url("icons/tools_ico-16.png")
42
+ background-repeat: no-repeat
38
43
 
39
44
  input
40
45
  &[type="text"]
@@ -55,8 +60,8 @@ header
55
60
  padding: 2px 11px
56
61
 
57
62
  input
58
- &:focus
59
- width: 69% !important
63
+ &:hover
64
+ width: 86% !important
60
65
  outline: none
61
66
  @include box-shadow (1px 1px 9px rgba(55,55,55,0.5))
62
67
  cursor: text
@@ -126,7 +131,7 @@ header
126
131
  display: inline-table
127
132
  margin-right: -13px
128
133
  position: relative
129
- z-index: 2
134
+ z-index: 6
130
135
  li
131
136
  a
132
137
  padding: 7px 7px 7px !important
data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass CHANGED
@@ -4,8 +4,10 @@ body
4
4
 
5
5
 
6
6
 
7
- #wrapper
8
- @include grid-core($gridColumnWidth, $gridGutterWidth)
7
+ .wrapper
8
+ min-height: 100%
9
+ height: auto !important
10
+ margin: 0 auto -32px
9
11
 
10
12
 
11
13
 
data/base/app/assets/stylesheets/social_stream/base/logo.css.sass ADDED
@@ -0,0 +1,7 @@
1
+ /****************************** Style & Layout
2
+ @import "social_stream/base/logo/logo-in"
3
+
4
+ @import "social_stream/base/logo/logo-out"
5
+
6
+ /****************************** Responsive
7
+ @import "social_stream/base/logo/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/mixins.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ /****************************** Style & layout
2
+ @import "social_stream/base/mixins/animation"
3
+
4
+ @import "social_stream/base/mixins/buttons"
5
+
6
+ @import "social_stream/base/mixins/layout"
7
+
8
+ @import "social_stream/base/mixins/inputs"
9
+
10
+ @import "social_stream/base/mixins/colorfont"
data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass CHANGED
@@ -94,7 +94,6 @@
94
94
  clear: both
95
95
  margin-top: 10px
96
96
  a
97
- width: 53%
98
97
  float: left
99
98
  position: absolute
100
99
  background-color: #eee
@@ -109,18 +108,18 @@
109
108
  text-align: center
110
109
  padding: 0px 10px 0px 4px
111
110
 
112
- &:hover
113
- background-color: #555
114
- color: #fff
115
- text-decoration: none
111
+ &:hover
112
+ background-color: #555
113
+ color: #fff
114
+ text-decoration: none
116
115
 
117
- &:focus
118
- @include tab-focus()
119
-
120
- &.disabled,
121
- &[disabled]
122
- cursor: default
123
- @include opacity(65)
116
+ &:focus
117
+ @include tab-focus()
118
+
119
+ &.disabled,
120
+ &[disabled]
121
+ cursor: default
122
+ @include opacity(65)
124
123
 
125
124
  .loading
126
125
  z-index: 200
data/base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass CHANGED
@@ -1,4 +1,5 @@
1
1
  @mixin colorfont-big-size
2
2
  font-size: 45.5px
3
- line-height: 13px
3
+ line-height: 24px
4
+ margin-bottom: 0px
4
5
 
data/base/app/assets/stylesheets/social_stream/base/notifications.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/notifications/notifications"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/notifications/layout/notifications"
6
+
7
+ /****************************** Responsive
8
+ @import "social_stream/base/notifications/responsive/responsive-768px-979px"
9
+ @import "social_stream/base/notifications/responsive/responsive-1200px-min"
10
+ @import "social_stream/base/notifications/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/profile.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/profile/profile"
3
+
4
+ /****************************** Layout
5
+ @import "social_stream/base/profile/layout/profile"
6
+
7
+ /****************************** Responsive
8
+ @import "social_stream/base/profile/responsive/responsive-768px-979px"
9
+ @import "social_stream/base/profile/responsive/responsive-1200px-min"
10
+ @import "social_stream/base/profile/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass CHANGED
@@ -4,36 +4,46 @@
4
4
  #profile-info
5
5
  h2
6
6
  @include colorfont-big-size
7
+ margin-bottom: 10px
8
+ .colorfont-overlay
9
+ top: 20px !important
7
10
  .tags,
8
11
  .personal,
9
12
  .comunication-info,
10
13
  .experience,
11
14
  .avatar
12
- .briefing
13
- background-color: white
14
- color: $gray
15
- span
16
- @include border-radius(5px)
17
- background-color: #D9EDF7
18
- border: 1px solid #BCE8F1
19
- color: #3A87AD
20
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
15
+ input,
16
+ textarea
17
+ background-color: #f9f9f9
18
+ .accordion-body
19
+ @include gradient-vertical-three-colors($startColor: #e2e2e2, $midColor: #ededed, $colorStop: 3%, $endColor: #f1f1f1)
20
+ width: 100%
21
+ span
22
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
23
+ color: #999
21
24
  p
22
- border-top: 5px solid #f9f9f9
23
25
  background-color: none
26
+ padding-top: 20px
27
+ padding-left: 1px
24
28
 
25
- .update
29
+ form.edit_profile
30
+ input
31
+ &[type="submit"]
32
+ @include btn-secundary
33
+ .avatar
34
+ form.edit_actor
26
35
  background-color: #f9f9f9
27
- form.edit_profile
28
- input
29
- &[type="submit"]
30
- @include buttonBackground($blueDark, $blue, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25))
36
+ padding-left: 10px
37
+ padding-top: 14px
38
+ input
39
+ &[type="file"]
40
+ section.accordion-group
41
+ border: none
42
+
43
+
31
44
 
32
45
  h5
33
46
  color: $grayLighter
34
47
  font-size: 17px
35
48
  font-weight: bold
36
- p
37
- @include border-radius (15px)
38
- background-color: #F9F9F9
39
- border: 0 solid #F9F9F9
49
+
data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass CHANGED
@@ -10,51 +10,48 @@
10
10
  .comunication-info,
11
11
  .experience,
12
12
  .avatar
13
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
14
- margin-left: 0px
15
- .briefing
16
- padding: 1px 0px 16px
17
- min-height: 32px
18
- span
19
- margin-left: 11px
20
- padding: 3px 8px 3px 7px
21
- p
22
- margin: -15px 26px 0 14px
23
- padding: 3px 0px 5px 14px
24
- width: 100%
25
- .empty
26
- float: left
27
- padding: 8px 27px 9px 27px
28
- .update
29
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
30
- background-color: #f9f9f9
31
- margin-left: 0px
32
- padding: 12px 0px 3px 0px !important
33
- form.edit_profile
34
- padding: 0 14px
13
+ input,
14
+ textarea
15
+ .accordion-heading
16
+ .accordion-toggle
17
+ display: inline !important
18
+ .accordion-body
19
+ .accordion-inner
20
+ padding: 9px 15px 37px
21
+ label,
22
+ h6
23
+ margin-bottom: 0px
35
24
  input
36
25
  &[type="submit"]
37
- width: 100% !important
38
- margin: 8px 0px 0px 1px
39
- label,
40
- h6
41
- margin: 13px 2px -6px 2px
42
- display: inline
43
- select
44
- margin: 10px 0 0 4px
26
+ float: right
27
+ margin-top: 10px
28
+ span
29
+ display: inline-block
30
+ padding: 0px 27px 9px 27px
31
+ float: right
32
+
45
33
  .personal,
46
34
  .comunication-info,
47
35
  .experience
48
- .update
49
- input
50
- &[type="text"],
51
- &[type="tel"],
52
- &[type="email"]
53
- width: 95.5% !important
54
- margin: 8px 4px 0px 4px
55
- textarea
36
+ input
37
+ &[type="text"],
38
+ &[type="tel"],
39
+ &[type="email"]
56
40
  width: 95.5% !important
57
- margin: 8px 4px 0px 4px
41
+
42
+
43
+ textarea
44
+ width: 95.5% !important
45
+
46
+ .personal
47
+ .accordion-body
48
+ .accordion-inner
49
+ form
50
+ margin: 0 0 10px
51
+ input
52
+ &[type="submit"]
53
+ float: right
54
+ margin-top: 2px
58
55
  .experience
59
56
  .briefing
60
57
  p
@@ -75,21 +72,19 @@
75
72
  margin: 16px
76
73
  p
77
74
  @include border-radius (15px)
78
- margin: -15px 11px 0 5px
79
- padding: 12px 10px 11px 27px
75
+ margin: -15px 11px 0 0px
76
+ padding: 12px 10px 11px 0px
80
77
  width: 325px
81
78
 
82
- .update
83
- margin-left: 22px
84
-
85
-
79
+ .accordion
80
+ margin-top: 20px
86
81
 
87
82
 
88
83
  #profile_birthday_3i,
89
84
  #profile_birthday_2i,
90
85
  #profile_birthday_1i
91
- width: auto
92
- margin-right: 4px
86
+ width: auto !important
87
+ margin-right: 4px !important
93
88
  .avatar
94
89
  padding: 4px
95
90
  .edit_icon
data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass CHANGED
@@ -24,7 +24,5 @@
24
24
  .avatar
25
25
  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
26
26
  margin-left: 0px
27
-
28
-
29
- .update
30
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
27
+ .accordion-body
28
+ width: 98%
data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass CHANGED
@@ -19,10 +19,8 @@
19
19
  .comunication-info,
20
20
  .experience,
21
21
  .avatar
22
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
23
- .update
24
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
25
-
22
+ width: 97% !important
23
+
26
24
 
27
25
 
28
26
 
@@ -31,4 +29,14 @@
31
29
 
32
30
  @media (max-width: 480px)
33
31
 
32
+ #profile
33
+ #profile-info
34
+ .tags,
35
+ .personal,
36
+ .comunication-info,
37
+ .experience,
38
+ .avatar
39
+ width: 96% !important
40
+ .accordion-heading
41
+ min-height: 40px
34
42
 
data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass CHANGED
@@ -11,13 +11,12 @@
11
11
 
12
12
  #profile-info
13
13
  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
14
- float: none
15
- margin: 0px auto 0px
14
+ float: left !important
15
+ margin: 0 0 0 2.5% !important
16
+ width: 80% !important
16
17
  .tags,
17
18
  .personal,
18
19
  .comunication-info,
19
20
  .experience,
20
21
  .avatar
21
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
22
- .update
23
- @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
22
+ width: 97.5% !important
data/base/app/assets/stylesheets/social_stream/base/responsive.css.sass ADDED
@@ -0,0 +1,6 @@
1
+ /****************************** Responsive
2
+ @import "social_stream/base/responsive/responsive-768px-979px"
3
+
4
+ @import "social_stream/base/responsive/responsive-1200px-min"
5
+
6
+ @import "social_stream/base/responsive/responsive-767px-max"
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass CHANGED
@@ -5,8 +5,8 @@
5
5
 
6
6
  @media (min-width: 1200px)
7
7
  body
8
- font-size: 17px
9
- line-height: 22px
8
+ font-size: 16px
9
+ line-height: 21px
10
10
  label
11
11
  margin-bottom: 0
12
12
  font-size: 17px
@@ -38,7 +38,6 @@
38
38
  margin-right: auto
39
39
 
40
40
  .activities
41
- @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
42
41
  float: left
43
42
  margin-left: 30px
44
43
  margin-right: 30px
@@ -63,7 +62,7 @@
63
62
  a
64
63
  @include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
65
64
  .activities
66
- @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
65
+ width: 61%
67
66
  margin-left: 3%
68
67
  margin-rigth: 2%
69
68
 
@@ -76,12 +75,16 @@
76
75
  .text
77
76
  h6
78
77
  font-size: 18px !important
78
+ margin-bottom: 12px
79
79
  .url
80
80
  a
81
81
  font-size: 14px !important
82
82
  .description
83
83
  p
84
84
  font-size: 16px
85
+ margin-top: 10px
86
+ a
87
+ margin-top: 10px
85
88
  .actions
86
89
  .post_time_ago,
87
90
  .to_comment,