social_stream 2.0.0.beta2 → 2.0.0.beta3

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

@@ -8,12 +8,22 @@ s//
   #contacts
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     .contacts
-
       .contact-list
         clear: both
         min-height: 700px
         padding-bottom: 50px
 
   #relation_customs
-    h2
-      margin-bottom: 20px
+    width: 80%
+    .relation_customs
+      h2
+        margin-bottom: 20px
+      .relation_list
+        .relation_custom
+          .actions
+            margin-top: 9px
+    #permissions
+      .permissions ul li
+        input
+          &[type="checkbox"]
+            margin: 0

data/base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass

@@ -10,8 +10,37 @@
       width: 100% !important
       margin-left: 0
 
-   
-
+  #relation_customs
+    .relation_customs
+      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      @include gradient-vertical($startColor: #fff, $endColor: rgba(250, 250, 250, .01))
+      @include border-radius(5px)
+      margin-top: 20px
+      margin-left: 0
+      h2.colorfont
+        padding-bottom: 1px
+        color: #d9d9d9
+        margin-top: 0px
+        padding-top: 16px
+        height: 23px
+      span.colorfont-overlay
+        top: 17px !important
+        margin-left: 10px
+        color: #f1f1f1
+    .relation_list
+      padding-left: 10px !important
+      width: 41% !important
+      input
+        &[type="radio"]
+          margin-right: 0px
+      label
+        @include ellipsis
+        width: 50%
+    #permissions
+      .permissions ul li
+        label
+          @include ellipsis
+          width: 84%
 // UP TO LANDSCAPE PHONE
 // ---------------------
 
@@ -50,4 +79,10 @@
         .x
           margin-top: -45px
           font-size: 18px
- 
+  #relation_customs
+    .relation_list
+      padding-left: 10px !important
+      .edit_name
+        .edit_relation_custom
+          #relation_custom_name
+            width: 54% !important

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

@@ -0,0 +1,10 @@
+/****************************** Style
+@import "social_stream/base/conversation/conversation"
+
+/****************************** Layout
+@import "social_stream/base/conversation/layout/conversation"
+
+/****************************** Responsive
+@import "social_stream/base/conversation/responsive/responsive-768px-979px"
+@import "social_stream/base/conversation/responsive/responsive-1200px-min"
+@import "social_stream/base/conversation/responsive/responsive-767px-max"

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

@@ -48,7 +48,7 @@
   h3
     @include ellipsis
   .participants
-    @extend .border-radius-5
+    @include border-radius(5px)
     background-color: #f1f1f1
     img
       @include border-radius (5px)
@@ -73,13 +73,13 @@
   .message
     border-bottom: 1px solid #f1f1f1
     background-color: $white
-    @extend .border-bottom-left-radius-15
     .media
       .pull-left
         img
           @include border-radius (5px)
       .date
-        color: $grayLighter
+        color: #999
+        font-size: 13px
 
 #new_message
   .toolbar_menu

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

@@ -34,6 +34,7 @@
 
         .briefing
           width: 85%
+          font-family: "OpenSansLight"
         .date
           display: inline
           margin: 0 13px 0 4px
@@ -61,6 +62,8 @@
   .conversation_full
     @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
     float: left
+    h4
+      font-family: "OpenSansLight"
     .participants
       padding: 7px 10px 9px 10px
       border: 1px solid #f1f1f1

data/base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass

@@ -23,8 +23,11 @@
       background-color: $white
       @include border-radius(5px)
       display: block !important
+      .toolbar_menu
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)  
+        margin-left: 0px
       ul
-        @include grid-core-span(8, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
         height: 60px
         margin-left: auto
         margin-right: auto

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

@@ -0,0 +1,18 @@
+/****************************** Style
+@import "social_stream/base/explore/explore"
+
+@import "social_stream/base/explore/explore-search"
+
+@import "social_stream/base/explore/explore-timeline"
+
+/****************************** Layout
+@import "social_stream/base/explore/layout/explore"
+
+@import "social_stream/base/explore/layout/explore-search"
+
+@import "social_stream/base/explore/layout/explore-timeline"
+
+/****************************** Responsive
+@import "social_stream/base/explore/responsive/responsive-768px-979px"
+@import "social_stream/base/explore/responsive/responsive-1200px-min"
+@import "social_stream/base/explore/responsive/responsive-767px-max"

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

@@ -10,20 +10,25 @@
   .sub-content-full-offset,
   .sub-content-small-offset,
   .sub-content-mini-offset
-    header
-      font-size: 18px
+    h4
+      font-size: 25px
       line-height: 15px
+      font-family: "OpenSansLight"
     .content
       border-top: 1px solid #e3e3e3
       .case
         font-size: 12px
         word-wrap: break-word
+        margin-top: 6px
         .first-line-large,
-        .first-line-mini,
+        .first-line-mini
+          margin-bottom: 2px
           a
             font-size: 14px
             font-weight: bold
         .second-line
           color: #a3a3a3
+          font-family: "OpenSansLight"
+          line-height: 19px
       .well-small
         text-align: right

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

@@ -42,6 +42,7 @@
 #search
   h4
     margin: 0 0 10px
+    line-height: 50px !important
   .btn-group
     padding-bottom: 10px
     margin-bottom: 10px

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

@@ -38,17 +38,21 @@
             margin-right: 10px
             img
               width: 170px
-            .play_button
-              width: auto
-              margin-left: -107px
+            img.video
+              z-index: 20
+              position: absolute
           .text
             font-size: 12px
+            float: left
             h6
               font-size: 14px 
+              margin: 1px 0 3px
+              @include ellipsis
           .description
             margin: 0 0 4px
-            .view-more
-              font-size: 12px
+            p
+              a
+                display: block
 
         .actions
           width: 100%

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

@@ -69,12 +69,8 @@
         width: auto
         margin-bottom: 0px
         float: right
+        margin-top: 7px
   
-  .sub-content-small
-    .content
-      .case
-        width: 94%
-
   #resources
     .sub-content-small
       margin-left: 0px     
@@ -82,6 +78,9 @@
     display: inline-block
     margin-left: 40px
   
+  #search
+    margin-top: 0px
+
 #explore-header
   width: 100%
   display: table

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

@@ -38,17 +38,20 @@
     .sub-content-full-offset,
     .sub-content-small-offset,
     .sub-content-mini-offset
+      h4
+        font-size: 29px
       .content
-        .case
-          font-size: 13px
-          .first-line-large,
-          .first-line-mini,
-            a
-              font-size: 17px
-              margin-bottom: 10px
-          .second-line
+        .well
+          .top
+            font-size: 13px
+        .first-line-large,
+        .first-line-mini,
+          a
+            font-size: 17px
+            margin-bottom: 10px
+        .second-line
 
-            margin-top: 10px
+          margin-top: 10px
     
     .timeline
       .media
@@ -56,5 +59,4 @@
           font-size: 18px
 
     #search
-      margin-top: 0px
       width: 100%

data/base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass

@@ -34,6 +34,8 @@
             font-size: 14px
           .media-body
             width: 75%
+            .thumb
+              float: none
             .details
               width: 70%
   

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

@@ -23,6 +23,8 @@
       .root
         .media-body
           width: 86%
+          .thumb
+            float none
           .details
             width: 70%
 /*  #explore-content

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

@@ -0,0 +1,2 @@
+/****************************** Layout
+@import "social_stream/base/footer/layout/footer"

data/base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass

@@ -1,8 +1,9 @@
 footer
-  clear: both
-  margin: 20px auto 0px
-  padding: 0
+  height: auto
+  line-height: 32px
   text-align: center
+  clear: both
+  padding-top: 30px
   ul
     margin-left: 0
     li

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

@@ -0,0 +1,16 @@
+/****************************** Style
+@import "social_stream/base/frontpage_devise/frontpage"
+
+@import "social_stream/base/frontpage_devise/devise"
+
+
+/****************************** Layout
+@import "social_stream/base/frontpage_devise/layout/frontpage"
+
+@import "social_stream/base/frontpage_devise/layout/devise"
+
+
+/****************************** Responsive
+@import "social_stream/base/frontpage_devise/responsive/responsive-768px-979px"
+@import "social_stream/base/frontpage_devise/responsive/responsive-1200px-min"
+@import "social_stream/base/frontpage_devise/responsive/responsive-767px-max"

data/base/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass

@@ -0,0 +1,17 @@
+// Tag cloud in groups new
+@import 'jqcloud'
+.recent_groups
+  li
+    text-align: center
+
+#group-manage
+  h4
+    text-align: center
+
+
+#members,
+#users
+  .table td
+    vertical-align: middle
+    .rol
+      vertical-align: middle

data/base/app/assets/stylesheets/social_stream/base/{_groups.css.sass → groups/layout/_groups.css.sass}

@@ -4,10 +4,9 @@
   li
     display: inline-block
     margin: 11px
-    text-align: center
     .avatar
-    img
-      width: 70px
+      img
+        width: 70px
 #group-manage
   @include makeColumnoMargin(10, 0)
   h2
@@ -17,8 +16,6 @@
   .filter
     width: 300px !important
     float: right !important
-  h4
-    text-align: center
 
 #myTabContent
   margin-rigth: 0px
@@ -26,7 +23,6 @@
 #members,
 #users
   .table td
-    vertical-align: middle
     .profile
       display: inline-block
       margin-right: 10px
@@ -35,7 +31,6 @@
         padding: 4px
     .rol
       display: inline-block
-      vertical-align: middle
       margin-left: 4px
 
     .tool

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

@@ -0,0 +1,2 @@
+/****************************** Style & Layout
+@import "social_stream/base/icons/icon"

data/base/app/assets/stylesheets/social_stream/base/icons/icon.css.css

@@ -32,15 +32,15 @@
 .icon_file_70-rar     { background-position: -10px -170px;}
 .icon_file_70-zip     { background-position: -90px -170px;}
 .icon_file_70-link    { background-position: -170px -170px;}
-.icon_file_70-embeb   { background-position: -250px -170px;}
+.icon_file_70-embed   { background-position: -250px -170px;}
 .icon_file_70-swf     { background-position: -330px -176px;}
 .icon_file_70-mp4     { background-position: -10px -250px;}
-.icon_file_70-wemb    { background-position: -90px -250px;}
+.icon_file_70-webm    { background-position: -90px -250px;}
 .icon_file_70-flv     { background-position: -170px -255px;}
 .icon_file_70-avi     { background-position: -250px -250px;}
 .icon_file_70-mov     { background-position: -330px -250px;}
 .icon_file_70-webma   { background-position: -410px -250px;}
-.icon_file_70-bpm     { background-position: -10px -336px;}
+.icon_file_70-bmp     { background-position: -10px -336px;}
 .icon_file_70-xcf     { background-position: -90px -336px;}
 .icon_file_70-jpeg    { background-position: -170px -336px;}
 .icon_file_70-gif     { background-position: -250px -336px;}
@@ -51,6 +51,9 @@
 .icon_file_70-ogg     { background-position: -170px -410px;}
 .icon_file_70-aif     { background-position: -250px -410px;}
 .icon_file_70-default { background-position: -330px -407px;}
+.icon_file_70-audio   { background-position: -91px -986px;}
+.icon_file_70-video   { background-position: -9px -992px;}
+.icon_file_70-image   { background-position: -178px -995px;}
 
 
 
@@ -71,15 +74,15 @@
 .icon_file_70-rar:hover     { background-position: -10px -650px;}
 .icon_file_70-zip :hover    { background-position: -90px -650px;}
 .icon_file_70-link:hover    { background-position: -170px -650px;}
-.icon_file_70-embeb:hover   { background-position: -250px -650px;}
+.icon_file_70-embed:hover   { background-position: -250px -650px;}
 .icon_file_70-flv:hover     { background-position: -330px -650px;}
 .icon_file_70-mp4:hover     { background-position: -10px -730px;}
-.icon_file_70-wemb:hover    { background-position: -90px -730px;}
+.icon_file_70-webm:hover    { background-position: -90px -730px;}
 .icon_file_70-swf:hover     { background-position: -170px -730px;}
 .icon_file_70-avi:hover     { background-position: -250px -730px;}
 .icon_file_70-mov:hover     { background-position: -330px -730px;}
 .icon_file_70-webma:hover   { background-position: -410px -730px;}
-.icon_file_70-bpm:hover     { background-position: -10px -810px;}
+.icon_file_70-bmp:hover     { background-position: -10px -810px;}
 .icon_file_70-xcf:hover     { background-position: -90px -810px;}
 .icon_file_70-jpeg:hover    { background-position: -170px -810px;}
 .icon_file_70-gif:hover     { background-position: -250px -810px;}
@@ -89,6 +92,9 @@
 .icon_file_70-wav:hover     { background-position: -90px -890px;}
 .icon_file_70-ogg:hover     { background-position: -170px -890px;}
 .icon_file_70-aif:hover     { background-position: -250px -890px;}
+.icon_file_70-audio:hover   { background-position: -170px -410px;}
+.icon_file_70-video:hover   { background-position: -250px -410px;}
+.icon_file_70-image:hover  { background-position: -330px -407px;}
 
 */
 
@@ -118,15 +124,15 @@
 .icon_file_50-rar     { background-position: -10px -130px;}
 .icon_file_50-zip     { background-position: -70px -130px;}
 .icon_file_50-link    { background-position: -130px -130px;}
-.icon_file_50-embeb   { background-position: -190px -130px;}
+.icon_file_50-embed   { background-position: -190px -130px;}
 .icon_file_50-swf     { background-position: -248px -131px;}
 .icon_file_50-mp4     { background-position: -10px -190px;}
-.icon_file_50-wemb    { background-position: -70px -190px;}
+.icon_file_50-webm    { background-position: -70px -190px;}
 .icon_file_50-flv     { background-position: -130px -195px;}
 .icon_file_50-avi     { background-position: -190px -190px;}
 .icon_file_50-mov     { background-position: -260px -190px;}
 .icon_file_50-webma   { background-position: -310px -190px;}
-.icon_file_50-bpm     { background-position: -10px -260px;}
+.icon_file_50-bmp     { background-position: -10px -260px;}
 .icon_file_50-xcf     { background-position: -70px -260px;}
 .icon_file_50-jpeg    { background-position: -130px -250px;}
 .icon_file_50-gif     { background-position: -190px -260px;}
@@ -138,7 +144,9 @@
 .icon_file_50-aif     { background-position: -190px -310px;}
 .icon_50-event        { background-position: -252px -307px;}
 .icon_file_50-default { background-position: -310px  -311px;}
-
+.icon_file_50-audio   { background-position: -68px -731px;}
+.icon_file_50-video   { background-position: -10px -738px;}
+.icon_file_50-image  { background-position: -130px -738px;}
 
 [class^="file_40-"],   [class*="icon_file_40-"] {
   width: 42px;
@@ -149,40 +157,43 @@
 }
 
 
-.icon_file_40-xls     { background-position: -10px -8px;}
-.icon_file_40-doc     { background-position: -60px -8px;}
-.icon_file_40-ppt     { background-position: -112px -7px;}
-.icon_file_40-pdf     { background-position: -163px -8px;}
-.icon_file_40-sla     { background-position: -214px -8px;}
-.icon_file_40-rtf     { background-position: -265px -8px;}
-.icon_file_40-txt     { background-position: -10px -59px;}
-.icon_file_40-odt     { background-position: -61px -58px;}
-.icon_file_40-ods     { background-position: -113px -59px;}
-.icon_file_40-rtf     { background-position: -164px -59px;}
-.icon_file_40-odp     { background-position: -215px -59px;}
-.icon_file_40-ps      { background-position: -266px -59px;}
-.icon_file_40-rar     { background-position: -9px -112px;}
-.icon_file_40-zip     { background-position: -60px -112px;}
-.icon_file_40-link    { background-position: -111px -112px;}
-.icon_file_40-embeb   { background-position: -162px -112px;}
-.icon_file_40-swf     { background-position: -213px -112px;}
-.icon_file_40-mp4     { background-position: -9px -161px;}
-.icon_file_40-wemb    { background-position: -60px -161px;}
+.icon_file_40-xls     { background-position: -10px -7px;}
+.icon_file_40-doc     { background-position: -60px -6px;}
+.icon_file_40-ppt     { background-position: -112px -6px;}
+.icon_file_40-pdf     { background-position: -163px -6px;}
+.icon_file_40-sla     { background-position: -214px -6px;}
+.icon_file_40-rtf     { background-position: -263px -57px;}
+.icon_file_40-txt     { background-position: -9px -57px;}
+.icon_file_40-odt     { background-position: -61px -57px;}
+.icon_file_40-ods     { background-position: -113px -57px;}
+.icon_file_40-rtf     { background-position: -164px -57px;}
+.icon_file_40-odp     { background-position: -215px -57px;}
+.icon_file_40-ps      { background-position: -266px -57px;}
+.icon_file_40-rar     { background-position: -8px -108px;}
+.icon_file_40-zip     { background-position: -59px -109px;}
+.icon_file_40-link    { background-position: -110px -110px;}
+.icon_file_40-embed   { background-position: -162px -110px;}
+.icon_file_40-swf     { background-position: -213px -110px;}
+.icon_file_40-mp4     { background-position: -9px -160px;}
+.icon_file_40-webm    { background-position: -60px -161px;}
 .icon_file_40-flv     { background-position: -110px -165px;}
 .icon_file_40-avi     { background-position: -162px -161px;}
 .icon_file_40-mov     { background-position: -213px -161px;}
 .icon_file_40-webma   { background-position: -264px -161px;}
-.icon_file_40-bpm     { background-position: -9px -260px;}
-.icon_file_40-xcf     { background-position: -59px -260px;}
-.icon_file_40-jpeg    { background-position: -110px -250px;}
-.icon_file_40-gif     { background-position: -162px -260px;}
-.icon_file_40-png     { background-position: -213px -260px;}
-.icon_file_40-tiff    { background-position: -264px -260px;}
+.icon_file_40-bmp     { background-position: -9px -211px;}
+.icon_file_40-xcf     { background-position: -60px -211px;}
+.icon_file_40-jpeg    { background-position: -112px -211px;}
+.icon_file_40-gif     { background-position: -163px -211px;}
+.icon_file_40-png     { background-position: -214px -211px;}
+.icon_file_40-tiff    { background-position: -266px -211px;}
 .icon_file_40-mp3     { background-position: -9px -262px;}
 .icon_file_40-wav     { background-position: -60px -262px;}
 .icon_file_40-ogg     { background-position: -111px -262px;}
 .icon_file_40-aif     { background-position: -160px -262px;}
 .icon_file_40-default { background-position: -263px  -262px;}
+.icon_file_40-audio   { background-position: -60px -621px;}
+.icon_file_40-video   { background-position: -9px -625px;}
+.icon_file_40-image   { background-position: -112px  -626px;}
 
 /*..................hover 50.......................
 .icon_file_50-default:hover { background-position: 0  -42px;}
@@ -201,15 +212,15 @@
 .icon_file_50-rar:hover     { background-position: -10px -180px;}
 .icon_file_50-zip:hover     { background-position: -70px -180px;}
 .icon_file_50-link:hover    { background-position: -130px -180px;}
-.icon_file_50-embeb:hover   { background-position: -190px -180px;}
+.icon_file_50-embed:hover   { background-position: -190px -180px;}
 .icon_file_50-flv-1:hover   { background-position: -260px -180px;}
 .icon_file_50-mp4:hover     { background-position: -10px -240px;}
-.icon_file_50-wemb:hover    { background-position: -70px -240px;}
+.icon_file_50-webm:hover    { background-position: -70px -240px;}
 .icon_file_50-flv-2:hover   { background-position: -130px -240px;}
 .icon_file_50-avi:hover     { background-position: -190px -240px;}
 .icon_file_50-mov:hover     { background-position: -260px -240px;}
 .icon_file_50-webma:hover   { background-position: -310px -240px;}
-.icon_file_50-bpm:hover     { background-position: -10px -300px;}
+.icon_file_50-bmp:hover     { background-position: -10px -300px;}
 .icon_file_50-xcf:hover     { background-position: -70px -300px;}
 .icon_file_50-jpeg:hover    { background-position: -130px -290px;}
 .icon_file_50-gif:hove      { background-position: -190px -300px;}
@@ -219,6 +230,9 @@
 .icon_file_50-wav:hover     { background-position: -70px -360px;}
 .icon_file_50-ogg:hover     { background-position: -130px -360px;}
 .icon_file_50-aif:hover     { background-position: -190px -360px;}
+.icon_file_50-audio:hover   { background-position: -70px -360px;}
+.icon_file_50-video:hover   { background-position: -130px -360px;}
+.icon_file_50-image:hover   { background-position: -190px -360px;}
 
 ....*/