social_stream-base 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 (149) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/icons/files_ico-50.png +0 -0
  3. data/app/assets/images/icons/files_ico-70.png +0 -0
  4. data/app/assets/images/logos/medium/group.png +0 -0
  5. data/app/assets/images/logos/medium/user.png +0 -0
  6. data/app/assets/images/logos/original/group.png +0 -0
  7. data/app/assets/images/logos/original/user.png +0 -0
  8. data/app/assets/images/logos/small/group.png +0 -0
  9. data/app/assets/images/logos/small/user.png +0 -0
  10. data/app/assets/javascripts/social_stream/contact.js +23 -56
  11. data/app/assets/javascripts/social_stream/object.js +5 -0
  12. data/app/assets/javascripts/social_stream/relation_customs.js +1 -1
  13. data/app/assets/javascripts/social_stream/wall.js +1 -0
  14. data/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass} +1 -5
  15. data/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +10 -0
  16. data/app/assets/stylesheets/social_stream/base/adjust.css.sass +5 -0
  17. data/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass} +0 -0
  18. data/app/assets/stylesheets/social_stream/base/buttons.css.sass +2 -0
  19. data/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +12 -7
  20. data/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +35 -27
  21. data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +13 -3
  22. data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass +38 -3
  23. data/app/assets/stylesheets/social_stream/base/contacts.css.sass +10 -0
  24. data/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +3 -3
  25. data/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass +3 -0
  26. data/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass +4 -1
  27. data/app/assets/stylesheets/social_stream/base/conversation.css.sass +10 -0
  28. data/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass +8 -3
  29. data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +1 -0
  30. data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass +9 -5
  31. data/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass +4 -5
  32. data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +12 -10
  33. data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass +2 -0
  34. data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass +2 -0
  35. data/app/assets/stylesheets/social_stream/base/explore.css.sass +18 -0
  36. data/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +4 -3
  37. data/app/assets/stylesheets/social_stream/base/footer.css.sass +2 -0
  38. data/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass +16 -0
  39. data/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass +17 -0
  40. data/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass} +2 -7
  41. data/app/assets/stylesheets/social_stream/base/icons/icon.css.css +52 -38
  42. data/app/assets/stylesheets/social_stream/base/icons.css.sass +2 -0
  43. data/app/assets/stylesheets/social_stream/base/{_jquery-ui.css.sass → jquery-ui/_jquery-ui.css.sass} +0 -0
  44. data/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass +10 -0
  45. data/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +10 -5
  46. data/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +4 -2
  47. data/app/assets/stylesheets/social_stream/base/layouts.css.sass +2 -0
  48. data/app/assets/stylesheets/social_stream/base/logo.css.sass +7 -0
  49. data/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +11 -12
  50. data/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +2 -1
  51. data/app/assets/stylesheets/social_stream/base/mixins.css.sass +10 -0
  52. data/app/assets/stylesheets/social_stream/base/notifications.css.sass +10 -0
  53. data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +29 -19
  54. data/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +42 -47
  55. data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -4
  56. data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +12 -4
  57. data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
  58. data/app/assets/stylesheets/social_stream/base/profile.css.sass +10 -0
  59. data/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +7 -4
  60. data/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +1 -2
  61. data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +4 -1
  62. data/app/assets/stylesheets/social_stream/base/responsive.css.sass +6 -0
  63. data/app/assets/stylesheets/social_stream/base/search.css.sass +2 -0
  64. data/app/assets/stylesheets/social_stream/base/select2.css.sass +5 -0
  65. data/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +1 -2
  66. data/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +5 -0
  67. data/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass +2 -1
  68. data/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +4 -2
  69. data/app/assets/stylesheets/social_stream/base/settings.css.sass +10 -0
  70. data/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +1 -1
  71. data/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +4 -1
  72. data/app/assets/stylesheets/social_stream/base/sidebar.css.sass +8 -0
  73. data/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +4 -9
  74. data/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +4 -2
  75. data/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass +34 -0
  76. data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass +14 -0
  77. data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass +28 -0
  78. data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass +14 -0
  79. data/app/assets/stylesheets/social_stream/base/timeline.css.sass +14 -0
  80. data/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +28 -8
  81. data/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +1 -2
  82. data/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +14 -2
  83. data/app/assets/stylesheets/social_stream/base/toolbar.css.sass +10 -0
  84. data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss +1 -1
  85. data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss +8 -0
  86. data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss +4 -0
  87. data/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf +0 -0
  88. data/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf +0 -0
  89. data/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf +0 -0
  90. data/app/assets/stylesheets/social_stream/fonts/colorfont.css +4 -4
  91. data/app/assets/stylesheets/social_stream/fonts/fonts.css +4 -4
  92. data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass +5 -0
  93. data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass +5 -0
  94. data/app/assets/stylesheets/social_stream-base.css.sass +81 -2
  95. data/app/controllers/repositories_controller.rb +2 -3
  96. data/app/helpers/contacts_helper.rb +30 -17
  97. data/app/models/activity_object.rb +16 -17
  98. data/app/models/profile.rb +0 -4
  99. data/app/views/activities/_root.html.erb +1 -1
  100. data/app/views/activities/_timeline_modal.html.erb +2 -2
  101. data/app/views/contacts/_contact.html.erb +2 -2
  102. data/app/views/contacts/index.html.erb +6 -0
  103. data/app/views/explore/_followed.html.erb +6 -6
  104. data/app/views/groups/{_new.html.erb → _form.html.erb} +4 -7
  105. data/app/views/groups/_new_modal.html.erb +11 -0
  106. data/app/views/groups/new.html.erb +5 -1
  107. data/app/views/layouts/_footer.html.erb +1 -1
  108. data/app/views/layouts/application.html.erb +7 -8
  109. data/app/views/profiles/_avatar.html.erb +9 -9
  110. data/app/views/profiles/_comunication-info.html.erb +8 -8
  111. data/app/views/profiles/_experience.html.erb +15 -15
  112. data/app/views/profiles/_personal.html.erb +13 -12
  113. data/app/views/profiles/_profile.html.erb +33 -26
  114. data/app/views/profiles/_tags.html.erb +8 -12
  115. data/app/views/subjects/_subject.html.erb +1 -1
  116. data/app/views/toolbar/_logo.html.erb +6 -7
  117. data/app/views/toolbar/_profile.html.erb +9 -12
  118. data/config/locales/en.yml +462 -444
  119. data/config/locales/es.yml +464 -461
  120. data/config/locales/pt.yml +504 -379
  121. data/config/locales/zh.yml +479 -409
  122. data/lib/social_stream/base/version.rb +1 -1
  123. data/lib/social_stream/population/actor.rb +10 -0
  124. data/lib/social_stream/search.rb +11 -2
  125. data/lib/tasks/db/populate.rake +57 -16
  126. data/social_stream-base.gemspec +1 -1
  127. data/spec/views/profiles_spec.rb +5 -3
  128. metadata +41 -31
  129. data/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf +0 -0
  130. data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
  131. data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
  132. data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
  133. data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
  134. data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
  135. data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
  136. data/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf +0 -0
  137. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License - Source Sans Pro.txt +0 -93
  138. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf +0 -0
  139. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf +0 -0
  140. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf +0 -0
  141. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf +0 -0
  142. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf +0 -0
  143. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf +0 -0
  144. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf +0 -0
  145. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf +0 -0
  146. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf +0 -0
  147. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf +0 -0
  148. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf +0 -0
  149. data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf +0 -0
@@ -0,0 +1,18 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/explore/explore"
3
+
4
+ @import "social_stream/base/explore/explore-search"
5
+
6
+ @import "social_stream/base/explore/explore-timeline"
7
+
8
+ /****************************** Layout
9
+ @import "social_stream/base/explore/layout/explore"
10
+
11
+ @import "social_stream/base/explore/layout/explore-search"
12
+
13
+ @import "social_stream/base/explore/layout/explore-timeline"
14
+
15
+ /****************************** Responsive
16
+ @import "social_stream/base/explore/responsive/responsive-768px-979px"
17
+ @import "social_stream/base/explore/responsive/responsive-1200px-min"
18
+ @import "social_stream/base/explore/responsive/responsive-767px-max"
@@ -1,8 +1,9 @@
1
1
  footer
2
- clear: both
3
- margin: 20px auto 0px
4
- padding: 0
2
+ height: auto
3
+ line-height: 32px
5
4
  text-align: center
5
+ clear: both
6
+ padding-top: 30px
6
7
  ul
7
8
  margin-left: 0
8
9
  li
@@ -0,0 +1,2 @@
1
+ /****************************** Layout
2
+ @import "social_stream/base/footer/layout/footer"
@@ -0,0 +1,16 @@
1
+ /****************************** Style
2
+ @import "social_stream/base/frontpage_devise/frontpage"
3
+
4
+ @import "social_stream/base/frontpage_devise/devise"
5
+
6
+
7
+ /****************************** Layout
8
+ @import "social_stream/base/frontpage_devise/layout/frontpage"
9
+
10
+ @import "social_stream/base/frontpage_devise/layout/devise"
11
+
12
+
13
+ /****************************** Responsive
14
+ @import "social_stream/base/frontpage_devise/responsive/responsive-768px-979px"
15
+ @import "social_stream/base/frontpage_devise/responsive/responsive-1200px-min"
16
+ @import "social_stream/base/frontpage_devise/responsive/responsive-767px-max"
@@ -0,0 +1,17 @@
1
+ // Tag cloud in groups new
2
+ @import 'jqcloud'
3
+ .recent_groups
4
+ li
5
+ text-align: center
6
+
7
+ #group-manage
8
+ h4
9
+ text-align: center
10
+
11
+
12
+ #members,
13
+ #users
14
+ .table td
15
+ vertical-align: middle
16
+ .rol
17
+ vertical-align: middle
@@ -4,10 +4,9 @@
4
4
  li
5
5
  display: inline-block
6
6
  margin: 11px
7
- text-align: center
8
7
  .avatar
9
- img
10
- width: 70px
8
+ img
9
+ width: 70px
11
10
  #group-manage
12
11
  @include makeColumnoMargin(10, 0)
13
12
  h2
@@ -17,8 +16,6 @@
17
16
  .filter
18
17
  width: 300px !important
19
18
  float: right !important
20
- h4
21
- text-align: center
22
19
 
23
20
  #myTabContent
24
21
  margin-rigth: 0px
@@ -26,7 +23,6 @@
26
23
  #members,
27
24
  #users
28
25
  .table td
29
- vertical-align: middle
30
26
  .profile
31
27
  display: inline-block
32
28
  margin-right: 10px
@@ -35,7 +31,6 @@
35
31
  padding: 4px
36
32
  .rol
37
33
  display: inline-block
38
- vertical-align: middle
39
34
  margin-left: 4px
40
35
 
41
36
  .tool
@@ -32,15 +32,15 @@
32
32
  .icon_file_70-rar { background-position: -10px -170px;}
33
33
  .icon_file_70-zip { background-position: -90px -170px;}
34
34
  .icon_file_70-link { background-position: -170px -170px;}
35
- .icon_file_70-embeb { background-position: -250px -170px;}
35
+ .icon_file_70-embed { background-position: -250px -170px;}
36
36
  .icon_file_70-swf { background-position: -330px -176px;}
37
37
  .icon_file_70-mp4 { background-position: -10px -250px;}
38
- .icon_file_70-wemb { background-position: -90px -250px;}
38
+ .icon_file_70-webm { background-position: -90px -250px;}
39
39
  .icon_file_70-flv { background-position: -170px -255px;}
40
40
  .icon_file_70-avi { background-position: -250px -250px;}
41
41
  .icon_file_70-mov { background-position: -330px -250px;}
42
42
  .icon_file_70-webma { background-position: -410px -250px;}
43
- .icon_file_70-bpm { background-position: -10px -336px;}
43
+ .icon_file_70-bmp { background-position: -10px -336px;}
44
44
  .icon_file_70-xcf { background-position: -90px -336px;}
45
45
  .icon_file_70-jpeg { background-position: -170px -336px;}
46
46
  .icon_file_70-gif { background-position: -250px -336px;}
@@ -51,6 +51,9 @@
51
51
  .icon_file_70-ogg { background-position: -170px -410px;}
52
52
  .icon_file_70-aif { background-position: -250px -410px;}
53
53
  .icon_file_70-default { background-position: -330px -407px;}
54
+ .icon_file_70-audio { background-position: -91px -986px;}
55
+ .icon_file_70-video { background-position: -9px -992px;}
56
+ .icon_file_70-image { background-position: -178px -995px;}
54
57
 
55
58
 
56
59
 
@@ -71,15 +74,15 @@
71
74
  .icon_file_70-rar:hover { background-position: -10px -650px;}
72
75
  .icon_file_70-zip :hover { background-position: -90px -650px;}
73
76
  .icon_file_70-link:hover { background-position: -170px -650px;}
74
- .icon_file_70-embeb:hover { background-position: -250px -650px;}
77
+ .icon_file_70-embed:hover { background-position: -250px -650px;}
75
78
  .icon_file_70-flv:hover { background-position: -330px -650px;}
76
79
  .icon_file_70-mp4:hover { background-position: -10px -730px;}
77
- .icon_file_70-wemb:hover { background-position: -90px -730px;}
80
+ .icon_file_70-webm:hover { background-position: -90px -730px;}
78
81
  .icon_file_70-swf:hover { background-position: -170px -730px;}
79
82
  .icon_file_70-avi:hover { background-position: -250px -730px;}
80
83
  .icon_file_70-mov:hover { background-position: -330px -730px;}
81
84
  .icon_file_70-webma:hover { background-position: -410px -730px;}
82
- .icon_file_70-bpm:hover { background-position: -10px -810px;}
85
+ .icon_file_70-bmp:hover { background-position: -10px -810px;}
83
86
  .icon_file_70-xcf:hover { background-position: -90px -810px;}
84
87
  .icon_file_70-jpeg:hover { background-position: -170px -810px;}
85
88
  .icon_file_70-gif:hover { background-position: -250px -810px;}
@@ -89,6 +92,9 @@
89
92
  .icon_file_70-wav:hover { background-position: -90px -890px;}
90
93
  .icon_file_70-ogg:hover { background-position: -170px -890px;}
91
94
  .icon_file_70-aif:hover { background-position: -250px -890px;}
95
+ .icon_file_70-audio:hover { background-position: -170px -410px;}
96
+ .icon_file_70-video:hover { background-position: -250px -410px;}
97
+ .icon_file_70-image:hover { background-position: -330px -407px;}
92
98
 
93
99
  */
94
100
 
@@ -118,15 +124,15 @@
118
124
  .icon_file_50-rar { background-position: -10px -130px;}
119
125
  .icon_file_50-zip { background-position: -70px -130px;}
120
126
  .icon_file_50-link { background-position: -130px -130px;}
121
- .icon_file_50-embeb { background-position: -190px -130px;}
127
+ .icon_file_50-embed { background-position: -190px -130px;}
122
128
  .icon_file_50-swf { background-position: -248px -131px;}
123
129
  .icon_file_50-mp4 { background-position: -10px -190px;}
124
- .icon_file_50-wemb { background-position: -70px -190px;}
130
+ .icon_file_50-webm { background-position: -70px -190px;}
125
131
  .icon_file_50-flv { background-position: -130px -195px;}
126
132
  .icon_file_50-avi { background-position: -190px -190px;}
127
133
  .icon_file_50-mov { background-position: -260px -190px;}
128
134
  .icon_file_50-webma { background-position: -310px -190px;}
129
- .icon_file_50-bpm { background-position: -10px -260px;}
135
+ .icon_file_50-bmp { background-position: -10px -260px;}
130
136
  .icon_file_50-xcf { background-position: -70px -260px;}
131
137
  .icon_file_50-jpeg { background-position: -130px -250px;}
132
138
  .icon_file_50-gif { background-position: -190px -260px;}
@@ -138,7 +144,9 @@
138
144
  .icon_file_50-aif { background-position: -190px -310px;}
139
145
  .icon_50-event { background-position: -252px -307px;}
140
146
  .icon_file_50-default { background-position: -310px -311px;}
141
-
147
+ .icon_file_50-audio { background-position: -68px -731px;}
148
+ .icon_file_50-video { background-position: -10px -738px;}
149
+ .icon_file_50-image { background-position: -130px -738px;}
142
150
 
143
151
  [class^="file_40-"], [class*="icon_file_40-"] {
144
152
  width: 42px;
@@ -149,40 +157,43 @@
149
157
  }
150
158
 
151
159
 
152
- .icon_file_40-xls { background-position: -10px -8px;}
153
- .icon_file_40-doc { background-position: -60px -8px;}
154
- .icon_file_40-ppt { background-position: -112px -7px;}
155
- .icon_file_40-pdf { background-position: -163px -8px;}
156
- .icon_file_40-sla { background-position: -214px -8px;}
157
- .icon_file_40-rtf { background-position: -265px -8px;}
158
- .icon_file_40-txt { background-position: -10px -59px;}
159
- .icon_file_40-odt { background-position: -61px -58px;}
160
- .icon_file_40-ods { background-position: -113px -59px;}
161
- .icon_file_40-rtf { background-position: -164px -59px;}
162
- .icon_file_40-odp { background-position: -215px -59px;}
163
- .icon_file_40-ps { background-position: -266px -59px;}
164
- .icon_file_40-rar { background-position: -9px -112px;}
165
- .icon_file_40-zip { background-position: -60px -112px;}
166
- .icon_file_40-link { background-position: -111px -112px;}
167
- .icon_file_40-embeb { background-position: -162px -112px;}
168
- .icon_file_40-swf { background-position: -213px -112px;}
169
- .icon_file_40-mp4 { background-position: -9px -161px;}
170
- .icon_file_40-wemb { background-position: -60px -161px;}
160
+ .icon_file_40-xls { background-position: -10px -7px;}
161
+ .icon_file_40-doc { background-position: -60px -6px;}
162
+ .icon_file_40-ppt { background-position: -112px -6px;}
163
+ .icon_file_40-pdf { background-position: -163px -6px;}
164
+ .icon_file_40-sla { background-position: -214px -6px;}
165
+ .icon_file_40-rtf { background-position: -263px -57px;}
166
+ .icon_file_40-txt { background-position: -9px -57px;}
167
+ .icon_file_40-odt { background-position: -61px -57px;}
168
+ .icon_file_40-ods { background-position: -113px -57px;}
169
+ .icon_file_40-rtf { background-position: -164px -57px;}
170
+ .icon_file_40-odp { background-position: -215px -57px;}
171
+ .icon_file_40-ps { background-position: -266px -57px;}
172
+ .icon_file_40-rar { background-position: -8px -108px;}
173
+ .icon_file_40-zip { background-position: -59px -109px;}
174
+ .icon_file_40-link { background-position: -110px -110px;}
175
+ .icon_file_40-embed { background-position: -162px -110px;}
176
+ .icon_file_40-swf { background-position: -213px -110px;}
177
+ .icon_file_40-mp4 { background-position: -9px -160px;}
178
+ .icon_file_40-webm { background-position: -60px -161px;}
171
179
  .icon_file_40-flv { background-position: -110px -165px;}
172
180
  .icon_file_40-avi { background-position: -162px -161px;}
173
181
  .icon_file_40-mov { background-position: -213px -161px;}
174
182
  .icon_file_40-webma { background-position: -264px -161px;}
175
- .icon_file_40-bpm { background-position: -9px -260px;}
176
- .icon_file_40-xcf { background-position: -59px -260px;}
177
- .icon_file_40-jpeg { background-position: -110px -250px;}
178
- .icon_file_40-gif { background-position: -162px -260px;}
179
- .icon_file_40-png { background-position: -213px -260px;}
180
- .icon_file_40-tiff { background-position: -264px -260px;}
183
+ .icon_file_40-bmp { background-position: -9px -211px;}
184
+ .icon_file_40-xcf { background-position: -60px -211px;}
185
+ .icon_file_40-jpeg { background-position: -112px -211px;}
186
+ .icon_file_40-gif { background-position: -163px -211px;}
187
+ .icon_file_40-png { background-position: -214px -211px;}
188
+ .icon_file_40-tiff { background-position: -266px -211px;}
181
189
  .icon_file_40-mp3 { background-position: -9px -262px;}
182
190
  .icon_file_40-wav { background-position: -60px -262px;}
183
191
  .icon_file_40-ogg { background-position: -111px -262px;}
184
192
  .icon_file_40-aif { background-position: -160px -262px;}
185
193
  .icon_file_40-default { background-position: -263px -262px;}
194
+ .icon_file_40-audio { background-position: -60px -621px;}
195
+ .icon_file_40-video { background-position: -9px -625px;}
196
+ .icon_file_40-image { background-position: -112px -626px;}
186
197
 
187
198
  /*..................hover 50.......................
188
199
  .icon_file_50-default:hover { background-position: 0 -42px;}
@@ -201,15 +212,15 @@
201
212
  .icon_file_50-rar:hover { background-position: -10px -180px;}
202
213
  .icon_file_50-zip:hover { background-position: -70px -180px;}
203
214
  .icon_file_50-link:hover { background-position: -130px -180px;}
204
- .icon_file_50-embeb:hover { background-position: -190px -180px;}
215
+ .icon_file_50-embed:hover { background-position: -190px -180px;}
205
216
  .icon_file_50-flv-1:hover { background-position: -260px -180px;}
206
217
  .icon_file_50-mp4:hover { background-position: -10px -240px;}
207
- .icon_file_50-wemb:hover { background-position: -70px -240px;}
218
+ .icon_file_50-webm:hover { background-position: -70px -240px;}
208
219
  .icon_file_50-flv-2:hover { background-position: -130px -240px;}
209
220
  .icon_file_50-avi:hover { background-position: -190px -240px;}
210
221
  .icon_file_50-mov:hover { background-position: -260px -240px;}
211
222
  .icon_file_50-webma:hover { background-position: -310px -240px;}
212
- .icon_file_50-bpm:hover { background-position: -10px -300px;}
223
+ .icon_file_50-bmp:hover { background-position: -10px -300px;}
213
224
  .icon_file_50-xcf:hover { background-position: -70px -300px;}
214
225
  .icon_file_50-jpeg:hover { background-position: -130px -290px;}
215
226
  .icon_file_50-gif:hove { background-position: -190px -300px;}
@@ -219,6 +230,9 @@
219
230
  .icon_file_50-wav:hover { background-position: -70px -360px;}
220
231
  .icon_file_50-ogg:hover { background-position: -130px -360px;}
221
232
  .icon_file_50-aif:hover { background-position: -190px -360px;}
233
+ .icon_file_50-audio:hover { background-position: -70px -360px;}
234
+ .icon_file_50-video:hover { background-position: -130px -360px;}
235
+ .icon_file_50-image:hover { background-position: -190px -360px;}
222
236
 
223
237
  ....*/
224
238
 
@@ -0,0 +1,2 @@
1
+ /****************************** Style & Layout
2
+ @import "social_stream/base/icons/icon"
@@ -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"
@@ -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
@@ -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
 
@@ -0,0 +1,2 @@
1
+ /****************************** Style & Layout
2
+ @import "social_stream/base/mixins/layout"
@@ -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"
@@ -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
@@ -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
 
@@ -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"
@@ -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"
@@ -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
+
@@ -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
@@ -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%