social_stream-base 2.0.0.beta1 → 2.0.0.beta2

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

@@ -2,20 +2,17 @@
   #toolbar
     @include hidden-phone
     @include hidden-tablet
-  h2
-    @include ellipsis
   .settings
     @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
     float: left
     margin-left: 2%
     h2
-      @include ellipsis
       margin-top: 0
+      width: 100%
     .accordion
       margin-bottom: 0
       .settings_content
         padding: 0px 15px 0px
-        @include gradient-vertical-three-colors($startColor: #e2e2e2, $midColor: #ededed, $colorStop: 3%, $endColor: #f1f1f1)
         .accordion-toggle
           @include ellipsis
         form

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

@@ -7,7 +7,7 @@
 
   #settings
     .settings
-      @include grid-core-span(9, $fluidGridColumnWidth, $fluidGridGutterWidth)
+      @include grid-core-span(12, $fluidGridColumnWidth, $fluidGridGutterWidth)
       @include grid-core-offset(1, $fluidGridColumnWidth, $fluidGridGutterWidth)
       border-left: 1px solid #c4c4c4
       border-right: 1px solid #c4c4c4
@@ -19,11 +19,10 @@
         background-color: #c4c4c4
         color: $white
         font-weight: bold
-        padding-left: 2%
         border-top-left-radius: 10px
         border-top-right-radius: 10px
         margin: 0px !important
-        width: 98%
+       
       header
         border-bottom: 1px solid #c4c4c4
         padding-left: 20px

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

@@ -1,37 +1,29 @@
 #sidebar 
-  .contact
-    .data
-      .x
-        a
-          text-decoration: none
-    .info
-      font-size: 11px
-      color: #ccc
-
-
   #suggestions,
   #pendings
     h4
-      color: $black
-      font-family: $serifFontFamily
+      font-size: 35.5px
     
     .contact
       .avatar
         img
           @include border-radius(5px)
      
-    .data
-      .name
-        color: $black
-        .x
-          font-size: 12px
+      .data
+        .name
           color: $black
-      .info
-        font-size: 11px
-        color: #ccc
+          .x
+            font-size: 12px
+            color: $black
+            a
+              text-decoration: none
+        .info
+          font-size: 11px
+          color: #777
+          font-family: $sansFontFamilyLight
 
-    .add
-      @include btn-add
+      .add
+        @include btn-add
          
 
     .see-more

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

@@ -9,52 +9,27 @@
       width: 45px !important
       float: left
     .data
+      display: inline-block
+      margin: 0 0 3px 3px
+      float: left
+      width: 65%
+      .info
+        z-index: 1
       a
         display: inline
-      .x
-        a
-          float: right
-          display: inline-block
-          margin-top: -20px
+    .x
+      a
+        float: right
+        display: inline-block
+        margin-right: 16px
+        margin-top: -91px
     .info
       z-index: 1
     .add
       margin-top: 2px
       width: auto
 
+#suggestions
+  margin-top: 20px
 
 
-
-  #suggestions,
-  #pendings
-    
-    .contact
-      padding: 5px 2%
-      display: inline-block
-      .avatar
-        width: 45px
-        display: inline
-        float: left
-        img
-          width: 45px 
-     
-    .data
-      display: inline-block
-      margin: 0 0 3px 3px
-      float: left
-      width: 65%
-      .info
-        z-index: 1
-
-    .add
-      z-index: 1
-      float: left
-      .btn-group
-        max-width: 400px
-        .btn
-          .caret
-            margin-left: 6px
-
-
-    .see-more
-      line-height: 20px

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

@@ -0,0 +1,15 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px)
+
+  #sidebar
+    #suggestions,
+    #pendings
+      .data
+        .info
+          font-size: 14px
+          line-height: 26px
+          color: #555

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

@@ -8,22 +8,22 @@
     .media
       .avatar
         @include border-radius (5px)
-
+      .media-heading
+        font-size: 12px
+        color: #919191
       .media-body
         color: $grayLight
         word-wrap: break-word
-        .media-heading
-          font-size: 14px
+        a
+          text-decoration: none
+        .x
+          font-size: 12px
+          color: $black
           a
             text-decoration: none
-          .x
-            font-size: 12px
-            color: $black
-            a
-              text-decoration: none
-              color: $grayLight
-              &:hover
-                color: $red
+            color: $grayLight
+            &:hover
+              color: $red
         .objects
           word-wrap: break-word
           .thumb
@@ -79,8 +79,7 @@
         font-size: 12px
 
     nav
-      a
-        @include btn-see-more
+      @include see-more
 
   #new_comment
     .btn
@@ -148,6 +147,7 @@
         @include border-radius(3px)
         margin-left: auto
         margin-right: auto
+        max-height: 400px
       .carousel-control
         padding-top: 7%
         padding-bottom: 9%

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

@@ -4,11 +4,14 @@
   @include grid-fluid(12, 0)
 
 .activities
+  header h2
+    @include colorfont-big-size
   .wall_input
     padding: 5px 13px
     background-color: $grayLighter
     margin-bottom: 20px
     @include border-radius (5px)
+    @include box-shadow (rgba(0, 0, 0, .15) 0 1px 3px)
     label
       font-size: 14px
     input

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

@@ -69,9 +69,12 @@
     @extend .hidden-phone
     h4
       margin-bottom: 0px
+      font-family: $sansFontFamilyLight
       border-bottom: 1px solid #ddd
     ul
       border-right: 1px solid #ddd
+      img
+        @include border-radius(5px)
     .contacts-more,
     .groups-more
       text-align: right

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

@@ -13,7 +13,6 @@
   .icon_navbar-message-blue,
   .icon_tool16-info
     margin-right: 4px
-
   
   .contacts-toolbar,
   section.groups
@@ -60,12 +59,14 @@
 
   #avatar_profile,
   .logo_home
-    img
-      width: 100%
 
     .subject-name
-      @extend .hidden-tablet 
+      @include ellipsis
       @extend .hidden-phone
+    .subject-name-phone
+      @include ellipsis
+      display: none
+      @extend .visible-phone
 
    
     .logo_caption

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

@@ -0,0 +1,27 @@
+//
+// Responsive: Large desktop and up
+// --------------------------------------------------
+
+
+@media (min-width: 1200px)
+
+  #toolbar
+    width: 9.9%
+    float: left
+    margin-left: 3.25%
+    h5
+      a
+        font-size: 25px
+    section.groups,
+    section.contacts-toolbar
+      ul
+        li
+          img
+            width: 85%
+
+  #repository
+    #toolbar
+      .logo_home
+        a
+          img
+            width: 100%

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

@@ -0,0 +1,29 @@
+//
+// Responsive: Landscape phone to desktop/tablet
+// --------------------------------------------------
+
+
+@media (max-width: 767px)
+
+ 
+  #toolbar
+    width: 100%
+    .user
+      width: 39%
+      float: left
+    #avatar_profile
+      float: left
+    .toolbar_menu
+      display: inline-block
+      width: 47%
+      margin-left: 4%
+
+
+
+
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px)
+
+

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

@@ -0,0 +1,9 @@
+//
+// Responsive: Tablet to desktop
+// --------------------------------------------------
+
+
+@media (min-width: 768px) and (max-width: 979px)
+
+  
+  

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

@@ -24,7 +24,9 @@
   box-shadow: none;
   padding: 0;
 }
-
+.navbar .nav.pull-right {
+  margin-right: -10px;
+}
 // Navbar search
 // -------------------------
 .navbar-search {
@@ -39,7 +41,7 @@
   margin: 15px 0 0 0;
   width: 100%;
   position: relative;
-  z-index: 4;
+  z-index: 8;
 }
 .navbar .nav {
   margin: 0;

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

@@ -14,7 +14,7 @@ $grayDarker:            #222 !default;
 $grayDark:              #333 !default;
 $gray:                  #555 !default;
 $grayLight:             #888 !default;
-$grayLighter:           #ccc !default;
+$grayLighter:           #e2e2e2 !default;
 $white:                 #fff !default;
 
 
@@ -39,13 +39,14 @@ $textColor:             $grayDark !default;
 
 // Links
 // -------------------------
-$linkColor:             #0088cc !default;
+$linkColor:             #049cdb !default;
 $linkColorHover:        darken($linkColor, 15%) !default;
 
 
 // Typography
 // -------------------------
 $sansFontFamily:        "OpenSans", Arial, sans-serif;
+$sansFontFamilyLight:   "OpenSansLight", Arial, sans-serif;
 $serifFontFamily:       "BreeSerif", Times New Roman, Times, serif !default;
 $handwriteFontFamily:   "Giveyouglory", Courier New, monospace !default;
 

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

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

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

@@ -1,16 +1,33 @@
 /************* typography*******/
 
 @font-face{
-  font-family:OpenSans;
+  font-family:"OpenSans";
   src: url(social_stream/fonts/opensans-regular.ttf);
 }
+@font-face{
+  font-family:"OpenSansLight";
+  src: url(social_stream/fonts/OpenSans-Light.ttf);
+}
 
 @font-face{
-  font-family:BreeSerif;
+  font-family:"BreeSerif";
   src: url(social_stream/fonts/BreeSerif-Regular.ttf);
 }
 
 @font-face{
-  font-family:Giveyouglory;
+  font-family:"Giveyouglory";
   src: url(social_stream/fonts/GiveYouGlory.ttf);
+}
+@font-face{
+  font-family: "Din OSP";
+  font-weight: normal;
+  font-style: normal;
+  src: url(social_stream/fonts/DIN_OSP-Original.ttf);
+}
+
+@font-face{
+  font-family: 'Din Overlay';
+  font-weight: normal;
+  font-style: normal;
+  src: url(social_stream/fonts/DIN_OSP-Overlay.ttf);
 }