social_stream 2.0.1 → 2.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/base/app/assets/javascripts/social_stream/contact.js +1 -3
- data/base/app/assets/stylesheets/social_stream-base.css.sass +9 -0
- data/base/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass +1 -1
- data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +11 -7
- data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +1 -1
- data/base/app/assets/stylesheets/social_stream/base/explore/_explore-search.css.sass +2 -2
- data/base/app/assets/stylesheets/social_stream/base/explore/_explore-timeline.css.sass +1 -2
- data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass +1 -1
- data/base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +1 -0
- data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +38 -38
- data/base/app/assets/stylesheets/social_stream/base/modals/_modals.css.sass +17 -0
- data/base/app/assets/stylesheets/social_stream/base/modals/layout/_modals.css.sass +35 -0
- data/base/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-1200px-min.css.sass +5 -0
- data/base/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-767px-max.css.sass +10 -0
- data/base/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-768px-979px.css.sass +6 -0
- data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +7 -5
- data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +1 -11
- data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +2 -1
- data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +1 -1
- data/base/app/assets/stylesheets/social_stream/base/search/_header.css.sass +3 -3
- data/base/app/assets/stylesheets/social_stream/base/select2/layout/_sselect2.css.sass +1 -1
- data/base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +0 -1
- data/base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +2 -2
- data/base/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass +1 -1
- data/base/app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass +2 -2
- data/base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +2 -2
- data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_modal.scss +1 -1
- data/base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_variables.scss +12 -0
- data/base/app/assets/stylesheets/social_stream/fonts/fonts.css +8 -9
- data/base/app/assets/stylesheets/social_stream/fonts/{JosefinSlabOverlay.ttf → josefinSlab/JosefinSlabOverlay.ttf} +0 -0
- data/base/app/assets/stylesheets/social_stream/fonts/{JosefinSlabRegular-Outline.ttf → josefinSlab/JosefinSlabRegular-Outline.ttf} +0 -0
- data/base/app/assets/stylesheets/social_stream/fonts/{JosefinSlabRegular.ttf → josefinSlab/JosefinSlabRegular.ttf} +0 -0
- data/base/app/assets/stylesheets/social_stream/fonts/{OpenSans-Light.ttf → opensans/OpenSans-Light.ttf} +0 -0
- data/base/app/assets/stylesheets/social_stream/fonts/{opensans-regular-webfont.eot → opensans/opensans-regular-webfont.eot} +0 -0
- data/base/app/assets/stylesheets/social_stream/fonts/opensans/opensans-regular-webfont.svg +587 -0
- data/base/app/assets/stylesheets/social_stream/fonts/{opensans-regular-webfont.woff → opensans/opensans-regular-webfont.woff} +0 -0
- data/base/app/assets/stylesheets/social_stream/fonts/{opensans-regular.ttf → opensans/opensans-regular.ttf} +0 -0
- data/base/app/views/groups/_form.html.erb +8 -5
- data/base/app/views/home/index.html.erb +1 -1
- data/base/app/views/profiles/_avatar.html.erb +6 -6
- data/base/app/views/repositories/show.html.erb +0 -3
- data/base/config/locales/en.yml +1 -1
- data/base/lib/generators/social_stream/base/templates/initializer.rb +27 -19
- data/base/lib/social_stream/base/version.rb +1 -1
- data/contacts/_contacts.css.sass +64 -0
- data/contacts/layouts/_contacts.css.sass +177 -0
- data/contacts/responsive/_responsive-1200px-min.css.sass +29 -0
- data/contacts/responsive/_responsive-767px-max.css.sass +88 -0
- data/contacts/responsive/_responsive-768px-979px.css.sass +14 -0
- data/documents/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass +7 -35
- data/documents/app/assets/stylesheets/social_stream/documents/documents/_documents.css.sass +6 -7
- data/documents/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass +17 -3
- data/documents/app/assets/stylesheets/social_stream/documents/explore/layout/_explore-documents.css.sass +2 -1
- data/documents/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass +4 -3
- data/documents/app/overrides/repositories/_filter/add_new_document_button.html.erb.deface +4 -0
- data/documents/app/views/common_documents/_index.html.erb +21 -17
- data/documents/app/views/documents/index.html.erb +0 -1
- data/documents/app/views/documents/new.html.erb +5 -3
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/social_stream-documents.gemspec +1 -1
- data/events/app/assets/stylesheets/social_stream/events/responsive/_responsive-1200px-min.css.sass +1 -3
- data/events/app/views/rooms/_index.html.erb +9 -2
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +1 -1
- data/lib/social_stream/version.rb +1 -1
- data/oauth2_server/app/views/site/clients/_form.html.erb +1 -1
- data/oauth2_server/app/views/site/clients/show.html.erb +47 -45
- data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
- data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
- data/presence/ejabberd/ejabberd_scripts/authentication_script +9 -11
- data/presence/lib/social_stream/presence/version.rb +1 -1
- data/presence/social_stream-presence.gemspec +1 -1
- data/social_stream.gemspec +5 -5
- metadata +31 -20
- data/base/app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.svg +0 -244
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4533fdc4bdc68a8fcfc7ceecbd27e9484745ea0e
|
|
4
|
+
data.tar.gz: c6dc95d6224d4c4a4a15aeca3f0f06f0e9a0e1f9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8fbfd2b71fdc1dbed2391075ced6b95e4ef514a295ea25426d72fc369d4d3ea09c630bf50cb45eab2eea69a10acf2f7948e26e79e0a29b0af5ddfea83c175608
|
|
7
|
+
data.tar.gz: a027af86f4eb436bc0a63a19847ef0560e687d2b35dba4169fe1fcda9097cc89c9a9a5bc733089f8870dfd8dbdf407f44db4994cc837a6e1d6c4c79e71c9c0d7
|
data/.gitignore
CHANGED
|
@@ -116,16 +116,14 @@ SocialStream.Contact = (function($, SS, undefined) {
|
|
|
116
116
|
}
|
|
117
117
|
};
|
|
118
118
|
|
|
119
|
-
// Dictate if some form has changed its status
|
|
120
119
|
var getInputValues = function(form) {
|
|
121
120
|
return $('ul.dropdown-menu input[type="checkbox"]', form).
|
|
122
121
|
map(function() {
|
|
123
122
|
if ($(this).is(':checked'))
|
|
124
123
|
return $(this).val();
|
|
125
|
-
|
|
124
|
+
});
|
|
126
125
|
};
|
|
127
126
|
|
|
128
|
-
// Dictate if some form has changed its status
|
|
129
127
|
var setInputValues = function(form) {
|
|
130
128
|
return $('ul.dropdown-menu input[type="checkbox"]', form).
|
|
131
129
|
map(function() {
|
|
@@ -170,6 +170,15 @@
|
|
|
170
170
|
|
|
171
171
|
|
|
172
172
|
|
|
173
|
+
@import "social_stream/base/modals/modals"
|
|
174
|
+
|
|
175
|
+
@import "social_stream/base/modals/layout/modals"
|
|
176
|
+
|
|
177
|
+
@import "social_stream/base/modals/responsive/responsive-768px-979px"
|
|
178
|
+
@import "social_stream/base/modals/responsive/responsive-1200px-min"
|
|
179
|
+
@import "social_stream/base/modals/responsive/responsive-767px-max"
|
|
180
|
+
|
|
181
|
+
|
|
173
182
|
|
|
174
183
|
@import "social_stream/base/toolbar/toolbar"
|
|
175
184
|
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
input#group_name
|
|
2
|
+
margin-left: 0px
|
|
3
|
+
width: 93% !important
|
|
4
|
+
|
|
1
5
|
#contacts
|
|
2
6
|
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
3
7
|
|
|
@@ -11,12 +15,11 @@
|
|
|
11
15
|
.caret
|
|
12
16
|
margin-left: 6px
|
|
13
17
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
margin-botom: 0 !important
|
|
18
|
+
.contact-filter
|
|
19
|
+
margin-left: 0px
|
|
20
|
+
width: 22% !important
|
|
21
|
+
float: left
|
|
22
|
+
margin-botom: 0 !important
|
|
20
23
|
.new_group-modal-link
|
|
21
24
|
float: right
|
|
22
25
|
|
|
@@ -66,7 +69,8 @@
|
|
|
66
69
|
display: inline-block
|
|
67
70
|
float: right
|
|
68
71
|
margin-top: -40px
|
|
69
|
-
|
|
72
|
+
|
|
73
|
+
|
|
70
74
|
|
|
71
75
|
#contact-form
|
|
72
76
|
ul
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
line-height: $baseLineHeight
|
|
7
7
|
vertical-align: middle
|
|
8
8
|
cursor: pointer
|
|
9
|
-
background-color: $
|
|
10
|
-
border: 1px solid $
|
|
9
|
+
background-color: $principal-btnColorbackground
|
|
10
|
+
border: 1px solid $principal-btnColorborder
|
|
11
11
|
*border: 0
|
|
12
12
|
color: $gray
|
|
13
13
|
background-image: none
|
|
@@ -18,34 +18,34 @@
|
|
|
18
18
|
color: $gray
|
|
19
19
|
|
|
20
20
|
&:hover
|
|
21
|
-
border: 1px solid $
|
|
22
|
-
background-color: $
|
|
23
|
-
color: $
|
|
21
|
+
border: 1px solid $principal-btnColorbackground
|
|
22
|
+
background-color: $principalColor !important
|
|
23
|
+
color: $auxiliarColor
|
|
24
24
|
.caret
|
|
25
25
|
@include transition (border 1s, color, 1s)
|
|
26
|
-
border-top-color: $
|
|
27
|
-
border-bottom-color: $
|
|
26
|
+
border-top-color: $principal-btnColorbackground
|
|
27
|
+
border-bottom-color: $principal-btnColorbackground
|
|
28
28
|
.caret
|
|
29
|
-
border-top-color: $
|
|
30
|
-
border-bottom-color: $
|
|
29
|
+
border-top-color: $principal-btnColorborder
|
|
30
|
+
border-bottom-color: $principal-btnColorborder
|
|
31
31
|
&:hover
|
|
32
|
-
border-top-color: $
|
|
33
|
-
border-bottom-color: $
|
|
32
|
+
border-top-color: $principal-btnColorbackground
|
|
33
|
+
border-bottom-color: $principal-btnColorbackground
|
|
34
34
|
|
|
35
35
|
&:focus
|
|
36
36
|
@include tab-focus()
|
|
37
37
|
|
|
38
38
|
&.active
|
|
39
|
-
border: 1px solid $
|
|
40
|
-
background-color: $
|
|
41
|
-
color: $
|
|
39
|
+
border: 1px solid $auxiliarColor
|
|
40
|
+
background-color: $principalColor !important
|
|
41
|
+
color: $auxiliarColor
|
|
42
42
|
|
|
43
43
|
&.disabled,
|
|
44
44
|
&[disabled]
|
|
45
45
|
cursor: default
|
|
46
46
|
@include opacity(85)
|
|
47
|
-
background-color: $
|
|
48
|
-
color: $
|
|
47
|
+
background-color: $principalColor
|
|
48
|
+
color: $auxiliarColor
|
|
49
49
|
|
|
50
50
|
|
|
51
51
|
|
|
@@ -57,10 +57,10 @@
|
|
|
57
57
|
line-height: $baseLineHeight
|
|
58
58
|
vertical-align: middle
|
|
59
59
|
cursor: pointer
|
|
60
|
-
background-color: $
|
|
61
|
-
border: 1px solid $
|
|
60
|
+
background-color: $secundary-btnColorbackground
|
|
61
|
+
border: 1px solid $secundary-btnColorborder
|
|
62
62
|
*border: 0
|
|
63
|
-
color: $
|
|
63
|
+
color: $auxiliarColor
|
|
64
64
|
background-image: none
|
|
65
65
|
@include ie7-restore-left-whitespace()
|
|
66
66
|
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))
|
|
@@ -69,23 +69,23 @@
|
|
|
69
69
|
color: $gray
|
|
70
70
|
|
|
71
71
|
&:hover
|
|
72
|
-
border: 1px solid $
|
|
73
|
-
background-color: $
|
|
74
|
-
color: $
|
|
72
|
+
border: 1px solid $secundary-btnColorbackground
|
|
73
|
+
background-color: $secundary-btnColorborder !important
|
|
74
|
+
color: $principalColor
|
|
75
75
|
|
|
76
76
|
&:focus
|
|
77
77
|
@include tab-focus()
|
|
78
78
|
|
|
79
79
|
&.active
|
|
80
|
-
border: 1px solid $
|
|
81
|
-
background-color: $
|
|
82
|
-
color: $
|
|
80
|
+
border: 1px solid $secundary-btnColorborder
|
|
81
|
+
background-color: $secundary-btnColorbackground !important
|
|
82
|
+
color: $principalColor
|
|
83
83
|
|
|
84
84
|
&.disabled,
|
|
85
85
|
&[disabled]
|
|
86
86
|
cursor: default
|
|
87
87
|
@include opacity(85)
|
|
88
|
-
background-color: $
|
|
88
|
+
background-color: $secundary-btnColorbackground
|
|
89
89
|
color: $gray
|
|
90
90
|
|
|
91
91
|
|
|
@@ -102,15 +102,15 @@
|
|
|
102
102
|
border: 1px solid
|
|
103
103
|
border-right: #edeaf2
|
|
104
104
|
border-bottom: #e3e0e8
|
|
105
|
-
border-color:
|
|
105
|
+
border-color: $auxiliarColor
|
|
106
106
|
@include border-radius (5px)
|
|
107
|
-
color:
|
|
107
|
+
color: $black
|
|
108
108
|
text-align: center
|
|
109
109
|
padding: 0px 10px 0px 4px
|
|
110
110
|
|
|
111
111
|
&:hover
|
|
112
|
-
background-color:
|
|
113
|
-
color:
|
|
112
|
+
background-color: $gray
|
|
113
|
+
color: $auxiliarColor
|
|
114
114
|
text-decoration: none
|
|
115
115
|
|
|
116
116
|
&:focus
|
|
@@ -133,17 +133,17 @@
|
|
|
133
133
|
&:hover
|
|
134
134
|
.caret
|
|
135
135
|
@include transition (border 1s, color, 1s)
|
|
136
|
-
border-top-color: $
|
|
137
|
-
border-bottom-color: $
|
|
136
|
+
border-top-color: $auxiliarColor
|
|
137
|
+
border-bottom-color: $auxiliarColor
|
|
138
138
|
.caret
|
|
139
|
-
border-top-color: $
|
|
140
|
-
border-bottom-color: $
|
|
139
|
+
border-top-color: $principal-btnColorborder
|
|
140
|
+
border-bottom-color: $principal-btnColorborder
|
|
141
141
|
&:hover
|
|
142
|
-
border-top-color: $
|
|
143
|
-
border-bottom-color: $
|
|
142
|
+
border-top-color: $auxiliarColor
|
|
143
|
+
border-bottom-color: $auxiliarColor
|
|
144
144
|
|
|
145
145
|
.open
|
|
146
146
|
.btn
|
|
147
147
|
.caret
|
|
148
|
-
border-top-color: $
|
|
149
|
-
border-bottom-color: $
|
|
148
|
+
border-top-color: $principal-btnColorborder
|
|
149
|
+
border-bottom-color: $principal-btnColorborder
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
.modal-body
|
|
2
|
+
max-height: 520px
|
|
3
|
+
padding: 0 15px 0px 15px
|
|
4
|
+
#new_file
|
|
5
|
+
width: 100%
|
|
6
|
+
margin-left: 0px
|
|
7
|
+
#document_title
|
|
8
|
+
margin-left: 0px !important
|
|
9
|
+
.tags
|
|
10
|
+
.select2-container
|
|
11
|
+
width: 98.5%
|
|
12
|
+
|
|
13
|
+
section
|
|
14
|
+
padding-top: 15px
|
|
15
|
+
padding-bottom: 15px
|
|
16
|
+
|
|
17
|
+
input
|
|
18
|
+
&[type="submit"]
|
|
19
|
+
float: right
|
|
20
|
+
margin: 23px 16px 0 -14px
|
|
21
|
+
.name,
|
|
22
|
+
.url
|
|
23
|
+
margin-left: 0px
|
|
24
|
+
width: 100%
|
|
25
|
+
|
|
26
|
+
textarea
|
|
27
|
+
height: 63px
|
|
28
|
+
|
|
29
|
+
form
|
|
30
|
+
margin-left: 0px
|
|
31
|
+
width: 100%
|
|
32
|
+
padding-bottom: 50px
|
|
33
|
+
.select2-container-multi
|
|
34
|
+
.select2-choices
|
|
35
|
+
@include gradient-directional($startColor: #f9f9f9, $endColor: #f1f1f1, $deg: 45deg)
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
.avatar
|
|
15
15
|
input,
|
|
16
16
|
textarea
|
|
17
|
-
background-color:
|
|
17
|
+
background-color: $whiteSmoke
|
|
18
18
|
.briefing
|
|
19
|
-
background-color: white
|
|
19
|
+
background-color: $white
|
|
20
20
|
color: $gray
|
|
21
21
|
span
|
|
22
22
|
@include border-radius(5px)
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
color: #3A87AD
|
|
26
26
|
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5)
|
|
27
27
|
p
|
|
28
|
-
border-top: 5px solid
|
|
28
|
+
border-top: 5px solid $whiteSmoke
|
|
29
29
|
background-color: none
|
|
30
30
|
|
|
31
31
|
|
|
@@ -35,11 +35,13 @@
|
|
|
35
35
|
@include btn-secundary
|
|
36
36
|
.avatar
|
|
37
37
|
form.edit_actor
|
|
38
|
-
background-color:
|
|
38
|
+
background-color: $white
|
|
39
39
|
padding-left: 10px
|
|
40
40
|
padding-top: 14px
|
|
41
41
|
input
|
|
42
|
-
&[type="
|
|
42
|
+
&[type="submit"]
|
|
43
|
+
float: right
|
|
44
|
+
margin: -10px 24px 0 0px
|
|
43
45
|
|
|
44
46
|
h5
|
|
45
47
|
color: $grayLighter
|
data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass
CHANGED
|
@@ -94,14 +94,4 @@
|
|
|
94
94
|
.comments
|
|
95
95
|
h6
|
|
96
96
|
a
|
|
97
|
-
font-size: 16px !important
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
#documents
|
|
102
|
-
#toolbar
|
|
103
|
-
display: none
|
|
104
|
-
.documents
|
|
105
|
-
@include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
|
|
106
|
-
float: left
|
|
107
|
-
margin-left: 0
|
|
97
|
+
font-size: 16px !important
|