social_stream-base 2.0.0.beta2 → 2.0.0.beta3

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

@@ -19,10 +19,8 @@
       .comunication-info,
       .experience,
       .avatar
-        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-        .update
-          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-
+        width: 97% !important
+    
 
 
 
@@ -31,4 +29,14 @@
 
 @media (max-width: 480px)
 
+  #profile
+    #profile-info
+      .tags,
+      .personal,
+      .comunication-info,
+      .experience,
+      .avatar
+        width: 96% !important
+        .accordion-heading
+          min-height: 40px
   

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

@@ -11,13 +11,12 @@
 
     #profile-info
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-      float: none
-      margin: 0px auto 0px
+      float: left !important
+      margin: 0 0 0 2.5% !important
+      width: 80% !important
       .tags,
       .personal,
       .comunication-info,
       .experience,
       .avatar
-        @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
-        .update
-          @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
+        width: 97.5% !important

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

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

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

@@ -5,8 +5,8 @@
 
 @media (min-width: 1200px)
   body
-    font-size: 17px
-    line-height: 22px
+    font-size: 16px
+    line-height: 21px
   label
     margin-bottom: 0
     font-size: 17px
@@ -38,7 +38,6 @@
     margin-right: auto
 
     .activities
-      @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
       float: left
       margin-left: 30px
       margin-right: 30px
@@ -63,7 +62,7 @@
           a
             @include grid-core-span(2, $fluidGridColumnWidth, $fluidGridGutterWidth)
     .activities
-      @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      width: 61%
       margin-left: 3%
       margin-rigth: 2%
 
@@ -76,12 +75,16 @@
       .text
         h6
           font-size: 18px !important
+          margin-bottom: 12px
       .url
         a
           font-size: 14px !important
       .description
         p
           font-size: 16px
+          margin-top: 10px
+          a
+            margin-top: 10px
     .actions
       .post_time_ago,
       .to_comment,

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

@@ -29,6 +29,7 @@
     .activities
       @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       margin-left: 0
+      margin-top: 20px
 
 
 
@@ -69,7 +70,6 @@
 
 
 
-
   #profile
     @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     margin-left: 0px
@@ -93,7 +93,6 @@
     #toolbar
     h2
       background-color: #c4c4c4
-      color: $white
       font-weight: bold
       padding-left: 10px
       border-top-left-radius: 10px

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

@@ -9,7 +9,10 @@
     ul
       margin-top: 13px
 
-
+  header 
+    .navbar-inner 
+      .search-nav
+        margin: 0px 0 0 43px
 
   footer
     @extend .hidden-tablet

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

@@ -0,0 +1,6 @@
+/****************************** Responsive
+@import "social_stream/base/responsive/responsive-768px-979px"
+
+@import "social_stream/base/responsive/responsive-1200px-min"
+
+@import "social_stream/base/responsive/responsive-767px-max"

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

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

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

@@ -0,0 +1,5 @@
+/****************************** Style
+@import "social_stream/base/select2/sselect2"
+
+/****************************** Layout
+@import "social_stream/base/select2/layout/sselect2"

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

@@ -5,8 +5,7 @@
       @include colorfont-big-size
       line-height: 32px
       widht: 100%
-      .colorfont-overlay
-        color: #f2f2f2
+      
 
     .accordion
       .settings_content

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

@@ -9,6 +9,11 @@
     h2
       margin-top: 0
       width: 100%
+      line-height: 50px
+      .colorfont
+        color: #e2e2e2
+      .colorfont-overlay
+        color: #ccc
     .accordion
       margin-bottom: 0
       .settings_content

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

@@ -16,13 +16,14 @@
 
       h2
         background-color: #c4c4c4
-        color: $white
         font-weight: bold
         padding-left: 2%
         border-top-left-radius: 10px
         border-top-right-radius: 10px
         margin-bottom: 0px !important
         width: 98%
+        span.colorfont-overlay
+          padding-left: 2%
 
       header
         border-bottom: 1px solid #c4c4c4

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

@@ -17,12 +17,14 @@
       margin-left: 20px
       h2
         background-color: #c4c4c4
-        color: $white
         font-weight: bold
         border-top-left-radius: 10px
         border-top-right-radius: 10px
         margin: 0px !important
-       
+        padding-left: 2%   
+        width: 98%
+        span.colorfont-overlay
+          padding-left: 2%      
       header
         border-bottom: 1px solid #c4c4c4
         padding-left: 20px

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

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

data/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass

@@ -2,7 +2,7 @@
   #suggestions,
   #pendings
     h4
-      font-size: 35.5px
+      font-size: 33.5px
     
     .contact
       .avatar

data/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass

@@ -30,6 +30,9 @@
       width: auto
 
 #suggestions
-  margin-top: 20px
+  margin-top: 30px
+
+#pendings
+  margin-top: 40px
 
 

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

@@ -0,0 +1,8 @@
+/****************************** Style
+@import "social_stream/base/sidebar/sidebar"
+
+/****************************** Layout
+@import "social_stream/base/sidebar/layout/sidebar"
+
+/****************************** Responsive
+@import "social_stream/base/sidebar/responsive/responsive-1200px-min"

data/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass

@@ -27,6 +27,9 @@
         .objects
           word-wrap: break-word
           .thumb
+            img
+              float: left
+              z-index: 1
 
           .text
             font-size: 12px
@@ -145,15 +148,7 @@
     #modal-carousel
       img
         @include border-radius(3px)
-        margin-left: auto
-        margin-right: auto
-        max-height: 400px
       .carousel-control
-        padding-top: 7%
-        padding-bottom: 9%
-        top: 43%
-        left: 1
-        height: auto
         line-height: 0
-
+      
 

data/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass

@@ -43,7 +43,7 @@
     .info
       width: 53%
       display: inline-block
-      margin-left: 2%
+      margin-left: 1%
       .description
         textarea
           min-height: 80px
@@ -65,9 +65,11 @@
       display: inline
       padding: 1px 6px 4px 6px
     .form-privacy
-      width: 20%
       display: inline-block
       @include btn-add
+      .btn-group
+        button
+          padding: 4px 12px 4px 8px
       
 
 #post_text

data/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass

@@ -4,6 +4,7 @@
 #home,
 #time-line,
   .timeline
+    @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
     .comments
     .media
       padding-bottom: 13px
@@ -159,3 +160,36 @@
         img
           display: inline
 
+.timeline
+  .more
+    @include see-more
+    a
+      width: 54%
+      position: absolute
+      z-index: 2
+      float: left
+    .loading
+      z-index: 200
+      position: relative
+  .modal
+    top: 4% !important
+    .modal-body
+      height: auto
+      max-height: 600px
+      #modal-carousel
+        img
+          margin-left: auto
+          margin-right: auto
+        .carousel-control
+          padding-top: 7%
+          padding-bottom: 9%
+          top: 43%
+          left: 1
+          height: auto
+          top: 81%
+        .carousel-indicators
+          position: relative
+          top: 13px
+          left: 3px
+          right: 0
+

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

@@ -0,0 +1,14 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px)
+
+  .timeline
+    .modal
+      .modal-body
+        max-height: 700px
+    .more
+      a
+        width: 53%

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

@@ -0,0 +1,28 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+
+@media (max-width: 767px)
+
+  .timeline
+    .more
+      a
+        width: 89% !important
+    .modal
+      .modal-body
+        max-height: 400px
+
+
+
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px)
+
+  .timeline
+    .more
+      a
+        width: 85% !important

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

@@ -0,0 +1,14 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 979px)
+
+  .timeline
+    .modal
+      .modal-body
+        max-height: 500px
+    .more
+      a
+        width: 91%

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

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

data/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass

@@ -1,17 +1,20 @@
 .toolbar-profile
   .toolbar_menu
     ul
-      background: $white
+      background: #f9f9f9
       li
         @include btn-primary
         @include border-radius(5px)
         padding: 4px 7px
+        margin-bottom: 5px
+        a
+          @include ellipsis
         .icon_tool16-info
           background-position: -192px -110px
         .icon_navbar-resources
-          background-position: -175px -8px
+          background-position: -175px -12px
         .icon_navbar-message
-          background-position: -55px -8px
+          background-position: -55px -11px
         &:hover
           .icon_tool16-info
             background-position: -192px -235px
@@ -58,7 +61,18 @@
 
 
 
-#toolbar 
+#toolbar
+  h5
+    position: relative
+    margin-top: 7px
+    margin-bottom: 16px
+    font-size: 16px
+    @include ellipsis
+    a
+      color: #666
+      &:hover
+        text-decoration: none
+        color: #444
   .contact-button
     @include btn-add
 
@@ -89,11 +103,17 @@
     @include ellipsis
     img
       @include border-radius(5px)
-    h5 
+    .subject-name-phone
+      position: relative
+      margin-top: 7px
+      margin-bottom: 16px
+      font-size: 16px
+      @include ellipsis
       a
-        text-decoration: none
-        color: $black
-        text-aling: center
+        color: #666
+        &:hover
+          text-decoration: none
+          color: #444
 
     .logo_caption
       font-size: 15px

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

@@ -6,9 +6,8 @@
 @media (min-width: 1200px)
 
   #toolbar
-    width: 9.9%
+    width: 145px
     float: left
-    margin-left: 3.25%
     h5
       a
         font-size: 25px

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

@@ -8,15 +8,27 @@
  
   #toolbar
     width: 100%
+    margin-bottom: 20px
     .user
       width: 39%
       float: left
-    #avatar_profile
-      float: left
+      #avatar_profile
+        float: left
+      .subject-name-phone
+        position: absolute
+        margin-left: 16px
+        margin-top: -2px
+        font-size: 20px
+        margin-bottom: 0px
+        @include ellipsis
+        width: 178px
     .toolbar_menu
       display: inline-block
       width: 47%
       margin-left: 4%
+      margin-top: 27px
+      ul
+        margin-top: -6px
 
 
 

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

@@ -0,0 +1,10 @@
+/****************************** Style
+@import "social_stream/base/toolbar/toolbar"
+
+/****************************** Layout
+@import "social_stream/base/toolbar/layout/toolbar"
+
+/****************************** Responsive
+@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/app/assets/stylesheets/social_stream/bootstrap-rewrite/_button-groups.scss

@@ -35,7 +35,7 @@
 // Float them, remove border radius, then re-add to first and last elements
 .btn-group > .btn-blue {
   position: relative;
-  @include border-radius(0px),
+  @include border-radius(0px)
 }
 .btn-group > .btn-blue + .btn-blue {
   margin-left: -1px;

data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_forms.scss

@@ -6,4 +6,12 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
 }
 select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {   
   padding: 6px 2%;
+}
+
+textarea, input[type="text"], input[type="password"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"] {   
+  @include gradient-directional($startColor: #f9f9f9, $endColor: #f1f1f1, $deg: 45deg);
+}
+
+textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus {   
+  @include gradient-directional($startColor: #f9f9f9, $endColor: #f9f9f9, $deg: 45deg);
 }

data/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss

@@ -21,4 +21,8 @@
   color: $gray;
   text-decoration: none;
   text-shadow: 0 1px 0 white;
+}
+
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus {
+  @include gradient-vertical($startColor: $white, $endColor: rgba(255, 255, 255, 0.3));
 }

data/app/assets/stylesheets/social_stream/fonts/colorfont.css

@@ -1,11 +1,11 @@
 /************* typography COLORFONT PLUGING*******/
 
 .colorfont {
-  color: #e2e2e2;
-  font-family: 'Din OSP' !important;
+  color: #e6e6e6;
+  font-family: 'Josefin OSP' !important;
 }
 
 .colorfont-overlay {
-  color: #ccc;
-  font-family: 'Din Overlay' !important;
+  color: #ddd;
+  font-family: 'Josefin Overlay' !important;
 }

data/app/assets/stylesheets/social_stream/fonts/fonts.css

@@ -19,15 +19,15 @@
   src: url(social_stream/fonts/GiveYouGlory.ttf);
 }
 @font-face{
-  font-family: "Din OSP";
+  font-family: "Josefin OSP";
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/DIN_OSP-Original.ttf);
+  src: url(social_stream/fonts/JosefinSlabRegular.ttf);
 }
 
 @font-face{
-  font-family: 'Din Overlay';
+  font-family: 'Josefin Overlay';
   font-weight: normal;
   font-style: normal;
-  src: url(social_stream/fonts/DIN_OSP-Overlay.ttf);
+  src: url(social_stream/fonts/JosefinSlabOverlay.ttf);
 }

data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass

@@ -0,0 +1,5 @@
+@import "social_stream/base/mixins/colorfont"
+
+@import "social_stream/fonts/fonts"
+
+@import "social_stream/fonts/colorfont"

data/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass

@@ -0,0 +1,5 @@
+@import "social_stream/base/mixins/colorfont"
+
+@import "social_stream/fonts/fonts"
+
+@import "social_stream/fonts/colorfont"