Merge pull request #5769 from svbergerem/remove-unused-css

Remove unused css and reduce blockquote font-size

app/assets/stylesheets/application.scss

@@ -5,16 +5,23 @@
 @import "colors";
 @import 'sizes';
 @import 'mixins';
-@import 'new_styles/new_mixins';
 
 /* core */
+@import 'media-box';
+@import 'autocomplete';
+@import 'entypo-fonts';
+@import 'entypo';
+@import 'mentions';
 @import 'flash_messages';
 @import 'sprites';
-
+@import 'hovercard';
 @import 'new_styles/base';
 @import 'new_styles/buttons';
 @import 'new_styles/interactions';
 @import 'new_styles/spinner';
+@import 'lightbox';
+@import 'vendor/fileuploader';
+@import 'vendor/autoSuggest';
 
 /* font overrides */
 @import 'new_styles/typography';
@@ -40,6 +47,7 @@
 
 /* conversations */
 @import 'conversations';
+@import 'vendor/facebox';
 @import 'facebox';
 
 /* publisher */
@@ -69,6 +77,7 @@
 @import 'stream';
 @import 'stream_element';
 @import 'comments';
+@import 'diaspora_jsxc';
 @import 'chat';
 
 /* right bar */
@@ -82,4 +91,4 @@
 @import 'new_styles/code';
 
 /* statistics */
-@import 'new_styles/statistics'
+@import 'new_styles/statistics';

app/assets/stylesheets/bootstrap-fix.scss

@@ -10,6 +10,13 @@ textarea::input-placeholder {
   color: #999999;
 }
 
+
+// A popover hack
+.popover h3 {
+  margin-bottom: 0;
+  font-weight: bold;
+}
+
 // A temporary fix for mention modal #5329
 
 #new_status_message_pane .modal {

app/assets/stylesheets/colors.scss

@@ -10,6 +10,7 @@ $light-grey: #DDDDDD;
 $border-grey: #DDDDDD;
 $border-dark-grey: #999999;
 
+$link-blue : rgb(42,156,235);
 $link-grey: #777777;
 $link-disabled-grey: #999999;
 

app/assets/stylesheets/hovercard.scss

@@ -1,6 +1,3 @@
-@import "colors";
-@import "_mixins";
-
 #hovercard {
   border-radius: 2px;
   box-shadow: 0 0 5px #666666;

app/assets/stylesheets/lightbox.scss

@@ -1,9 +1,3 @@
-//   licensed under the Affero General Public License version 3 or later.  See
-//   the COPYRIGHT file.
-
-@import 'colors';
-@import 'mixins';
-
 #lightbox{
   z-index: 1003;
   position: fixed;

app/assets/stylesheets/mentions.scss

@@ -1,6 +1,3 @@
-@import "colors";
-@import "_mixins";
-
 .mentions-input-box {
   border-radius: 3px;
 

app/assets/stylesheets/new_styles/_animations.scss

@@ -1,19 +1,3 @@
-@keyframes opacity-pulse {
-	0%   { opacity: 0.3; }
-	65%  { opacity: 0.9; }
-	100% { opacity: 0.3; }
-}
-
-@keyframes ease-over {
-	0%   { opacity: 0; transform : scale(1.3); }
-	100% { opacity: 1; transform : scale(1); }
-}
-
-@keyframes ease-out {
-	0%     { opacity: 1; transform : scale(1); }
-	100%   { opacity: 0; transform : scale(1.3); }
-}
-
 /* flash message animations - header height is about 40px */
 @keyframes expose {
         0%   { top : -100px; }

app/assets/stylesheets/new_styles/_base.scss

@@ -14,6 +14,11 @@ body {
   }
 }
 
+blockquote p {
+  font-size: $font-size-text;
+  line-height: $line-height;
+}
+
 /* Overflow */
 h1, h2, h3, h4, h5, h6,
 p,
@@ -23,13 +28,8 @@ pre { word-wrap: break-word; }
 a.tag { word-break: break-all; }
 
 /* new link color */
-$link-blue : rgb(42,156,235);
 a { color : $link-blue  }
 
-/* bootstrap extentions */
-.icon-red   { background-image: image_url("img/glyphicons-halflings-red.png");   }
-.icon-blue  { background-image: image_url("img/glyphicons-halflings-blue.png");  }
-
 .avatar {
   border-radius: 4px;
 
@@ -54,58 +54,6 @@ a { color : $link-blue  }
   color: inherit;
 }
 
-.photo-fill {
-  @include background-cover();
-  position: absolute;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
-}
-
-$bring-dark-accent-forward-color: #DDD;
-
-#top-right-nav {
-  z-index: 10;
-  position : absolute;
-  right : 10px;
-  top : 10px;
-
-  & > a {
-    @include transition(opacity);
-    opacity: 0.4;
-
-    margin-left : 5px;
-
-    &:hover {
-      opacity: 0.75;
-      text-decoration : none;
-    }
-  }
-}
-
-#header {
-  position : fixed;
-  top : 0;
-  width : 100%;
-  padding : 15px;
-  z-index : 30;
-
-  box-shadow : inset 0 -10px 10px -8px rgba(0,0,0,0.8);
-  border-bottom : 1px solid #333;
-
-  color : #fff;
-  background : {
-    color : #333;
-    size : cover;
-    attachment : fixed;
-  }
-
-  h1 {
-    opacity: 0.4;
-  }
-}
-
 /* bootstrap label fixes for Roboto */
 .label {
   padding : 2px 5px;
@@ -119,42 +67,6 @@ $bring-dark-accent-forward-color: #DDD;
   }
 }
 
-.profile-image-container {
-  border-radius: 140px;
-  border : 3px solid #fff;
-  box-shadow : 0 0 2px rgba(0,0,0,0.5), 0 0 10px rgba(0,0,0,0.6), inset 0 0 15px rgba(0,0,0,0.5), inset 0 -2px 4px rgba(255,255,255,0.3);
-  background-size: cover;
-
-  height : 140px;
-  width : 140px;
-  background : {
-    position : center;
-    image : image-url('user/default.png');
-  }
-
-  display : inline-block;
-
-  margin-bottom : 5px;
-
-  &.small {
-    height : 40px;
-    width : 40px;
-    border : 2px solid #fff;
-  }
-
-  &.smaller {
-    height : 34px;
-    width : 34px;
-    border : 2px solid #ccc;
-  }
-
-  &.micro {
-    height : 24px;
-    width : 24px;
-    border : 2px solid #fff;
-  }
-}
-
 #back-to-top {
   display: block;
   color: white;

app/assets/stylesheets/new_styles/_poll.scss

@@ -1,7 +1,3 @@
-@import '../colors';
-@import '../mixins';
-@import 'new_mixins';
-
 .poll_form {
   border-top: 1px solid $border-grey;
   border-bottom: 1px solid $border-grey;
@@ -34,7 +30,7 @@
   }
   .submit[disabled] {
     cursor: default;
-    color: $light-grey;
+    color: $text-grey;
 
     &:hover, &:active {
       background-image: none;

app/assets/stylesheets/notifications.scss

@@ -18,7 +18,7 @@
     .year_container { margin-top: 40px; }
     .year {
       background-color: $white;
-      color: $light-grey;
+      color: $text-grey;
       font-size: 40px;
       line-height: 40px;
       margin-bottom: -20px;
@@ -39,7 +39,7 @@
     .day_group {
       .date {
         text-align: center;
-        color: $light-grey;
+        color: $text-grey;
         .day {
           font-size: 40px;
           line-height: 40px;