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.
- checksums.yaml +4 -4
- data/app/assets/images/icons/files_ico-50.png +0 -0
- data/app/assets/images/icons/files_ico-70.png +0 -0
- data/app/assets/images/logos/medium/group.png +0 -0
- data/app/assets/images/logos/medium/user.png +0 -0
- data/app/assets/images/logos/original/group.png +0 -0
- data/app/assets/images/logos/original/user.png +0 -0
- data/app/assets/images/logos/small/group.png +0 -0
- data/app/assets/images/logos/small/user.png +0 -0
- data/app/assets/javascripts/social_stream/contact.js +23 -56
- data/app/assets/javascripts/social_stream/object.js +5 -0
- data/app/assets/javascripts/social_stream/relation_customs.js +1 -1
- data/app/assets/javascripts/social_stream/wall.js +1 -0
- data/app/assets/stylesheets/social_stream/base/{_adjust.css.sass → adjust/_adjust.css.sass} +1 -5
- data/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/adjust.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass} +0 -0
- data/app/assets/stylesheets/social_stream/base/buttons.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +12 -7
- data/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +35 -27
- data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +13 -3
- data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass +38 -3
- data/app/assets/stylesheets/social_stream/base/contacts.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass +3 -3
- data/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass +3 -0
- data/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/conversation.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass +8 -3
- data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass +1 -0
- data/app/assets/stylesheets/social_stream/base/explore/layout/_explore-timeline.css.sass +9 -5
- data/app/assets/stylesheets/social_stream/base/explore/layout/_explore.css.sass +4 -5
- data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass +12 -10
- data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/explore.css.sass +18 -0
- data/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass +4 -3
- data/app/assets/stylesheets/social_stream/base/footer.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass +16 -0
- data/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass +17 -0
- data/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass} +2 -7
- data/app/assets/stylesheets/social_stream/base/icons/icon.css.css +52 -38
- data/app/assets/stylesheets/social_stream/base/icons.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/{_jquery-ui.css.sass → jquery-ui/_jquery-ui.css.sass} +0 -0
- data/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +10 -5
- data/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +4 -2
- data/app/assets/stylesheets/social_stream/base/layouts.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/logo.css.sass +7 -0
- data/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +11 -12
- data/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass +2 -1
- data/app/assets/stylesheets/social_stream/base/mixins.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/notifications.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +29 -19
- data/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +42 -47
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -4
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +12 -4
- data/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
- data/app/assets/stylesheets/social_stream/base/profile.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +7 -4
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +1 -2
- data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/responsive.css.sass +6 -0
- data/app/assets/stylesheets/social_stream/base/search.css.sass +2 -0
- data/app/assets/stylesheets/social_stream/base/select2.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass +1 -2
- data/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass +2 -1
- data/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass +4 -2
- data/app/assets/stylesheets/social_stream/base/settings.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +1 -1
- data/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +4 -1
- data/app/assets/stylesheets/social_stream/base/sidebar.css.sass +8 -0
- data/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass +4 -9
- data/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass +4 -2
- data/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass +34 -0
- data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass +14 -0
- data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass +28 -0
- data/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass +14 -0
- data/app/assets/stylesheets/social_stream/base/timeline.css.sass +14 -0
- data/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +28 -8
- data/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass +1 -2
- data/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-767px-max.css.sass +14 -2
- data/app/assets/stylesheets/social_stream/base/toolbar.css.sass +10 -0
- data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss +1 -1
- data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss +8 -0
- data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss +4 -0
- data/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/colorfont.css +4 -4
- data/app/assets/stylesheets/social_stream/fonts/fonts.css +4 -4
- data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass +5 -0
- data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass +5 -0
- data/app/assets/stylesheets/social_stream-base.css.sass +81 -2
- data/app/controllers/repositories_controller.rb +2 -3
- data/app/helpers/contacts_helper.rb +30 -17
- data/app/models/activity_object.rb +16 -17
- data/app/models/profile.rb +0 -4
- data/app/views/activities/_root.html.erb +1 -1
- data/app/views/activities/_timeline_modal.html.erb +2 -2
- data/app/views/contacts/_contact.html.erb +2 -2
- data/app/views/contacts/index.html.erb +6 -0
- data/app/views/explore/_followed.html.erb +6 -6
- data/app/views/groups/{_new.html.erb → _form.html.erb} +4 -7
- data/app/views/groups/_new_modal.html.erb +11 -0
- data/app/views/groups/new.html.erb +5 -1
- data/app/views/layouts/_footer.html.erb +1 -1
- data/app/views/layouts/application.html.erb +7 -8
- data/app/views/profiles/_avatar.html.erb +9 -9
- data/app/views/profiles/_comunication-info.html.erb +8 -8
- data/app/views/profiles/_experience.html.erb +15 -15
- data/app/views/profiles/_personal.html.erb +13 -12
- data/app/views/profiles/_profile.html.erb +33 -26
- data/app/views/profiles/_tags.html.erb +8 -12
- data/app/views/subjects/_subject.html.erb +1 -1
- data/app/views/toolbar/_logo.html.erb +6 -7
- data/app/views/toolbar/_profile.html.erb +9 -12
- data/config/locales/en.yml +462 -444
- data/config/locales/es.yml +464 -461
- data/config/locales/pt.yml +504 -379
- data/config/locales/zh.yml +479 -409
- data/lib/social_stream/base/version.rb +1 -1
- data/lib/social_stream/population/actor.rb +10 -0
- data/lib/social_stream/search.rb +11 -2
- data/lib/tasks/db/populate.rake +57 -16
- data/social_stream-base.gemspec +1 -1
- data/spec/views/profiles_spec.rb +5 -3
- metadata +41 -31
- data/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License - Source Sans Pro.txt +0 -93
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf +0 -0
- data/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1b083770d40a45ea0f4a805492af2099c37be402
|
4
|
+
data.tar.gz: 3ef6df8d031778b94c0bdc8bfe6fb531cf5e2b78
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 27d419481f415fed4dc8c4e2fbe706a2df8269d70f0539bf1764af2c8767345b839dc8c6cac9ab18db0a90bfde0dbec42fedc555d24e803b1f9c39b6921990ed
|
7
|
+
data.tar.gz: 45123f46b4897d99bdcfc2d34e36b11f3fec3b3821712b86cbfa4a653191b171ec8d697c53e552088b31dbfad6f4b10a6e467e9f7adf60c329fa1389c2fc1c7c
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -1,45 +1,9 @@
|
|
1
1
|
// require jquery.ba-url
|
2
|
+
//
|
3
|
+
//= require social_stream/callback
|
2
4
|
|
3
5
|
SocialStream.Contact = (function($, SS, undefined) {
|
4
|
-
var
|
5
|
-
|
6
|
-
var addIndexCallback = function(callback){
|
7
|
-
indexCallbacks.push(callback);
|
8
|
-
};
|
9
|
-
|
10
|
-
var index = function(){
|
11
|
-
$.each(indexCallbacks, function(i, callback){ callback(); });
|
12
|
-
};
|
13
|
-
|
14
|
-
var showCallbacks = [];
|
15
|
-
|
16
|
-
var addShowCallback = function(callback){
|
17
|
-
showCallbacks.push(callback);
|
18
|
-
};
|
19
|
-
|
20
|
-
var show = function(){
|
21
|
-
$.each(showCallbacks, function(i, callback){ callback(); });
|
22
|
-
};
|
23
|
-
|
24
|
-
var updateCallbacks = [];
|
25
|
-
|
26
|
-
var addUpdateCallback = function(callback){
|
27
|
-
updateCallbacks.push(callback);
|
28
|
-
};
|
29
|
-
|
30
|
-
var update = function(options){
|
31
|
-
$.each(updateCallbacks, function(i, callback){ callback(options); });
|
32
|
-
};
|
33
|
-
|
34
|
-
var destroyCallbacks = [];
|
35
|
-
|
36
|
-
var addDestroyCallback = function(callback){
|
37
|
-
destroyCallbacks.push(callback);
|
38
|
-
};
|
39
|
-
|
40
|
-
var destroy = function(options){
|
41
|
-
$.each(destroyCallbacks, function(i, callback){ callback(options); });
|
42
|
-
};
|
6
|
+
var callback = new SS.Callback();
|
43
7
|
|
44
8
|
var getForms = function(id) {
|
45
9
|
return $('[data-contact_id="' + id + '"]');
|
@@ -66,7 +30,7 @@ SocialStream.Contact = (function($, SS, undefined) {
|
|
66
30
|
success: function(data) {
|
67
31
|
$(tab.attr('href')).find('.contact-list').html(data);
|
68
32
|
tab.attr('data-loaded', 'true');
|
69
|
-
index();
|
33
|
+
callback.handlers.index();
|
70
34
|
}
|
71
35
|
});
|
72
36
|
};
|
@@ -190,7 +154,7 @@ SocialStream.Contact = (function($, SS, undefined) {
|
|
190
154
|
success: function(data) {
|
191
155
|
$('#contacts-loading').hide();
|
192
156
|
currentTab.find('.contact-list').html(data);
|
193
|
-
index();
|
157
|
+
callback.handlers.index();
|
194
158
|
}
|
195
159
|
});
|
196
160
|
};
|
@@ -199,6 +163,10 @@ SocialStream.Contact = (function($, SS, undefined) {
|
|
199
163
|
$('#contacts-loading').hide();
|
200
164
|
};
|
201
165
|
|
166
|
+
var initNewGroupModal = function() {
|
167
|
+
$('.new_group-modal-link').attr('href', '#new_group-modal');
|
168
|
+
};
|
169
|
+
|
202
170
|
var initContactFormsHtmlListener = function() {
|
203
171
|
$('html').on('click.dropdown.data-api', saveForms);
|
204
172
|
};
|
@@ -297,16 +265,19 @@ SocialStream.Contact = (function($, SS, undefined) {
|
|
297
265
|
callback([ { id: element.val(), name: element.attr('data-recipient-name') } ]);
|
298
266
|
};
|
299
267
|
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
268
|
+
callback.register('index',
|
269
|
+
initTabs,
|
270
|
+
initContactButtons,
|
271
|
+
initFilter,
|
272
|
+
initNewGroupModal,
|
273
|
+
hideLoading);
|
304
274
|
|
305
|
-
|
306
|
-
|
307
|
-
|
275
|
+
callback.register('update',
|
276
|
+
updateForms,
|
277
|
+
replaceContact,
|
278
|
+
checkAndHideContact);
|
308
279
|
|
309
|
-
|
280
|
+
callback.register('destroy', hideContact);
|
310
281
|
|
311
282
|
// FIXME There is probably a more efficient way to do this..
|
312
283
|
$(function() {
|
@@ -314,11 +285,7 @@ SocialStream.Contact = (function($, SS, undefined) {
|
|
314
285
|
initContactFormsHtmlListener();
|
315
286
|
});
|
316
287
|
|
317
|
-
return {
|
318
|
-
|
319
|
-
|
320
|
-
update: update,
|
321
|
-
select2: select2,
|
322
|
-
destroy: destroy
|
323
|
-
};
|
288
|
+
return callback.extend({
|
289
|
+
select2: select2
|
290
|
+
});
|
324
291
|
})(jQuery, SocialStream);
|
@@ -70,6 +70,10 @@ SocialStream.Object = (function(SS, $, undefined){
|
|
70
70
|
$('[name$="[relation_ids][]"]').attr('name', type + '[relation_ids][]');
|
71
71
|
};
|
72
72
|
|
73
|
+
var changeOwner = function(type) {
|
74
|
+
$('[name$="[owner_id]"]').attr('name', type + '[owner_id]');
|
75
|
+
};
|
76
|
+
|
73
77
|
callback.register('show',
|
74
78
|
SS.Comment.index,
|
75
79
|
SS.Audience.index);
|
@@ -78,6 +82,7 @@ SocialStream.Object = (function(SS, $, undefined){
|
|
78
82
|
initRelationSelect);
|
79
83
|
|
80
84
|
return callback.extend({
|
85
|
+
changeOwner: changeOwner,
|
81
86
|
changeRelationSelect: changeRelationSelect
|
82
87
|
});
|
83
88
|
|
@@ -50,7 +50,7 @@ SocialStream.RelationCustom = (function(SS, $, undefined){
|
|
50
50
|
};
|
51
51
|
|
52
52
|
var editFormsListener = function(event) {
|
53
|
-
if (event && $(event.
|
53
|
+
if (event && $(event.target).closest('.relation_custom').length) {
|
54
54
|
return;
|
55
55
|
}
|
56
56
|
|
@@ -2,14 +2,10 @@
|
|
2
2
|
h2
|
3
3
|
font-weight: bold
|
4
4
|
color: #8e8e8e
|
5
|
-
margin-top: 0px
|
6
5
|
|
7
6
|
textarea
|
8
7
|
resize: none
|
9
8
|
|
10
|
-
.loading
|
11
|
-
width: auto
|
12
|
-
|
13
9
|
.avatar_profile
|
14
10
|
@include border-radius(8px)
|
15
11
|
.avatar
|
@@ -27,5 +23,5 @@ textarea
|
|
27
23
|
img
|
28
24
|
@include border-radius(4px)
|
29
25
|
|
30
|
-
|
26
|
+
#fdbk_tab
|
31
27
|
background-color: $blue !important
|
data/app/assets/stylesheets/social_stream/base/{_buttons.scss.sass → buttons/_buttons.scss.sass}
RENAMED
File without changes
|
@@ -1,15 +1,20 @@
|
|
1
1
|
#contacts
|
2
2
|
.contacts
|
3
|
+
.new_group-modal-link
|
4
|
+
@include btn-primary
|
5
|
+
@include border-radius(5px)
|
3
6
|
.add
|
4
7
|
@include btn-add
|
5
8
|
|
6
9
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
.tab-content
|
11
|
+
.add-goup
|
12
|
+
float: right
|
13
|
+
.contact-list
|
14
|
+
.contact
|
15
|
+
.x
|
16
|
+
font-size: 12px
|
17
|
+
color: $black
|
13
18
|
|
14
19
|
|
15
20
|
#contact-form
|
@@ -35,7 +40,7 @@
|
|
35
40
|
#new_relation
|
36
41
|
.new_relation_custom
|
37
42
|
.btn
|
38
|
-
|
43
|
+
|
39
44
|
|
40
45
|
|
41
46
|
#permissions
|
@@ -15,8 +15,11 @@
|
|
15
15
|
&[type="text"]
|
16
16
|
margin-left: 0px
|
17
17
|
width: 20% !important
|
18
|
-
float:
|
18
|
+
float: left
|
19
19
|
margin-botom: 0 !important
|
20
|
+
.new_group-modal-link
|
21
|
+
float: right
|
22
|
+
|
20
23
|
.tab-content
|
21
24
|
.contact-list
|
22
25
|
clear: both
|
@@ -90,32 +93,37 @@
|
|
90
93
|
/////////////
|
91
94
|
|
92
95
|
|
93
|
-
#relation_customs
|
94
|
-
.relation_customs
|
95
|
-
@include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
96
|
-
float: left
|
97
|
-
.relation_list
|
98
|
-
@include makeColumn(3, 0)
|
99
|
-
padding-right: 5px
|
100
|
-
input
|
101
|
-
margin-right: 10px
|
102
|
-
label
|
103
|
-
display: inline-block
|
104
96
|
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
97
|
+
.relation_customs
|
98
|
+
width: 80%
|
99
|
+
float: left
|
100
|
+
margin-left: 2.5%
|
101
|
+
.relation_list
|
102
|
+
@include makeColumn(3, 0)
|
103
|
+
padding-right: 5px
|
104
|
+
input
|
105
|
+
margin-right: 10px
|
106
|
+
label
|
107
|
+
display: inline-block
|
108
|
+
|
109
|
+
.actions
|
110
|
+
display: inline-block
|
111
|
+
float: right
|
112
|
+
margin-right: 10px
|
109
113
|
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
114
|
+
.edit_name
|
115
|
+
margin-top: -22px
|
116
|
+
.edit_relation_custom
|
117
|
+
margin-bottom: 0px
|
118
|
+
#relation_custom_name
|
119
|
+
width: 69% !important
|
120
|
+
margin-left: 23px
|
121
|
+
margin-top: -3px
|
122
|
+
.icon_tool16-ok
|
123
|
+
margin-top: -3px
|
116
124
|
|
117
|
-
|
118
|
-
|
125
|
+
.btn
|
126
|
+
margin-left: 32px
|
119
127
|
|
120
128
|
#relation_custom_name
|
121
129
|
width: 215px
|
@@ -130,9 +138,9 @@
|
|
130
138
|
margin-right: 10px
|
131
139
|
.new_relation_custom
|
132
140
|
.btn
|
133
|
-
@include
|
141
|
+
@include btn-secundary
|
134
142
|
float: right
|
135
|
-
margin: 7px
|
143
|
+
margin: 7px 0px 0 0
|
136
144
|
|
137
145
|
|
138
146
|
#new_relation_input_block
|
@@ -141,7 +149,7 @@
|
|
141
149
|
|
142
150
|
|
143
151
|
#permissions
|
144
|
-
@include makeColumn(
|
152
|
+
@include makeColumn(4, 0)
|
145
153
|
h4
|
146
154
|
text-align: left
|
147
155
|
li
|
data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass
CHANGED
@@ -8,12 +8,22 @@ s//
|
|
8
8
|
#contacts
|
9
9
|
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
10
10
|
.contacts
|
11
|
-
|
12
11
|
.contact-list
|
13
12
|
clear: both
|
14
13
|
min-height: 700px
|
15
14
|
padding-bottom: 50px
|
16
15
|
|
17
16
|
#relation_customs
|
18
|
-
|
19
|
-
|
17
|
+
width: 80%
|
18
|
+
.relation_customs
|
19
|
+
h2
|
20
|
+
margin-bottom: 20px
|
21
|
+
.relation_list
|
22
|
+
.relation_custom
|
23
|
+
.actions
|
24
|
+
margin-top: 9px
|
25
|
+
#permissions
|
26
|
+
.permissions ul li
|
27
|
+
input
|
28
|
+
&[type="checkbox"]
|
29
|
+
margin: 0
|
data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass
CHANGED
@@ -10,8 +10,37 @@
|
|
10
10
|
width: 100% !important
|
11
11
|
margin-left: 0
|
12
12
|
|
13
|
-
|
14
|
-
|
13
|
+
#relation_customs
|
14
|
+
.relation_customs
|
15
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
16
|
+
@include gradient-vertical($startColor: #fff, $endColor: rgba(250, 250, 250, .01))
|
17
|
+
@include border-radius(5px)
|
18
|
+
margin-top: 20px
|
19
|
+
margin-left: 0
|
20
|
+
h2.colorfont
|
21
|
+
padding-bottom: 1px
|
22
|
+
color: #d9d9d9
|
23
|
+
margin-top: 0px
|
24
|
+
padding-top: 16px
|
25
|
+
height: 23px
|
26
|
+
span.colorfont-overlay
|
27
|
+
top: 17px !important
|
28
|
+
margin-left: 10px
|
29
|
+
color: #f1f1f1
|
30
|
+
.relation_list
|
31
|
+
padding-left: 10px !important
|
32
|
+
width: 41% !important
|
33
|
+
input
|
34
|
+
&[type="radio"]
|
35
|
+
margin-right: 0px
|
36
|
+
label
|
37
|
+
@include ellipsis
|
38
|
+
width: 50%
|
39
|
+
#permissions
|
40
|
+
.permissions ul li
|
41
|
+
label
|
42
|
+
@include ellipsis
|
43
|
+
width: 84%
|
15
44
|
// UP TO LANDSCAPE PHONE
|
16
45
|
// ---------------------
|
17
46
|
|
@@ -50,4 +79,10 @@
|
|
50
79
|
.x
|
51
80
|
margin-top: -45px
|
52
81
|
font-size: 18px
|
53
|
-
|
82
|
+
#relation_customs
|
83
|
+
.relation_list
|
84
|
+
padding-left: 10px !important
|
85
|
+
.edit_name
|
86
|
+
.edit_relation_custom
|
87
|
+
#relation_custom_name
|
88
|
+
width: 54% !important
|
@@ -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"
|
@@ -48,7 +48,7 @@
|
|
48
48
|
h3
|
49
49
|
@include ellipsis
|
50
50
|
.participants
|
51
|
-
@
|
51
|
+
@include border-radius(5px)
|
52
52
|
background-color: #f1f1f1
|
53
53
|
img
|
54
54
|
@include border-radius (5px)
|
@@ -73,13 +73,13 @@
|
|
73
73
|
.message
|
74
74
|
border-bottom: 1px solid #f1f1f1
|
75
75
|
background-color: $white
|
76
|
-
@extend .border-bottom-left-radius-15
|
77
76
|
.media
|
78
77
|
.pull-left
|
79
78
|
img
|
80
79
|
@include border-radius (5px)
|
81
80
|
.date
|
82
|
-
color:
|
81
|
+
color: #999
|
82
|
+
font-size: 13px
|
83
83
|
|
84
84
|
#new_message
|
85
85
|
.toolbar_menu
|
@@ -34,6 +34,7 @@
|
|
34
34
|
|
35
35
|
.briefing
|
36
36
|
width: 85%
|
37
|
+
font-family: "OpenSansLight"
|
37
38
|
.date
|
38
39
|
display: inline
|
39
40
|
margin: 0 13px 0 4px
|
@@ -61,6 +62,8 @@
|
|
61
62
|
.conversation_full
|
62
63
|
@include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
63
64
|
float: left
|
65
|
+
h4
|
66
|
+
font-family: "OpenSansLight"
|
64
67
|
.participants
|
65
68
|
padding: 7px 10px 9px 10px
|
66
69
|
border: 1px solid #f1f1f1
|
@@ -23,8 +23,11 @@
|
|
23
23
|
background-color: $white
|
24
24
|
@include border-radius(5px)
|
25
25
|
display: block !important
|
26
|
+
.toolbar_menu
|
27
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
28
|
+
margin-left: 0px
|
26
29
|
ul
|
27
|
-
@include grid-core-span(
|
30
|
+
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
28
31
|
height: 60px
|
29
32
|
margin-left: auto
|
30
33
|
margin-right: auto
|
@@ -0,0 +1,10 @@
|
|
1
|
+
/****************************** Style
|
2
|
+
@import "social_stream/base/conversation/conversation"
|
3
|
+
|
4
|
+
/****************************** Layout
|
5
|
+
@import "social_stream/base/conversation/layout/conversation"
|
6
|
+
|
7
|
+
/****************************** Responsive
|
8
|
+
@import "social_stream/base/conversation/responsive/responsive-768px-979px"
|
9
|
+
@import "social_stream/base/conversation/responsive/responsive-1200px-min"
|
10
|
+
@import "social_stream/base/conversation/responsive/responsive-767px-max"
|
@@ -10,20 +10,25 @@
|
|
10
10
|
.sub-content-full-offset,
|
11
11
|
.sub-content-small-offset,
|
12
12
|
.sub-content-mini-offset
|
13
|
-
|
14
|
-
font-size:
|
13
|
+
h4
|
14
|
+
font-size: 25px
|
15
15
|
line-height: 15px
|
16
|
+
font-family: "OpenSansLight"
|
16
17
|
.content
|
17
18
|
border-top: 1px solid #e3e3e3
|
18
19
|
.case
|
19
20
|
font-size: 12px
|
20
21
|
word-wrap: break-word
|
22
|
+
margin-top: 6px
|
21
23
|
.first-line-large,
|
22
|
-
.first-line-mini
|
24
|
+
.first-line-mini
|
25
|
+
margin-bottom: 2px
|
23
26
|
a
|
24
27
|
font-size: 14px
|
25
28
|
font-weight: bold
|
26
29
|
.second-line
|
27
30
|
color: #a3a3a3
|
31
|
+
font-family: "OpenSansLight"
|
32
|
+
line-height: 19px
|
28
33
|
.well-small
|
29
34
|
text-align: right
|
@@ -38,17 +38,21 @@
|
|
38
38
|
margin-right: 10px
|
39
39
|
img
|
40
40
|
width: 170px
|
41
|
-
.
|
42
|
-
|
43
|
-
|
41
|
+
img.video
|
42
|
+
z-index: 20
|
43
|
+
position: absolute
|
44
44
|
.text
|
45
45
|
font-size: 12px
|
46
|
+
float: left
|
46
47
|
h6
|
47
48
|
font-size: 14px
|
49
|
+
margin: 1px 0 3px
|
50
|
+
@include ellipsis
|
48
51
|
.description
|
49
52
|
margin: 0 0 4px
|
50
|
-
|
51
|
-
|
53
|
+
p
|
54
|
+
a
|
55
|
+
display: block
|
52
56
|
|
53
57
|
.actions
|
54
58
|
width: 100%
|
@@ -69,12 +69,8 @@
|
|
69
69
|
width: auto
|
70
70
|
margin-bottom: 0px
|
71
71
|
float: right
|
72
|
+
margin-top: 7px
|
72
73
|
|
73
|
-
.sub-content-small
|
74
|
-
.content
|
75
|
-
.case
|
76
|
-
width: 94%
|
77
|
-
|
78
74
|
#resources
|
79
75
|
.sub-content-small
|
80
76
|
margin-left: 0px
|
@@ -82,6 +78,9 @@
|
|
82
78
|
display: inline-block
|
83
79
|
margin-left: 40px
|
84
80
|
|
81
|
+
#search
|
82
|
+
margin-top: 0px
|
83
|
+
|
85
84
|
#explore-header
|
86
85
|
width: 100%
|
87
86
|
display: table
|
data/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass
CHANGED
@@ -38,17 +38,20 @@
|
|
38
38
|
.sub-content-full-offset,
|
39
39
|
.sub-content-small-offset,
|
40
40
|
.sub-content-mini-offset
|
41
|
+
h4
|
42
|
+
font-size: 29px
|
41
43
|
.content
|
42
|
-
.
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
44
|
+
.well
|
45
|
+
.top
|
46
|
+
font-size: 13px
|
47
|
+
.first-line-large,
|
48
|
+
.first-line-mini,
|
49
|
+
a
|
50
|
+
font-size: 17px
|
51
|
+
margin-bottom: 10px
|
52
|
+
.second-line
|
50
53
|
|
51
|
-
|
54
|
+
margin-top: 10px
|
52
55
|
|
53
56
|
.timeline
|
54
57
|
.media
|
@@ -56,5 +59,4 @@
|
|
56
59
|
font-size: 18px
|
57
60
|
|
58
61
|
#search
|
59
|
-
margin-top: 0px
|
60
62
|
width: 100%
|