Browse Source

Revert to file scss updates from 04d34e235c.

pull/29/head^2
Evan Theurer 12 years ago
parent
commit
a043a58e93
  1. 13
      src/styles/color-pallete.html
  2. 10
      src/styles/global/_angular.scss
  3. 39
      src/styles/global/_animations.scss
  4. 36
      src/styles/global/_nicescroll.scss
  5. 185
      src/styles/global/_overlaybar.scss

13
src/styles/color-pallete.html

@ -97,4 +97,17 @@ @@ -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>

10
src/styles/global/_angular.scss

@ -18,6 +18,12 @@ @@ -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 {
display: none;
[ng\:cloak],
[ng-cloak],
[data-ng-cloak],
[x-ng-cloak],
.ng-cloak,
.x-ng-cloak {
display: none;
}

39
src/styles/global/_animations.scss

@ -18,26 +18,27 @@ @@ -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.ng-hide-remove {
-webkit-transition:all linear 0.5s;
-moz-transition:all linear 0.5s;
-o-transition:all linear 0.5s;
transition:all linear 0.5s;
display:block!important;
}
.animate-show.ng-hide-add.ng-hide-add-active,
.animate-show.ng-hide-remove {
opacity:0;
.fadetogglecontainer > div {
position: absolute;
width: 100%;
}
.animate-show.ng-hide-add,
.animate-show.ng-hide-remove.ng-hide-remove-active {
opacity:1;
.animate-show {
&.ng-hide-add {
opacity: 1;
display: block !important;
@include transition(all linear 0.5s);
&.ng-hide-add-active {
opacity: 0;
}
}
&.ng-hide-remove {
opacity: 0;
display: block !important;
@include transition(all linear 0.5s);
&.ng-hide-remove-active {
opacity: 1;
}
}
}

36
src/styles/global/_nicescroll.scss

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

185
src/styles/global/_overlaybar.scss

@ -1,92 +1,101 @@ @@ -1,92 +1,101 @@
.overlaybar {
position:absolute;
padding:3px 8px 0px 30px;
vertical-align:middle;
background: rgba(0,0,0,0.2);
min-height:36px;
color: #ccc;
text-shadow: 0 0 5px black;
input[type="radio"], input[type="checkbox"] {
margin-top:2px;
}
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-o-user-select: none;
user-select: none;
}
.overlaybar:hover {
background: rgba(0,0,0,0.5);
}
.overlaybar.notvisible {
background: transparent;
pointer-events: none;
}
.overlaybar.notvisible:hover {
background: transparent;
}
.overlaybar .btn {
text-shadow: none;
}
.overlaybar .btn-link {
text-shadow: 0 0 5px black;
}
.overlaybar .overlaybarbutton {
font-size:20px;
vertical-align:middle;
position:absolute;
left: 3px;
top: 1px;
padding:6px;
display:block;
color:#ccc;
z-index:15;
opacity:0.7;
pointer-events: auto;
}
/*
* 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 .overlaybarcontent {
display:inline-block;
margin-left:.5em;
margin-bottom:0px;
max-width:60%;
}
.overlaybarcontent > * {
padding-right:.5em;
}
.overlaybarcontent .input-group {
max-width:160px;
}
.overlaybar label {
padding-top:7px !important;
}
.overlaybar .overlaybaroverlay {
display:none;
opacity: 0.7;
text-align:left;
margin-left:0.5em;
padding-top:2px;
}
.overlaybar.notvisible {
.overlaybarcontent {
display: none;
}
.overlaybaroverlay {
display: block;
}
.overlaybar {
background: $componentfg3;
color: $bordercolor;
min-height: 36px;
padding: 3px 8px 0 30px;
position: absolute;
text-shadow: 0 0 5px black;
vertical-align: middle;
@include user-select(none);
&:hover {
background: $componentfg2;
}
&.notvisible {
background: transparent;
pointer-events: none;
&:hover {
background: transparent;
}
}
.btn {
text-shadow: none;
}
.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 .form-group > * {
float: left;
padding-top: 0px;
.overlaybar {
.overlaybarbutton {
font-size: 20px;
vertical-align: middle;
position: absolute;
left: 3px;
top: 1px;
padding: 6px;
display: block;
color: $bordercolor;
z-index: 15;
opacity: .7;
pointer-events: auto;
}
.overlaybarcontent {
display: inline-block;
margin-left: .5em;
margin-bottom: 0;
max-width: 60%;
> * {
padding-right: .5em;
}
.input-group {
max-width: 160px;
}
}
.overlaybaroverlay {
display: none;
opacity: .7;
text-align: left;
margin-left: .5em;
padding-top: 2px;
}
&.notvisible {
.overlaybarcontent {
display: none;
}
.overlaybaroverlay {
display: block;
}
}
}
Loading…
Cancel
Save