social_stream-base 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (47) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/social_stream/contact.js +1 -3
  3. data/app/assets/stylesheets/social_stream-base.css.sass +9 -0
  4. data/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass +1 -1
  5. data/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +11 -7
  6. data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass +1 -1
  7. data/app/assets/stylesheets/social_stream/base/explore/_explore-search.css.sass +2 -2
  8. data/app/assets/stylesheets/social_stream/base/explore/_explore-timeline.css.sass +1 -2
  9. data/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass +1 -1
  10. data/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass +1 -0
  11. data/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +38 -38
  12. data/app/assets/stylesheets/social_stream/base/modals/_modals.css.sass +17 -0
  13. data/app/assets/stylesheets/social_stream/base/modals/layout/_modals.css.sass +35 -0
  14. data/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-1200px-min.css.sass +5 -0
  15. data/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-767px-max.css.sass +10 -0
  16. data/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-768px-979px.css.sass +6 -0
  17. data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +7 -5
  18. data/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +1 -11
  19. data/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +2 -1
  20. data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +1 -1
  21. data/app/assets/stylesheets/social_stream/base/search/_header.css.sass +3 -3
  22. data/app/assets/stylesheets/social_stream/base/select2/layout/_sselect2.css.sass +1 -1
  23. data/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass +0 -1
  24. data/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass +2 -2
  25. data/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass +1 -1
  26. data/app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass +2 -2
  27. data/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass +2 -2
  28. data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_modal.scss +1 -1
  29. data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_variables.scss +12 -0
  30. data/app/assets/stylesheets/social_stream/fonts/fonts.css +8 -9
  31. data/app/assets/stylesheets/social_stream/fonts/{JosefinSlabOverlay.ttf → josefinSlab/JosefinSlabOverlay.ttf} +0 -0
  32. data/app/assets/stylesheets/social_stream/fonts/{JosefinSlabRegular-Outline.ttf → josefinSlab/JosefinSlabRegular-Outline.ttf} +0 -0
  33. data/app/assets/stylesheets/social_stream/fonts/{JosefinSlabRegular.ttf → josefinSlab/JosefinSlabRegular.ttf} +0 -0
  34. data/app/assets/stylesheets/social_stream/fonts/{OpenSans-Light.ttf → opensans/OpenSans-Light.ttf} +0 -0
  35. data/app/assets/stylesheets/social_stream/fonts/{opensans-regular-webfont.eot → opensans/opensans-regular-webfont.eot} +0 -0
  36. data/app/assets/stylesheets/social_stream/fonts/opensans/opensans-regular-webfont.svg +587 -0
  37. data/app/assets/stylesheets/social_stream/fonts/{opensans-regular-webfont.woff → opensans/opensans-regular-webfont.woff} +0 -0
  38. data/app/assets/stylesheets/social_stream/fonts/{opensans-regular.ttf → opensans/opensans-regular.ttf} +0 -0
  39. data/app/views/groups/_form.html.erb +8 -5
  40. data/app/views/home/index.html.erb +1 -1
  41. data/app/views/profiles/_avatar.html.erb +6 -6
  42. data/app/views/repositories/show.html.erb +0 -3
  43. data/config/locales/en.yml +1 -1
  44. data/lib/generators/social_stream/base/templates/initializer.rb +27 -19
  45. data/lib/social_stream/base/version.rb +1 -1
  46. metadata +15 -10
  47. data/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: 7615b84bf9f4d257e63cdc3e5f1019c3c6bc84c2
4
- data.tar.gz: 0a0882e7a145275df377bd37ced12566699d1e29
3
+ metadata.gz: 314e030fff300d9ef920c806a180decdab59f3f7
4
+ data.tar.gz: 201d735c965510992b547f6e642178df76a343e2
5
5
  SHA512:
6
- metadata.gz: 3c01d32125dc7655693c530b980cf39e00bb6e37edd08303ec0a0269482aaf5b72a7a8449333a68f8eea221809e98e59d3b7a6c37626ea894d937ce865ac4e55
7
- data.tar.gz: 539946e74e081f06042febc1f172db16dbe17211f98c4225638ea6bee9b656124885e58274dc75c0d8bea5421c08fc5b9a35c7e846db08cd780cea064fb9a191
6
+ metadata.gz: fd4b736a8340ce5047f415fc5c7eb819ae9852885994bde36ed9bfe92adb689565a84a257f1434fba7d075d4a849f3e74e6ffb760ad36aaaeb67f0d205916f7b
7
+ data.tar.gz: 8bd0bfc71b573a907a6879e68b468cd1acc12499ae4d8576761197ed720d0bffdae9484383ca173f874c055652fb42198761f38227ecc420b80e7575e7a0fc69
data/app/assets/javascripts/social_stream/contact.js 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() {
data/app/assets/stylesheets/social_stream-base.css.sass CHANGED
@@ -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
 
data/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass CHANGED
@@ -24,7 +24,7 @@ textarea
24
24
  @include border-radius(4px)
25
25
 
26
26
  #fdbk_tab
27
- background-color: $blue !important
27
+ background-color: $principalColor !important
28
28
 
29
29
  .jcrop-tracker
30
30
  background-color: rgba(255, 255, 255, .2)
data/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass CHANGED
@@ -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
- input
15
- &[type="text"]
16
- margin-left: 0px
17
- width: 20% !important
18
- float: left
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
data/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass CHANGED
@@ -1,4 +1,4 @@
1
- s//
1
+ //
2
2
  // Responsive: Large desktop and up
3
3
  // --------------------------------------------------
4
4
 
data/app/assets/stylesheets/social_stream/base/explore/_explore-search.css.sass CHANGED
@@ -70,7 +70,7 @@
70
70
  color: $black
71
71
  .info
72
72
  font-size: 80%
73
- color: #888
73
+ color: $grayLight
74
74
 
75
75
 
76
76
  .event
@@ -81,7 +81,7 @@
81
81
  .frequency
82
82
  @include ellipsis
83
83
  font-size: 12px
84
- color: #888
84
+ color: $grayLight
85
85
 
86
86
  .link
87
87
  .brifing
data/app/assets/stylesheets/social_stream/base/explore/_explore-timeline.css.sass CHANGED
@@ -15,5 +15,4 @@
15
15
  color: $grayLight
16
16
  .new_comment
17
17
  form
18
- background-color: #f9f9f9
19
-
18
+ background-color: $whiteSmoke
data/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass CHANGED
@@ -3,7 +3,7 @@
3
3
 
4
4
  .explanation
5
5
  background-color: rgba(255, 255, 255, 0.8)
6
- border-left: 12px solid $blue
6
+ border-left: 12px solid $principalColor
7
7
  .big
8
8
  font-size: 18px
9
9
  font-weight: bold
data/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass CHANGED
@@ -1,6 +1,7 @@
1
1
  body
2
2
  background-color: #f9f9f9
3
3
  color: #555
4
+ text-rendering: optimizeLegibility
4
5
 
5
6
 
6
7
 
data/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass CHANGED
@@ -6,8 +6,8 @@
6
6
  line-height: $baseLineHeight
7
7
  vertical-align: middle
8
8
  cursor: pointer
9
- background-color: $white
10
- border: 1px solid $blue
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 $white
22
- background-color: $blue !important
23
- color: $white
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: $white
27
- border-bottom-color: $white
26
+ border-top-color: $principal-btnColorbackground
27
+ border-bottom-color: $principal-btnColorbackground
28
28
  .caret
29
- border-top-color: $blue
30
- border-bottom-color: $blue
29
+ border-top-color: $principal-btnColorborder
30
+ border-bottom-color: $principal-btnColorborder
31
31
  &:hover
32
- border-top-color: $white
33
- border-bottom-color: $white
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 $white
40
- background-color: $blue !important
41
- color: $white
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: $blue
48
- color: $white
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: $blue
61
- border: 1px solid $white
60
+ background-color: $secundary-btnColorbackground
61
+ border: 1px solid $secundary-btnColorborder
62
62
  *border: 0
63
- color: $white
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 $blue
73
- background-color: $white !important
74
- color: $blue
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 $blue
81
- background-color: $white !important
82
- color: $blue
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: $white
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: #fff
105
+ border-color: $auxiliarColor
106
106
  @include border-radius (5px)
107
- color: #000
107
+ color: $black
108
108
  text-align: center
109
109
  padding: 0px 10px 0px 4px
110
110
 
111
111
  &:hover
112
- background-color: #555
113
- color: #fff
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: $white
137
- border-bottom-color: $white
136
+ border-top-color: $auxiliarColor
137
+ border-bottom-color: $auxiliarColor
138
138
  .caret
139
- border-top-color: $blue
140
- border-bottom-color: $blue
139
+ border-top-color: $principal-btnColorborder
140
+ border-bottom-color: $principal-btnColorborder
141
141
  &:hover
142
- border-top-color: $white
143
- border-bottom-color: $white
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: $blue
149
- border-bottom-color: $blue
148
+ border-top-color: $principal-btnColorborder
149
+ border-bottom-color: $principal-btnColorborder
data/app/assets/stylesheets/social_stream/base/modals/_modals.css.sass ADDED
@@ -0,0 +1,17 @@
1
+ .modal-body
2
+ background: $auxiliarColor
3
+
4
+ label
5
+ font-size: 22px
6
+ font-weight: bold
7
+ color: #CCC
8
+
9
+ section
10
+ border-bottom: 1px dashed #CCC
11
+
12
+ #document_file
13
+ @include ellipsis
14
+
15
+ input
16
+ &[type="file"]
17
+ line-height: 0px
data/app/assets/stylesheets/social_stream/base/modals/layout/_modals.css.sass ADDED
@@ -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)
data/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-1200px-min.css.sass ADDED
@@ -0,0 +1,5 @@
1
+ //
2
+ // Responsive: Large desktop and up
3
+ // --------------------------------------------------
4
+
5
+ @media (min-width: 1200px)
data/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-767px-max.css.sass ADDED
@@ -0,0 +1,10 @@
1
+ //
2
+ // Responsive: Landscape phone to desktop/tablet
3
+ // --------------------------------------------------
4
+
5
+ @media (max-width: 767px)
6
+
7
+ // UP TO LANDSCAPE PHONE
8
+ // ---------------------
9
+
10
+ @media (max-width: 480px)
data/app/assets/stylesheets/social_stream/base/modals/responsive/_responsive-768px-979px.css.sass ADDED
@@ -0,0 +1,6 @@
1
+ //
2
+ // Responsive: Tablet to desktop
3
+ // --------------------------------------------------
4
+
5
+
6
+ @media (min-width: 768px) and (max-width: 979px)
data/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass CHANGED
@@ -14,9 +14,9 @@
14
14
  .avatar
15
15
  input,
16
16
  textarea
17
- background-color: #f9f9f9
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 #f9f9f9
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: #f9f9f9
38
+ background-color: $white
39
39
  padding-left: 10px
40
40
  padding-top: 14px
41
41
  input
42
- &[type="file"]
42
+ &[type="submit"]
43
+ float: right
44
+ margin: -10px 24px 0 0px
43
45
 
44
46
  h5
45
47
  color: $grayLighter
data/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
data/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass CHANGED
@@ -118,7 +118,8 @@
118
118
  // ---------------------
119
119
 
120
120
  @media (max-width: 480px)
121
-
121
+ body
122
+ text-rendering: optimizeSpeed
122
123
  header.navbar
123
124
  ul
124
125
  li
data/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass CHANGED
@@ -67,7 +67,7 @@
67
67
 
68
68
  #site_clients
69
69
  #toolbar
70
- background-color: black
70
+ background-color: $black
71
71
 
72
72
 
73
73