social_stream 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4934f083e232a85c8c141d6a04d972755b4387c6
-  data.tar.gz: 5caff5a8aa95b1247b3d07511d6b04709f1f1ea8
+  metadata.gz: cfabcee1a01b8644ba290578de8c3cd5bf08453a
+  data.tar.gz: 3a7539a5184ebfd4db782a800d1c5b292070de6b
 SHA512:
-  metadata.gz: 0231fb2e9819b492e575cde0d826e42280ce28feaf4291dec5b6c46f2ba86759a146713103dec45ad4b0fa736f3beae8145166b605260afe8b2150e57ad0f223
-  data.tar.gz: 4ccf21a4dc9ad58498428ca9f2a66c75892d59b6bfdc0ae2529e4dcf97bcd6db0501738c82e8f0114ef869fd54596074dc99753c6184b045c242499beec5eaed
+  metadata.gz: 4fa4247dbffa664bf451131a8f2c8fd9dae847ef0f206c58cf3524e3fb4da68702558eee4c7e62382eff8ac676029e8ff3366abd42911c3e173df555736af5af
+  data.tar.gz: fa690ea899119790924d5b16d740807e36ac74c55eea38c2e72973aba2b15ebc2de7b663deda2ed0f2e56a2958c42e66de4a4f605d0be1c20e3099d1c3a86f97

data/base/app/assets/javascripts/social_stream-base.js

@@ -7,6 +7,7 @@
 //= require i18n
 //= require i18n/translations
 //= require flashy
+//= require colorfont
 //
 //= require avatars_for_rails
 //

data/base/app/assets/javascripts/social_stream/pagination.js

@@ -1,12 +1,15 @@
 SocialStream.Pagination = (function(SS, $, undefined){
 
   var show = function(callback) {
-    $(".btn-see-more").each(function(i, btn) {
+    var nav = $('nav.more');
+
+    $('a', nav).each(function(i, btn) {
       $(btn).attr('data-page', "2");
-      $(btn).closest('nav.more').find('.loading').hide();
     });
 
-    $(".btn-see-more").click(function(event) {
+    $('.loading', nav).hide();
+
+    $('a', nav).click(function(event) {
       event.preventDefault();
 
       $(event.target).hide();

data/base/app/assets/stylesheets/social_stream-base.css.sass

@@ -8,10 +8,11 @@
 
 
 
-
+@import "social_stream/base/mixins/animation"
 @import "social_stream/base/mixins/buttons"
 @import "social_stream/base/mixins/layout"
 @import "social_stream/base/mixins/inputs"
+@import "social_stream/base/mixins/colorfont"
 
 
 
@@ -30,9 +31,6 @@
 
 @import "social_stream/base/logo/logo-out"
 
-@import "social_stream/base/logo/layout/logo-in"
-
-@import "social_stream/base/logo/layout/logo-out"
 
 @import "social_stream/base/logo/responsive/responsive-767px-max"
 
@@ -45,6 +43,7 @@
 @import "social_stream/base/buttons"
 
 @import "social_stream/fonts/fonts"
+@import "social_stream/fonts/colorfont"
 
 @import "social_stream/base/icons/icon"
 
@@ -62,6 +61,8 @@
 
 
 
+@import "social_stream/base/settings/settings"
+
 @import "social_stream/base/settings/layout/settings"
 
 @import "social_stream/base/settings/responsive/responsive-768px-979px"
@@ -164,6 +165,8 @@
 
 @import "social_stream/base/sidebar/layout/sidebar"
 
+@import "social_stream/base/sidebar/responsive/responsive-1200px-min"
+
 
 
 
@@ -171,6 +174,10 @@
 
 @import "social_stream/base/toolbar/layout/toolbar"
 
+@import "social_stream/base/toolbar/responsive/responsive-768px-979px"
+@import "social_stream/base/toolbar/responsive/responsive-1200px-min"
+@import "social_stream/base/toolbar/responsive/responsive-767px-max"
+
 
 
 

data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass

@@ -23,6 +23,10 @@
 ///////////// 
 
 
+#relation_customs
+  h2
+    @include colorfont-big-size
+
 #relation_customs,
   .relation_list
     border-right: 1px solid #c4c4c4

data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass

@@ -90,7 +90,10 @@
 ///////////// 
 
 
-#relation_customs,
+#relation_customs
+  .relation_customs
+    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    float: left
   .relation_list
     @include makeColumn(3, 0)
     padding-right: 5px

data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass

@@ -1,4 +1,4 @@
-//
+s//
 // Responsive: Large desktop and up
 // --------------------------------------------------
 
@@ -9,8 +9,11 @@
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     .contacts
 
-
       .contact-list
         clear: both
         min-height: 700px
-        padding-bottom: 50px
+        padding-bottom: 50px
+
+  #relation_customs
+    h2
+      margin-bottom: 20px

data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-768px-979px.css.sass

@@ -7,8 +7,6 @@
 
   #contacts
     .contacts
-      width: 100% !important
-      margin-left: 0 !important
       .tab-content
         .contact-list
           clear: both

data/base/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass

@@ -88,9 +88,16 @@
         .active
           background-position: -9px -10px
   #conversation
-    input
-      &[type="submit"]
-        float: left
+    h2
+      @include colorfont-big-size
+    form.new_message
+      margin-top: 30px
+      input
+        &[type="submit"]
+          float: right
+          margin-top: 10px
+  #subject
+    width: 96.8% !important
 
 
 #content

data/base/app/assets/stylesheets/social_stream/base/explore/layout/_explore-search.css.sass

@@ -60,8 +60,14 @@
     clear: both
     display: inline
     margin-left: 5px
+  input
+    &[type="submit"]
+      height: 40px
 
-
+#explore-header
+  .btn
+    @include btn-primary
+    font-size: 16px
 
 /////////////////////////////////////// EXPLORE SEARCH RESULT
 ///////////// in events, linkser, post, comments
@@ -69,6 +75,7 @@
 #explore-content
   #search
     #search-results
+      min-height: 360px
 
       .contact
         width: 240px

data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass

@@ -30,7 +30,26 @@
       @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)
       @include grid-core-offset(1, $fluidGridColumnWidth, $fluidGridGutterWidth)
       display: inline-block
+    .sub-content-medium,
+    .sub-content-full,
+    .sub-content-small,
+    .sub-content-mini,
+    .sub-content-medium-offset,
+    .sub-content-full-offset,
+    .sub-content-small-offset,
+    .sub-content-mini-offset
+      .content
+        .case
+          font-size: 13px
+          .first-line-large,
+          .first-line-mini,
+            a
+              font-size: 17px
+              margin-bottom: 10px
+          .second-line
 
+            margin-top: 10px
+    
     .timeline
       .media
         .media-heading

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_devise.css.sass

@@ -15,6 +15,8 @@
           background-color: #f6f6f6
         &[type="text"]
           background-color: #f6f6f6
+      .options
+        font-size: 12px
 
 
 #forgot-pass
@@ -32,4 +34,6 @@
       &[type="email"]
         background-color: #f6f6f6
       &[type="text"]
-        background-color: #f6f6f6
+        background-color: #f6f6f6
+    .options
+      font-size: 12px

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass

@@ -2,16 +2,19 @@
 #new_session
 
   .explanation
-    background-color: $white
+    background-color: rgba(255, 255, 255, 0.8)
     border-left: 12px solid $blue
     .big
       font-size: 18px
       font-weight: bold
       line-height: 28px
     .lite
-      color: $gray
+      color: #888
+      font-family: $sansFontFamilyLight
+      font-size: 15.5px
     .btn
       font-size: 15px
+      @include btn-secundary
 
   #sign_in
     @include box-shadow(0px 0px 13px rgba(50, 50, 50, 0.15))
@@ -29,12 +32,25 @@
         background-color: #f6f6f6
       &[type="mail"]
         background-color: #f6f6f6
+    #remember
+      font-size: 20px
+      label
+        font-size: 12px
+    .options
+      font-size: 12px
 
 
 
 
   #presentation
-    border-top: 1px solid #d3d3d3
+    border-top: 1px solid #eee
+    background-color: $white
+    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+ */
+    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+ */
+    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+ */
+    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+ */
+    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+ */
+    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 */
     .characteristics
       @include border-radius (5px)
       header
@@ -44,4 +60,5 @@
         border-bottom: 1px solid #ccc
       p
         font-size: 13px
+        font-family: $sansFontFamilyLight
         color: #888

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_frontpage.css.sass

@@ -7,7 +7,7 @@
     width: 54.14286%
     float: left
     margin-left: 4%
-    margin-top: 63px
+    margin-top: 28px
     height: 110px
     padding: 26px 0px 69px 36px
     clear: both
@@ -15,6 +15,7 @@
       margin: 3px 0px 23px 0
     .btn
       clear: both
+      @include btn-secundary
       padding: 7px 30px
       margin-right: 21px
 
@@ -36,6 +37,7 @@
     margin: 27px 2% 0 14px
     h3
       margin-top: 0px
+      margin-bottom: 0px
     #remember
       margin-bottom: 10px 
       display: inline !important

data/base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-1200px-min.css.sass

@@ -22,6 +22,8 @@
 
     #presentation
       .characteristics
+        img
+          max-width: 350px
         header
           font-size: 31px
         p

data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass

@@ -27,9 +27,45 @@ header
 
     .search-mobile
       @extend .hidden-desktop
+      @extend .hidden-tablet
       float: left
-      margin-top: 17px
-      margin-left: 4px
+      margin-top: 16px
+      margin-left: 39px
+      position: absolute
+      z-index: 40
+      .icon_tool16-searcher
+        background-position: -220px -181px
+
+      input
+        &[type="text"]
+          width: 0px !important
+          text-indent: 1px
+          padding: 0 0 0 22px
+          width: 0
+          height: 22px
+          border: 1px solid #eee
+          color: #999
+          line-height: 20px
+          font-weight: bold
+          @include border-radius (6px)
+
+          @include transition (width 0.5s ease-in-out)
+
+          cursor: pointer 
+          padding: 2px 11px
+
+      input
+        &:focus
+          width: 69% !important
+          outline: none
+          @include box-shadow (1px 1px 9px rgba(55,55,55,0.5))
+          cursor: text
+          padding-left: 22px
+
+
+
+
+
 
     .search-nav
       float: left
@@ -41,6 +77,9 @@ header
         margin-top: 18px
         position: absolute
         z-index: 6
+        .query_too_short
+          padding-top: 23px
+          text-align: center
         .results
           ul
             margin: 20px 0 0 0 
@@ -81,28 +120,35 @@ header
       display: inline-block
       padding-left: 10px
       margin-top: 19px
+      float: left
     
     ul.nav
       display: inline-table
-      img
-        width: 20px
-      .name
-        @extend .hidden-phone
-        vertical-align: bottom
-      .calendar_icon
-        @extend .hidden-desktop
-      .icon_navbar-home.active
-        background-position: -16px -8px
-      .icon_navbar-contacts.active
-        background-position: -96px -8px
-      .icon_navbar-calendar.active
-        background-position: -214px -8px
-      .icon_navbar-resources.active
-        background-position: -175px -8px
-      .icon_navbar-message.active
-        background-position: -55px -8px
-      .icon_navbar-settings.active
-        background-position: -252px -7px
+      margin-right: -13px
+      position: relative
+      z-index: 2
+      li
+        a
+          padding: 7px 7px 7px !important
+          img
+            width: 20px
+          .name
+            @extend .hidden-phone
+            vertical-align: bottom
+          .calendar_icon
+            @extend .hidden-desktop
+          .icon_navbar-home.active
+            background-position: -16px -8px
+          .icon_navbar-contacts.active
+            background-position: -96px -8px
+          .icon_navbar-calendar.active
+            background-position: -214px -8px
+          .icon_navbar-resources.active
+            background-position: -175px -8px
+          .icon_navbar-message.active
+            background-position: -55px -8px
+          .icon_navbar-settings.active
+            background-position: -252px -7px
 
     .dropdown
       margin-top: 7px