Revert to file scss updates from 04d34e235c.

src/styles/color-pallete.html

@@ -97,4 +97,17 @@
       <td class="color-block" style="background-color: rgba(0,0,0,.4);"></td>
       <td class="color-block" style="background-color: rgba(0,0,0,.3);"></td>
    </tr>
+   <tr>
+      <td class="color-desc">
+         $grey5: #aaa
+      </td>
+      <td class="color-desc">
+         $grey6: #ddd
+      </td>
+
+   </tr>
+   <tr>
+      <td class="color-block" style="background-color: #aaa;"></td>
+      <td class="color-block" style="background-color: #ddd;"></td>
+   </tr>
 </table>

src/styles/global/_angular.scss

@@ -18,6 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+
+[ng\:cloak],
+[ng-cloak],
+[data-ng-cloak],
+[x-ng-cloak],
+.ng-cloak,
+.x-ng-cloak {
   display: none;
 }

src/styles/global/_animations.scss

@@ -18,26 +18,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 .fadetogglecontainer > div {
   position: absolute;
   width: 100%;
 }
 
-.animate-show.ng-hide-add,
+.animate-show {
-.animate-show.ng-hide-remove {
+  &.ng-hide-add {
--webkit-transition:all linear 0.5s;
+    opacity: 1;
--moz-transition:all linear 0.5s;
--o-transition:all linear 0.5s;
-transition:all linear 0.5s;
     display: block !important;
-}
+    @include transition(all linear 0.5s);
-
+    &.ng-hide-add-active {
-.animate-show.ng-hide-add.ng-hide-add-active,
-.animate-show.ng-hide-remove {
       opacity: 0;
     }
-
+  }
-.animate-show.ng-hide-add,
+  &.ng-hide-remove {
-.animate-show.ng-hide-remove.ng-hide-remove-active {
+    opacity: 0;
+    display: block !important;
+    @include transition(all linear 0.5s);
+    &.ng-hide-remove-active {
       opacity: 1;
     }
+  }
+}

src/styles/global/_nicescroll.scss

@@ -18,23 +18,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-.nicescroll::-webkit-scrollbar {
+
-width: 8px;
+.nicescroll {
-height: 8px;
+  &::-webkit-scrollbar {
     background-color: $background;
     border: solid transparent;
-}
+    height: 8px;
-
+    width: 8px;
-.nicescroll::-webkit-scrollbar:hover {
+    &:hover {
       background-color: $background;
       border-left: 1px solid rgba(0,0,0,.12);
       border-right: 1px solid rgba(0,0,0,.12);
     }
-
-.nicescroll::-webkit-scrollbar-thumb {
-background: rgba(0,0,0,0.2);
   }
-
+  &::-webkit-scrollbar-thumb {
-.nicescroll::-webkit-scrollbar-thumb:active {
+    background: rgba(0,0,0,0.2);
+    &:active {
       background: rgba(0,0,0,0.4);
     }
+  }
+}

src/styles/global/_overlaybar.scss

@@ -1,42 +1,64 @@
+/*
+ * Spreed Speak Freely.
+ * Copyright (C) 2013-2014 struktur AG
+ *
+ * This file is part of Spreed Speak Freely.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 .overlaybar {
-	position:absolute;
+  background: $componentfg3;
-	padding:3px 8px 0px 30px;
+  color: $bordercolor;
-	vertical-align:middle;
-	background: rgba(0,0,0,0.2);
   min-height: 36px;
-	color: #ccc;
+  padding: 3px 8px 0 30px;
+  position: absolute;
   text-shadow: 0 0 5px black;
-	input[type="radio"], input[type="checkbox"] {
+  vertical-align: middle;
-		margin-top:2px;
+  @include user-select(none);
-	}
+  &:hover {
-    -webkit-user-select: none;
+    background: $componentfg2;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-}
-
-.overlaybar:hover {
-	background: rgba(0,0,0,0.5);
   }
-
+  &.notvisible {
-.overlaybar.notvisible {
     background: transparent;
     pointer-events: none;
-}
+    &:hover {
-.overlaybar.notvisible:hover {
       background: transparent;
     }
-
+  }
-.overlaybar .btn {
+  .btn {
     text-shadow: none;
   }
-
+  .btn-link {
-.overlaybar .btn-link {
     text-shadow: 0 0 5px black;
   }
+  .form-group > * {
+    float: left;
+    padding-top: 0;
+  }
+  input[type="radio"],
+  input[type="checkbox"] {
+    margin-top: 2px;
+  }
+  label {
+    padding-top: 7px !important;
+  }
+}
 
-.overlaybar .overlaybarbutton {
+.overlaybar {
+  .overlaybarbutton {
     font-size: 20px;
     vertical-align: middle;
     position: absolute;
@@ -44,40 +66,31 @@
     top: 1px;
     padding: 6px;
     display: block;
-	color:#ccc;
+    color: $bordercolor;
     z-index: 15;
-	opacity:0.7;
+    opacity: .7;
     pointer-events: auto;
   }
-
+  .overlaybarcontent {
-.overlaybar .overlaybarcontent {
     display: inline-block;
     margin-left: .5em;
-	margin-bottom:0px;
+    margin-bottom: 0;
     max-width: 60%;
-}
+    > * {
-
-.overlaybarcontent > * {
       padding-right: .5em;
     }
-
+    .input-group {
-.overlaybarcontent .input-group {
       max-width: 160px;
     }
-
-.overlaybar label {
-	padding-top:7px !important;
   }
-
+  .overlaybaroverlay {
-.overlaybar .overlaybaroverlay {
     display: none;
-	opacity: 0.7;
+    opacity: .7;
     text-align: left;
-	margin-left:0.5em;
+    margin-left: .5em;
     padding-top: 2px;
   }
-
+  &.notvisible {
-.overlaybar.notvisible {
     .overlaybarcontent {
       display: none;
     }
@@ -85,8 +98,4 @@
       display: block;
     }
   }
-
-.overlaybar .form-group > * {
-	float: left;
-	padding-top: 0px;
 }