Browse Source

Improved ordering.

pull/29/head
Evan Theurer 12 years ago
parent
commit
6f70e2904f
  1. 72
      src/styles/components/_bar.scss

72
src/styles/components/_bar.scss

@ -20,49 +20,49 @@
*/ */
#bar { #bar {
position: absolute;
top: 0;
left: 0;
right: 0;
min-height: 44px;
background-color: $componentbg; background-color: $componentbg;
color: $componentfg1; color: $componentfg1;
font-size: 1em; font-size: 1em;
font-weight: bold; font-weight: bold;
line-height: 40px; line-height: 40px;
left: 0;
min-height: 44px;
position: absolute;
right: 0;
top: 0;
text-align: center; text-align: center;
z-index: 5; z-index: 5;
@include box-shadow(0 2px 10px 0 $componentfg3); @include box-shadow(0 2px 10px 0 $componentfg3);
@include touch-callout(none); @include touch-callout(none);
@include user-select(none); @include user-select(none);
> .left { > .left {
position: absolute; bottom: 0;
left: 0; left: 0;
top: 0; top: 0;
bottom: 0;
padding-left: 12px; padding-left: 12px;
position: absolute;
// TODO(theurere): cleanup // TODO(theurere): cleanup
> *, #bar > .right > * { > *, #bar > .right > * {
vertical-align: middle; vertical-align: middle;
} }
} }
.logo { .logo {
font-size: 11px;
line-height: 11px;
font-weight:normal;
color: black;
width: 90px;
height: 32px;
background-size: 100%; background-size: 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url(../img/logo-small.png); background-image: url(../img/logo-small.png);
display: inline-block; display: inline-block;
color: black;
font-size: 11px;
font-weight:normal;
height: 32px;
line-height: 11px;
text-align: left; text-align: left;
width: 90px;
> span { > span {
position: relative; font-style: italic;
left: 38px; left: 38px;
position: relative;
top: 26px; top: 26px;
font-style: italic;
} }
> span a { > span a {
color: $dgrey; color: $dgrey;
@ -72,23 +72,23 @@
#bar { #bar {
> .right { > .right {
bottom: 1px;
padding-right: 8px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 1px; top: 1px;
bottom: 1px;
padding-right: 8px;
.btn { .btn {
border-color: transparent;
background: transparent; background: transparent;
border-color: transparent;
color: $grey3; color: $grey3;
height: 42px;
width: 42px;
display: inline-block; display: inline-block;
font-size: 24px; font-size: 24px;
padding: 0; height: 42px;
line-height: 40px; line-height: 40px;
text-align: center;
margin-left: -4px; margin-left: -4px;
padding: 0;
text-align: center;
width: 42px;
} }
.btn:focus { .btn:focus {
border: none; border: none;
@ -96,13 +96,13 @@
outline: none; outline: none;
} }
.btn:hover { .btn:hover {
border-color: #ccc;
background-color: none; background-color: none;
border-color: #ccc;
color: $grey4; color: $grey4;
} }
.btn.active { .btn.active {
border-color: #ccc;
background-color: none; background-color: none;
border-color: #ccc;
color: $grey4; color: $grey4;
} }
.btn.active.amutebtn { .btn.active.amutebtn {
@ -124,44 +124,44 @@
} }
.badge { .badge {
background-color: $actioncolor1; background-color: $actioncolor1;
border: 1px solid white;
font-size: .4em; font-size: .4em;
position: absolute; position: absolute;
right: 0; right: 0;
top: 2px; top: 2px;
border: 1px solid white;
} }
.userpicture { .userpicture {
margin: -5px .5em 0 .5em;
width: 46px;
height: 46px;
border-radius: 2px; border-radius: 2px;
display: inline-block; display: inline-block;
height: 46px;
margin: -5px .5em 0 .5em;
width: 46px;
} }
> .middle { > .middle {
z-index: 5;
background-color: $componentbg; background-color: $componentbg;
display: inline-block; display: inline-block;
min-height: 44px;
padding: 0 1em; padding: 0 1em;
position: relative; position: relative;
min-height: 44px;
vertical-align: middle;
margin-left: -70px; margin-left: -70px;
vertical-align: middle;
z-index: 5;
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
display: block; display: block;
margin-left: 0px;
max-width: 40%; max-width: 40%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
margin-left: 0px;
} }
} }
} }
#bar { #bar {
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
z-index: 40;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
z-index: 40;
} }
> .middle img { > .middle img {
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
@ -171,10 +171,10 @@
> .middle.status-connected, > .middle.status-connected,
> .middle.status-conference { > .middle.status-conference {
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
position: absolute; max-width: 100%;
left: 0; left: 0;
position: absolute;
right: 0; right: 0;
max-width: 100%;
} }
} }
> .middle.status-connecting, > .middle.status-connecting,
@ -183,8 +183,8 @@
> .middle.status-error, > .middle.status-error,
> .middle.status-ringing { > .middle.status-ringing {
@include breakpt($breakpoint-medium) { @include breakpt($breakpoint-medium) {
max-width: 100%;
border-bottom: 1px solid $bordercolor; border-bottom: 1px solid $bordercolor;
max-width: 100%;
min-height: 45px; min-height: 45px;
} }
} }

Loading…
Cancel
Save