social_stream 2.0.0.beta1 → 2.0.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (179) hide show
  1. checksums.yaml +4 -4
  2. data/base/app/assets/images/icons/favicon.ico +0 -0
  3. data/base/app/assets/images/jplayer.blue.monday.png +0 -0
  4. data/base/app/assets/javascripts/social_stream-base.js +1 -0
  5. data/base/app/assets/javascripts/social_stream/pagination.js +6 -3
  6. data/base/app/assets/stylesheets/social_stream-base.css.sass +11 -4
  7. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +4 -0
  8. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +4 -1
  9. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +6 -3
  10. data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-768px-979px.css.sass +0 -2
  11. data/base/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +10 -3
  12. data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +8 -1
  13. data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +19 -0
  14. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_devise.css.sass +5 -1
  15. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass +20 -3
  16. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_frontpage.css.sass +3 -1
  17. data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-1200px-min.css.sass +2 -0
  18. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +67 -21
  19. data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +0 -2
  20. data/base/app/assets/stylesheets/social_stream/base/logo/_logo-in.css +18 -18
  21. data/base/app/assets/stylesheets/social_stream/base/logo/_logo-out.css +8 -8
  22. data/base/app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css.sass +78 -0
  23. data/base/app/assets/stylesheets/social_stream/base/mixins/_animation.css.sass +5 -0
  24. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -5
  25. data/base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +4 -0
  26. data/base/app/assets/stylesheets/social_stream/base/notifications/_notifications.css.sass +2 -0
  27. data/base/app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-1200px-min.css.sass +15 -0
  28. data/base/app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-767px-max.css.sass +2 -3
  29. data/base/app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-768px-979px.css.sass +2 -0
  30. data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +2 -0
  31. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +1 -0
  32. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +51 -9
  33. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +3 -2
  34. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +0 -5
  35. data/base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +15 -0
  36. data/base/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +1 -4
  37. data/base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +2 -3
  38. data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +14 -22
  39. data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +14 -39
  40. data/base/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass +15 -0
  41. data/base/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +13 -13
  42. data/base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +3 -0
  43. data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +3 -0
  44. data/base/app/assets/stylesheets/social_stream/base/toolbar/layout/_toolbar.css.sass +5 -4
  45. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +27 -0
  46. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +29 -0
  47. data/base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-768px-979px.css.sass +9 -0
  48. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_navbar.scss +4 -2
  49. data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_variables.scss +3 -2
  50. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
  51. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
  52. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
  53. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
  54. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
  55. data/base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
  56. data/base/app/assets/stylesheets/social_stream/fonts/OpenSans-Light.ttf +0 -0
  57. data/base/app/assets/stylesheets/social_stream/fonts/colorfont.css +11 -0
  58. data/base/app/assets/stylesheets/social_stream/fonts/fonts.css +20 -3
  59. data/base/app/controllers/omniauth_callbacks_controller.rb +1 -2
  60. data/base/app/helpers/posts_helper.rb +10 -0
  61. data/base/app/models/activity_object.rb +20 -2
  62. data/base/app/models/user.rb +17 -22
  63. data/base/app/views/activities/_index.html.erb +2 -2
  64. data/base/app/views/comments/_quick_search_result.html.erb +1 -1
  65. data/base/app/views/contacts/_pendings.html.erb +1 -1
  66. data/base/app/views/contacts/_suggestions.html.erb +1 -1
  67. data/base/app/views/conversations/_conversation.html.erb +1 -1
  68. data/base/app/views/explore/_explore.html.erb +6 -6
  69. data/base/app/views/explore/_participants.html.erb +6 -6
  70. data/base/app/views/explore/_resources.html.erb +7 -7
  71. data/base/app/views/layouts/_header_signed_in.erb +16 -7
  72. data/base/app/views/layouts/_header_signed_out.erb +1 -1
  73. data/base/app/views/layouts/_logo_in.html.erb +15 -13
  74. data/base/app/views/layouts/_logo_out.html.erb +19 -0
  75. data/base/app/views/layouts/_more.html.erb +1 -1
  76. data/base/app/views/messages/_form.html.erb +1 -1
  77. data/base/app/views/notifications/_index.html.erb +14 -12
  78. data/base/app/views/posts/_quick_search_result.html.erb +1 -1
  79. data/base/app/views/profiles/_profile.html.erb +1 -1
  80. data/base/app/views/relation/customs/index.html.erb +3 -1
  81. data/base/app/views/repositories/show.html.erb +17 -14
  82. data/base/app/views/settings/_index.html.erb +3 -1
  83. data/base/app/views/toolbar/_logo.html.erb +3 -3
  84. data/base/config/locales/en.yml +6 -0
  85. data/base/config/locales/es.yml +6 -0
  86. data/base/config/locales/pt.yml +1 -0
  87. data/base/lib/generators/social_stream/base/install_generator.rb +1 -3
  88. data/base/lib/social_stream/base/version.rb +1 -1
  89. data/base/vendor/assets/javascripts/colorfont.js +26 -0
  90. data/documents/app/assets/stylesheets/social_stream/documents/documents/_documents.css.sass +5 -2
  91. data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass +6 -2
  92. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass +6 -1
  93. data/documents/app/assets/stylesheets/social_stream/documents/responsive/_responsive-768px-979px.css.sass +3 -8
  94. data/documents/app/assets/stylesheets/social_stream/documents/show/_show.css.sass +1 -1
  95. data/documents/app/assets/stylesheets/social_stream/documents/show/layout/_show.css.sass +1 -1
  96. data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass +43 -4
  97. data/documents/app/views/audios/_audio_processed.html.erb +4 -0
  98. data/documents/app/views/audios/_audio_show.html.erb +2 -2
  99. data/documents/app/views/common_documents/_show.html.erb +4 -7
  100. data/documents/app/views/videos/_video_show.html.erb +1 -1
  101. data/documents/lib/social_stream/documents/version.rb +1 -1
  102. data/documents/social_stream-documents.gemspec +1 -1
  103. data/documents/vendor/assets/stylesheets/jplayer.blue.monday.css +449 -449
  104. data/documents/vendor/assets/stylesheets/jplayer.blue.monday.png +0 -0
  105. data/events/app/assets/stylesheets/social_stream/events/calendar/layout/_calendar.css.sass +3 -0
  106. data/events/app/assets/stylesheets/social_stream/events/calendar/layout/_calendar_sidebar.css.sass +0 -2
  107. data/events/app/assets/stylesheets/social_stream/events/repository/_repository.css.sass +2 -3
  108. data/events/app/assets/stylesheets/social_stream/events/repository/layout/_repository.css.sass +9 -2
  109. data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-767px-max.css.sass +4 -4
  110. data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-768px-979px.css.sass +1 -3
  111. data/events/app/controllers/events_controller.rb +1 -1
  112. data/events/app/overrides/layouts/_header_signed_in/icon_nav.html.erb.deface +2 -2
  113. data/events/app/views/events/_new.html.erb +1 -1
  114. data/events/app/views/events/index.html.erb +4 -4
  115. data/events/config/locales/en.yml +3 -0
  116. data/events/config/locales/es.yml +3 -0
  117. data/events/lib/social_stream/events/version.rb +1 -1
  118. data/events/social_stream-events.gemspec +1 -1
  119. data/events/spec/controllers/events_controller_spec.rb +10 -0
  120. data/lib/social_stream/version.rb +1 -1
  121. data/linkser/app/assets/stylesheets/social_stream-linkser.css.sass +6 -1
  122. data/linkser/app/assets/stylesheets/social_stream/linkser/explore/timeline/layout/_timeline-result.css.sass +2 -2
  123. data/linkser/app/assets/stylesheets/social_stream/linkser/responsive/_responsive-1200px-min.css.sass +8 -0
  124. data/linkser/app/assets/stylesheets/social_stream/linkser/responsive/_responsive-767px-max.css.sass +23 -0
  125. data/linkser/app/assets/stylesheets/social_stream/linkser/responsive/_responsive-768px-979px.css.sass +12 -0
  126. data/linkser/app/assets/stylesheets/social_stream/linkser/timeline/layout/_timeline-link.css.sass +49 -11
  127. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  128. data/linkser/social_stream-linkser.gemspec +1 -1
  129. data/oauth2_server/app/assets/images/logos/app-default.png +0 -0
  130. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/_applications-oauth2server.css.sass +6 -5
  131. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/_show-oauth2server.css.sass +4 -1
  132. data/oauth2_server/app/views/site/clients/index.html.erb +2 -2
  133. data/oauth2_server/app/views/site/clients/show.html.erb +4 -2
  134. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  135. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  136. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  137. data/ostatus/social_stream-ostatus.gemspec +1 -1
  138. data/presence/lib/social_stream/presence/version.rb +1 -1
  139. data/presence/social_stream-presence.gemspec +1 -1
  140. data/social_stream.gemspec +7 -7
  141. metadata +41 -54
  142. data/base/app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css +0 -93
  143. data/base/app/views/layouts/_logo-in.html.erb +0 -17
  144. data/base/app/views/layouts/_logo-out.html.erb +0 -17
  145. data/documents/app/assets/images/16/audio.png +0 -0
  146. data/documents/app/assets/images/16/btn_documents.png +0 -0
  147. data/documents/app/assets/images/16/default.png +0 -0
  148. data/documents/app/assets/images/16/doc.png +0 -0
  149. data/documents/app/assets/images/16/mpeg.png +0 -0
  150. data/documents/app/assets/images/16/pdf.png +0 -0
  151. data/documents/app/assets/images/16/photo.png +0 -0
  152. data/documents/app/assets/images/16/plain.png +0 -0
  153. data/documents/app/assets/images/16/ppt.png +0 -0
  154. data/documents/app/assets/images/16/rar.png +0 -0
  155. data/documents/app/assets/images/16/video.png +0 -0
  156. data/documents/app/assets/images/16/xls.png +0 -0
  157. data/documents/app/assets/images/16/zip.png +0 -0
  158. data/documents/app/assets/images/48/audio.png +0 -0
  159. data/documents/app/assets/images/48/default.png +0 -0
  160. data/documents/app/assets/images/48/doc.png +0 -0
  161. data/documents/app/assets/images/48/mpeg.png +0 -0
  162. data/documents/app/assets/images/48/pdf.png +0 -0
  163. data/documents/app/assets/images/48/ppt.png +0 -0
  164. data/documents/app/assets/images/48/rar.png +0 -0
  165. data/documents/app/assets/images/48/resource.png +0 -0
  166. data/documents/app/assets/images/48/video.png +0 -0
  167. data/documents/app/assets/images/48/xls.png +0 -0
  168. data/documents/app/assets/images/48/zip.png +0 -0
  169. data/documents/app/assets/images/80/default.png +0 -0
  170. data/documents/app/assets/images/btn/btn_audio.png +0 -0
  171. data/documents/app/assets/images/btn/btn_document.png +0 -0
  172. data/documents/app/assets/images/btn/btn_excel.png +0 -0
  173. data/documents/app/assets/images/btn/btn_pdf.png +0 -0
  174. data/documents/app/assets/images/btn/btn_picture.png +0 -0
  175. data/documents/app/assets/images/btn/btn_resource.png +0 -0
  176. data/documents/app/assets/images/btn/btn_video.png +0 -0
  177. data/documents/app/assets/images/btn/btn_word.png +0 -0
  178. data/documents/app/assets/images/btn/document.png +0 -0
  179. data/documents/vendor/assets/stylesheets/jplayer.blue.monday.jpg +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4934f083e232a85c8c141d6a04d972755b4387c6
4
- data.tar.gz: 5caff5a8aa95b1247b3d07511d6b04709f1f1ea8
3
+ metadata.gz: cfabcee1a01b8644ba290578de8c3cd5bf08453a
4
+ data.tar.gz: 3a7539a5184ebfd4db782a800d1c5b292070de6b
5
5
  SHA512:
6
- metadata.gz: 0231fb2e9819b492e575cde0d826e42280ce28feaf4291dec5b6c46f2ba86759a146713103dec45ad4b0fa736f3beae8145166b605260afe8b2150e57ad0f223
7
- data.tar.gz: 4ccf21a4dc9ad58498428ca9f2a66c75892d59b6bfdc0ae2529e4dcf97bcd6db0501738c82e8f0114ef869fd54596074dc99753c6184b045c242499beec5eaed
6
+ metadata.gz: 4fa4247dbffa664bf451131a8f2c8fd9dae847ef0f206c58cf3524e3fb4da68702558eee4c7e62382eff8ac676029e8ff3366abd42911c3e173df555736af5af
7
+ data.tar.gz: fa690ea899119790924d5b16d740807e36ac74c55eea38c2e72973aba2b15ebc2de7b663deda2ed0f2e56a2958c42e66de4a4f605d0be1c20e3099d1c3a86f97
@@ -7,6 +7,7 @@
7
7
  //= require i18n
8
8
  //= require i18n/translations
9
9
  //= require flashy
10
+ //= require colorfont
10
11
  //
11
12
  //= require avatars_for_rails
12
13
  //
@@ -1,12 +1,15 @@
1
1
  SocialStream.Pagination = (function(SS, $, undefined){
2
2
 
3
3
  var show = function(callback) {
4
- $(".btn-see-more").each(function(i, btn) {
4
+ var nav = $('nav.more');
5
+
6
+ $('a', nav).each(function(i, btn) {
5
7
  $(btn).attr('data-page', "2");
6
- $(btn).closest('nav.more').find('.loading').hide();
7
8
  });
8
9
 
9
- $(".btn-see-more").click(function(event) {
10
+ $('.loading', nav).hide();
11
+
12
+ $('a', nav).click(function(event) {
10
13
  event.preventDefault();
11
14
 
12
15
  $(event.target).hide();
@@ -8,10 +8,11 @@
8
8
 
9
9
 
10
10
 
11
-
11
+ @import "social_stream/base/mixins/animation"
12
12
  @import "social_stream/base/mixins/buttons"
13
13
  @import "social_stream/base/mixins/layout"
14
14
  @import "social_stream/base/mixins/inputs"
15
+ @import "social_stream/base/mixins/colorfont"
15
16
 
16
17
 
17
18
 
@@ -30,9 +31,6 @@
30
31
 
31
32
  @import "social_stream/base/logo/logo-out"
32
33
 
33
- @import "social_stream/base/logo/layout/logo-in"
34
-
35
- @import "social_stream/base/logo/layout/logo-out"
36
34
 
37
35
  @import "social_stream/base/logo/responsive/responsive-767px-max"
38
36
 
@@ -45,6 +43,7 @@
45
43
  @import "social_stream/base/buttons"
46
44
 
47
45
  @import "social_stream/fonts/fonts"
46
+ @import "social_stream/fonts/colorfont"
48
47
 
49
48
  @import "social_stream/base/icons/icon"
50
49
 
@@ -62,6 +61,8 @@
62
61
 
63
62
 
64
63
 
64
+ @import "social_stream/base/settings/settings"
65
+
65
66
  @import "social_stream/base/settings/layout/settings"
66
67
 
67
68
  @import "social_stream/base/settings/responsive/responsive-768px-979px"
@@ -164,6 +165,8 @@
164
165
 
165
166
  @import "social_stream/base/sidebar/layout/sidebar"
166
167
 
168
+ @import "social_stream/base/sidebar/responsive/responsive-1200px-min"
169
+
167
170
 
168
171
 
169
172
 
@@ -171,6 +174,10 @@
171
174
 
172
175
  @import "social_stream/base/toolbar/layout/toolbar"
173
176
 
177
+ @import "social_stream/base/toolbar/responsive/responsive-768px-979px"
178
+ @import "social_stream/base/toolbar/responsive/responsive-1200px-min"
179
+ @import "social_stream/base/toolbar/responsive/responsive-767px-max"
180
+
174
181
 
175
182
 
176
183
 
@@ -23,6 +23,10 @@
23
23
  /////////////
24
24
 
25
25
 
26
+ #relation_customs
27
+ h2
28
+ @include colorfont-big-size
29
+
26
30
  #relation_customs,
27
31
  .relation_list
28
32
  border-right: 1px solid #c4c4c4
@@ -90,7 +90,10 @@
90
90
  /////////////
91
91
 
92
92
 
93
- #relation_customs,
93
+ #relation_customs
94
+ .relation_customs
95
+ @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
96
+ float: left
94
97
  .relation_list
95
98
  @include makeColumn(3, 0)
96
99
  padding-right: 5px
@@ -1,4 +1,4 @@
1
- //
1
+ s//
2
2
  // Responsive: Large desktop and up
3
3
  // --------------------------------------------------
4
4
 
@@ -9,8 +9,11 @@
9
9
  @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
10
10
  .contacts
11
11
 
12
-
13
12
  .contact-list
14
13
  clear: both
15
14
  min-height: 700px
16
- padding-bottom: 50px
15
+ padding-bottom: 50px
16
+
17
+ #relation_customs
18
+ h2
19
+ margin-bottom: 20px
@@ -7,8 +7,6 @@
7
7
 
8
8
  #contacts
9
9
  .contacts
10
- width: 100% !important
11
- margin-left: 0 !important
12
10
  .tab-content
13
11
  .contact-list
14
12
  clear: both
@@ -88,9 +88,16 @@
88
88
  .active
89
89
  background-position: -9px -10px
90
90
  #conversation
91
- input
92
- &[type="submit"]
93
- float: left
91
+ h2
92
+ @include colorfont-big-size
93
+ form.new_message
94
+ margin-top: 30px
95
+ input
96
+ &[type="submit"]
97
+ float: right
98
+ margin-top: 10px
99
+ #subject
100
+ width: 96.8% !important
94
101
 
95
102
 
96
103
  #content
@@ -60,8 +60,14 @@
60
60
  clear: both
61
61
  display: inline
62
62
  margin-left: 5px
63
+ input
64
+ &[type="submit"]
65
+ height: 40px
63
66
 
64
-
67
+ #explore-header
68
+ .btn
69
+ @include btn-primary
70
+ font-size: 16px
65
71
 
66
72
  /////////////////////////////////////// EXPLORE SEARCH RESULT
67
73
  ///////////// in events, linkser, post, comments
@@ -69,6 +75,7 @@
69
75
  #explore-content
70
76
  #search
71
77
  #search-results
78
+ min-height: 360px
72
79
 
73
80
  .contact
74
81
  width: 240px
@@ -30,7 +30,26 @@
30
30
  @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)
31
31
  @include grid-core-offset(1, $fluidGridColumnWidth, $fluidGridGutterWidth)
32
32
  display: inline-block
33
+ .sub-content-medium,
34
+ .sub-content-full,
35
+ .sub-content-small,
36
+ .sub-content-mini,
37
+ .sub-content-medium-offset,
38
+ .sub-content-full-offset,
39
+ .sub-content-small-offset,
40
+ .sub-content-mini-offset
41
+ .content
42
+ .case
43
+ font-size: 13px
44
+ .first-line-large,
45
+ .first-line-mini,
46
+ a
47
+ font-size: 17px
48
+ margin-bottom: 10px
49
+ .second-line
33
50
 
51
+ margin-top: 10px
52
+
34
53
  .timeline
35
54
  .media
36
55
  .media-heading
@@ -15,6 +15,8 @@
15
15
  background-color: #f6f6f6
16
16
  &[type="text"]
17
17
  background-color: #f6f6f6
18
+ .options
19
+ font-size: 12px
18
20
 
19
21
 
20
22
  #forgot-pass
@@ -32,4 +34,6 @@
32
34
  &[type="email"]
33
35
  background-color: #f6f6f6
34
36
  &[type="text"]
35
- background-color: #f6f6f6
37
+ background-color: #f6f6f6
38
+ .options
39
+ font-size: 12px
@@ -2,16 +2,19 @@
2
2
  #new_session
3
3
 
4
4
  .explanation
5
- background-color: $white
5
+ background-color: rgba(255, 255, 255, 0.8)
6
6
  border-left: 12px solid $blue
7
7
  .big
8
8
  font-size: 18px
9
9
  font-weight: bold
10
10
  line-height: 28px
11
11
  .lite
12
- color: $gray
12
+ color: #888
13
+ font-family: $sansFontFamilyLight
14
+ font-size: 15.5px
13
15
  .btn
14
16
  font-size: 15px
17
+ @include btn-secundary
15
18
 
16
19
  #sign_in
17
20
  @include box-shadow(0px 0px 13px rgba(50, 50, 50, 0.15))
@@ -29,12 +32,25 @@
29
32
  background-color: #f6f6f6
30
33
  &[type="mail"]
31
34
  background-color: #f6f6f6
35
+ #remember
36
+ font-size: 20px
37
+ label
38
+ font-size: 12px
39
+ .options
40
+ font-size: 12px
32
41
 
33
42
 
34
43
 
35
44
 
36
45
  #presentation
37
- border-top: 1px solid #d3d3d3
46
+ border-top: 1px solid #eee
47
+ background-color: $white
48
+ background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 9%, rgba(255,255,255,1) 50%, rgba(255,255,255,1) 91%, rgba(255,255,255,0) 100%) /* FF3.6+ */
49
+ background: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(255,255,255,0)), color-stop(9%,rgba(255,255,255,1)), color-stop(50%,rgba(255,255,255,1)), color-stop(91%,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,0))) /* Chrome,Safari4+ */
50
+ background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 9%,rgba(255,255,255,1) 50%,rgba(255,255,255,1) 91%,rgba(255,255,255,0) 100%) /* Chrome10+,Safari5.1+ */
51
+ background: -o-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 9%,rgba(255,255,255,1) 50%,rgba(255,255,255,1) 91%,rgba(255,255,255,0) 100%) /* Opera 11.10+ */
52
+ background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 9%,rgba(255,255,255,1) 50%,rgba(255,255,255,1) 91%,rgba(255,255,255,0) 100%) /* IE10+ */
53
+ background: linear-gradient(to right, rgba(255,255,255,0) 0%,rgba(255,255,255,1) 9%,rgba(255,255,255,1) 50%,rgba(255,255,255,1) 91%,rgba(255,255,255,0) 100%) /* W3C */
38
54
  .characteristics
39
55
  @include border-radius (5px)
40
56
  header
@@ -44,4 +60,5 @@
44
60
  border-bottom: 1px solid #ccc
45
61
  p
46
62
  font-size: 13px
63
+ font-family: $sansFontFamilyLight
47
64
  color: #888
@@ -7,7 +7,7 @@
7
7
  width: 54.14286%
8
8
  float: left
9
9
  margin-left: 4%
10
- margin-top: 63px
10
+ margin-top: 28px
11
11
  height: 110px
12
12
  padding: 26px 0px 69px 36px
13
13
  clear: both
@@ -15,6 +15,7 @@
15
15
  margin: 3px 0px 23px 0
16
16
  .btn
17
17
  clear: both
18
+ @include btn-secundary
18
19
  padding: 7px 30px
19
20
  margin-right: 21px
20
21
 
@@ -36,6 +37,7 @@
36
37
  margin: 27px 2% 0 14px
37
38
  h3
38
39
  margin-top: 0px
40
+ margin-bottom: 0px
39
41
  #remember
40
42
  margin-bottom: 10px
41
43
  display: inline !important
@@ -22,6 +22,8 @@
22
22
 
23
23
  #presentation
24
24
  .characteristics
25
+ img
26
+ max-width: 350px
25
27
  header
26
28
  font-size: 31px
27
29
  p
@@ -27,9 +27,45 @@ header
27
27
 
28
28
  .search-mobile
29
29
  @extend .hidden-desktop
30
+ @extend .hidden-tablet
30
31
  float: left
31
- margin-top: 17px
32
- margin-left: 4px
32
+ margin-top: 16px
33
+ margin-left: 39px
34
+ position: absolute
35
+ z-index: 40
36
+ .icon_tool16-searcher
37
+ background-position: -220px -181px
38
+
39
+ input
40
+ &[type="text"]
41
+ width: 0px !important
42
+ text-indent: 1px
43
+ padding: 0 0 0 22px
44
+ width: 0
45
+ height: 22px
46
+ border: 1px solid #eee
47
+ color: #999
48
+ line-height: 20px
49
+ font-weight: bold
50
+ @include border-radius (6px)
51
+
52
+ @include transition (width 0.5s ease-in-out)
53
+
54
+ cursor: pointer
55
+ padding: 2px 11px
56
+
57
+ input
58
+ &:focus
59
+ width: 69% !important
60
+ outline: none
61
+ @include box-shadow (1px 1px 9px rgba(55,55,55,0.5))
62
+ cursor: text
63
+ padding-left: 22px
64
+
65
+
66
+
67
+
68
+
33
69
 
34
70
  .search-nav
35
71
  float: left
@@ -41,6 +77,9 @@ header
41
77
  margin-top: 18px
42
78
  position: absolute
43
79
  z-index: 6
80
+ .query_too_short
81
+ padding-top: 23px
82
+ text-align: center
44
83
  .results
45
84
  ul
46
85
  margin: 20px 0 0 0
@@ -81,28 +120,35 @@ header
81
120
  display: inline-block
82
121
  padding-left: 10px
83
122
  margin-top: 19px
123
+ float: left
84
124
 
85
125
  ul.nav
86
126
  display: inline-table
87
- img
88
- width: 20px
89
- .name
90
- @extend .hidden-phone
91
- vertical-align: bottom
92
- .calendar_icon
93
- @extend .hidden-desktop
94
- .icon_navbar-home.active
95
- background-position: -16px -8px
96
- .icon_navbar-contacts.active
97
- background-position: -96px -8px
98
- .icon_navbar-calendar.active
99
- background-position: -214px -8px
100
- .icon_navbar-resources.active
101
- background-position: -175px -8px
102
- .icon_navbar-message.active
103
- background-position: -55px -8px
104
- .icon_navbar-settings.active
105
- background-position: -252px -7px
127
+ margin-right: -13px
128
+ position: relative
129
+ z-index: 2
130
+ li
131
+ a
132
+ padding: 7px 7px 7px !important
133
+ img
134
+ width: 20px
135
+ .name
136
+ @extend .hidden-phone
137
+ vertical-align: bottom
138
+ .calendar_icon
139
+ @extend .hidden-desktop
140
+ .icon_navbar-home.active
141
+ background-position: -16px -8px
142
+ .icon_navbar-contacts.active
143
+ background-position: -96px -8px
144
+ .icon_navbar-calendar.active
145
+ background-position: -214px -8px
146
+ .icon_navbar-resources.active
147
+ background-position: -175px -8px
148
+ .icon_navbar-message.active
149
+ background-position: -55px -8px
150
+ .icon_navbar-settings.active
151
+ background-position: -252px -7px
106
152
 
107
153
  .dropdown
108
154
  margin-top: 7px