social_stream 2.0.0.beta1 → 2.0.0.beta2

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

@@ -10,8 +10,6 @@ body
 
 
 #toolbar
-  @extend .hidden-phone
-  @extend .hidden-tablet
   @include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
   float: left
 

data/base/app/assets/stylesheets/social_stream/base/logo/_logo-in.css

@@ -34,46 +34,46 @@
   width: 14px;
   height: 14px;
   background-color: #ffffff; 
-  border: 3px solid #888; 
+  border: 2px solid #888; 
   border-radius: 3px;
 }
 
-.logo-header-in .cenit {
+.logo-header-in .top-plane {
   margin-top: 1px;
   margin-left: 47px;
     -webkit-transform: rotate(-45deg) skew(15deg, 15deg);
     -moz-transform: rotate(-45deg) skew(15deg, 15deg);
 }
 
-.logo-header-in .cenit-shape{ 
-  background: #08C; 
-  border: 4px solid #08C; 
+.logo-header-in .top-plane-shape{ 
+  background: #049cdb; 
+  border: 4px solid #049cdb; 
   border-radius: 3px;
-  margin-top: -5px;
-  width: 12px;
-  height: 12px;
+  margin-top: -4px;
+  width: 10px;
+  height: 10px;
 
 } 
-.logo-header-in .left {
-  margin-top: 15px;
+.logo-header-in .left-plane {
+  margin-top: 14px;
   margin-left: 39px;
     -webkit-transform: rotate(15deg) skew(15deg, 15deg);
     -moz-transform: rotate(15deg) skew(15deg, 15deg);
 }
 
-.logo-header-in .left-shape{ 
-  background: #08C; 
-  border: 4px solid #08C; 
+.logo-header-in .left-plane-shape{ 
+  background: #049cdb; 
+  border: 4px solid #049cdb; 
   margin-left: 35px; 
   border-radius: 3px;
-  margin-top: 18px;
-  width: 12px;
-  height: 12px;  
+  margin-top: 16px;
+  width: 10px;
+  height: 10px;  
  }
 
 .logo-header-in .demoright {
   margin-top: 14px;
-  margin-left: 55px;
+  margin-left: 54px;
     -webkit-transform: rotate(-15deg) skew(-15deg, -15deg);
     -moz-transform: rotate(-15deg) skew(-15deg, -15deg);
 }
@@ -85,7 +85,7 @@
   position: relative;
   float: left;
   margin-top: 54px;
-  margin-left: -1px;
+  margin-left: -6px;
   box-shadow:  -5px -22px 11px 10px rgba(50, 50, 50, .5);
     -webkit-box-shadow:  -5px -22px 11px 10px rgba(50, 50, 50, .5);
     -webkit-transform: rotate(25deg) skew(-30deg, 10deg);

data/base/app/assets/stylesheets/social_stream/base/logo/_logo-out.css

@@ -38,32 +38,32 @@
   border-radius: 3px;
 }
 
-.logo-header-out .cenit {
+.logo-header-out .top-plane {
   margin-top: -4px;
   margin-left: 68px;
     -webkit-transform: rotate(-45deg) skew(15deg, 15deg);
     -moz-transform: rotate(-45deg) skew(15deg, 15deg);
 }
 
-.logo-header-out .cenit-shape{ 
-  background: #08C; 
-  border: 4px solid #08C; 
+.logo-header-out .top-plane-shape{ 
+  background: #049cdb; 
+  border: 4px solid #049cdb; 
   border-radius: 3px;
   margin-top: -10px;
   width: 28px;
   height: 28px;
 
 } 
-.logo-header-out .left {
+.logo-header-out .left-plane {
   margin-top: 23px;
   margin-left: 53px;
     -webkit-transform: rotate(15deg) skew(15deg, 15deg);
     -moz-transform: rotate(15deg) skew(15deg, 15deg);
 }
 
-.logo-header-out .left-shape{ 
-  background: #08C; 
-  border: 4px solid #08C; 
+.logo-header-out .left-plane-shape{ 
+  background: #049cdb; 
+  border: 4px solid #049cdb; 
   margin-left: 48px; 
   border-radius: 3px;
   margin-top: 26px;

data/base/app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css.sass

@@ -0,0 +1,78 @@
+.logo-header-in 
+  .cube
+    position: relative
+    left: -38px
+    z-index: 2
+    float: left
+    @include rotate(10deg)
+
+    &:hover
+      @include animation (float 2s infinite ease-in-out)
+      @include rotate(10deg)
+
+    @-webkit-keyframes float
+      0% 
+        -webkit-transform: translate(0px, 3px)
+      
+      50%
+        -webkit-transform: translate(0px, 0px)
+        
+      100% 
+        -webkit-transform: translate(0px, 3px)
+
+    .face
+      position: absolute
+      width: 14px
+      height: 14px
+      background-color: #ffffff
+      border: 3px solid #888
+      border-radius: 3px
+
+    .top-plane
+      margin-top: 1px
+      margin-left: 47px
+      @include skew(15deg, 15deg)
+      @include rotate(-45deg)
+
+    .top-plane-shape
+      background: #08C 
+      border: 4px solid #08C 
+      border-radius: 3px
+      margin-top: -5px
+      width: 12px
+      height: 12px
+
+    .left-plane
+      margin-top: 15px
+      margin-left: 39px
+      @include skew(15deg, 15deg)
+      @include rotate(15deg)
+
+    .left-shape 
+      background: #08C
+      border: 4px solid #08C
+      margin-left: 35px
+      border-radius: 3px
+      margin-top: 18px
+      width: 12px
+      height: 12px  
+     
+
+    .demoright
+      margin-top: 14px
+      margin-left: 55px
+      @include skew(15deg, 15deg)
+      @include rotate(15deg)
+
+
+  .shadow
+    z-index: 1
+    width: 0
+    height: 0px
+    position: relative
+    float: left
+    margin-top: 54px
+    margin-left: -1px
+    @include box-shadow (-5px -22px 11px 10px rgba(50, 50, 50, .5))
+    @include skew(25deg, -30deg)
+    @include rotate(10deg)

data/base/app/assets/stylesheets/social_stream/base/mixins/_animation.css.sass

@@ -0,0 +1,5 @@
+@mixin animation ($duration, $delay, $animation)
+  -webkit-animation: ($duration, $delay, $animation)
+  -moz-animation: ($duration, $delay, $animation)
+  -o-animation: ($duration, $delay, $animation)
+  

data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass

@@ -90,11 +90,13 @@
 
 
 
-@mixin btn-see-more
+@mixin see-more
   clear: both
   margin-top: 10px
-  input
-    width: 98%
+  a
+    width: 53%
+    float: left
+    position: absolute
     background-color: #eee
     margin-bottom: 5px
     display: inline-block
@@ -105,8 +107,6 @@
     @include border-radius (5px)
     color: #000
     text-align: center
-    position: absolute
-    z-index: 100
     padding: 0px 10px 0px 4px
 
     &:hover

data/base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass

@@ -0,0 +1,4 @@
+@mixin colorfont-big-size
+  font-size: 45.5px
+  line-height: 13px
+

data/base/app/assets/stylesheets/social_stream/base/notifications/_notifications.css.sass

@@ -2,4 +2,6 @@
   @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
   .notifications
     @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
+    h1
+      @include colorfont-big-size
     

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

@@ -4,3 +4,18 @@
 
 
 @media (min-width: 1200px)
+
+#notifications
+  
+  .notifications
+   
+    .list
+      .notification
+        .notification
+          font-size: 15px
+          a
+            font-size: 17px 
+        .date-ago
+          font-size: 15px
+      
+    

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

@@ -6,6 +6,8 @@
 @media (max-width: 767px)
 
   #notifications
+    #toolbar
+      display: none
     .notifications
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       margin-left: 0
@@ -30,7 +32,4 @@
 
 @media (max-width: 480px)
 
-  #notifications
-  .notifications
-    h1
 

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

@@ -6,6 +6,8 @@
 @media (min-width: 768px) and (max-width: 979px)
 
   #notifications
+    #toolbar
+      @include hidden-tablet
     .notifications
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       margin-left: 0

data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass

@@ -2,6 +2,8 @@
 
 #profile
   #profile-info
+    h2
+      @include colorfont-big-size
     .tags,
     .personal,
     .comunication-info,

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

@@ -13,6 +13,7 @@
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       float: none
       margin: 0px auto 0px
+      clear: both
       .tags,
       .personal,
       .comunication-info,

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

@@ -4,14 +4,39 @@
 
 
 @media (min-width: 1200px)
+  body
+    font-size: 17px
+    line-height: 22px
+  label
+    margin-bottom: 0
+    font-size: 17px
+    line-height: 32px
 
+  h1 
+    font-size: 41px
+  h2 
+    font-size: 35px
+  h3
+    font-size: 27px
+  h4
+    font-size: 22px
+  h5
+    font-size: 17px
+  h5
+    font-size: 14px
+
+  header
+    .navbar-inner
+      .explore-nav
+        width: 105px
+    .dropdown-menu
+      li
+        a
+          padding: 8px 20px
   #home
     margin-left: auto
     margin-right: auto
-    #toolbar
-      width: 12.28571%
-      float: left
-      margin-left: 3.25%
+
     .activities
       @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
       float: left
@@ -29,8 +54,6 @@
   #user,
   #groups
     #toolbar
-      @include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: left
       .user
         .logo_home,
         #avatar_profile
@@ -45,11 +68,30 @@
       margin-rigth: 2%
 
     #sidebar
-      @include grid-core-span(3, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      width: 20%
       float: right
       
-
-
+  .timeline
+    .objects
+      .text
+        h6
+          font-size: 18px !important
+      .url
+        a
+          font-size: 14px !important
+      .description
+        p
+          font-size: 16px
+    .actions
+      .post_time_ago,
+      .to_comment,
+      .to_like,
+      .audience
+        font-size: 14px !important
+    .comments
+      h6
+        a
+          font-size: 16px !important
 
   #profile
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)

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

@@ -34,7 +34,8 @@
 
 
   #user,
-  #group
+  #group,
+  #contacts
     #toolbar
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       .user
@@ -165,7 +166,7 @@
               width: 89%
           .wall_input-actions
             .btn-group
-              margin-top: 10px
+              margin-top: 0px
       .timeline
         .avatar
           float: left

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

@@ -71,11 +71,6 @@
 
 
   .relation_customs
-    @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
-    float: left
-    margin-top: 20px
-    .relation_list
-      @include grid-core-span(4, $fluidGridColumnWidth, $fluidGridGutterWidth)
     #permissions
       @include grid-core-span(5, $fluidGridColumnWidth, $fluidGridGutterWidth)
 

data/base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass

@@ -0,0 +1,15 @@
+#settings
+  .settings
+    h2
+      @include ellipsis
+      @include colorfont-big-size
+      line-height: 32px
+      widht: 100%
+      .colorfont-overlay
+        color: #f2f2f2
+
+    .accordion
+      .settings_content
+        @include gradient-vertical-three-colors($startColor: #e2e2e2, $midColor: #ededed, $colorStop: 3%, $endColor: #f1f1f1)
+        .accordion-toggle
+          @include ellipsis