Browse Source

Update the overlaybar* syntax to overlaybar-*.

pull/29/head^2
Evan Theurer 12 years ago
parent
commit
bcfa4e697b
  1. 10
      src/styles/global/_overlaybar.scss
  2. 6
      static/partials/roombar.html
  3. 4
      static/partials/screenshare.html

10
src/styles/global/_overlaybar.scss

@ -58,7 +58,7 @@
} }
.overlaybar { .overlaybar {
.overlaybarbutton { .overlaybar-button {
font-size: 20px; font-size: 20px;
vertical-align: middle; vertical-align: middle;
position: absolute; position: absolute;
@ -71,7 +71,7 @@
opacity: .7; opacity: .7;
pointer-events: auto; pointer-events: auto;
} }
.overlaybarcontent { .overlaybar-content {
display: inline-block; display: inline-block;
margin-left: .5em; margin-left: .5em;
margin-bottom: 0; margin-bottom: 0;
@ -83,7 +83,7 @@
max-width: 160px; max-width: 160px;
} }
} }
.overlaybaroverlay { .overlaybar-overlay {
display: none; display: none;
opacity: .7; opacity: .7;
text-align: left; text-align: left;
@ -91,10 +91,10 @@
padding-top: 2px; padding-top: 2px;
} }
&.notvisible { &.notvisible {
.overlaybarcontent { .overlaybar-content {
display: none; display: none;
} }
.overlaybaroverlay { .overlaybar-overlay {
display: block; display: block;
} }
} }

6
static/partials/roombar.html

@ -1,6 +1,6 @@
<div class="roombar overlaybar form-horizontal" ng-class="{notvisible: hideRoomBar}"> <div class="roombar overlaybar form-horizontal" ng-class="{notvisible: hideRoomBar}">
<a class="overlaybarbutton" ng-model="hideRoomBar" btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Change room')}}"><i class="fa fa-th-list"></i></a> <a class="overlaybar-button" ng-model="hideRoomBar" btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Change room')}}"><i class="fa fa-th-list"></i></a>
<form name="roombarform" class="overlaybarcontent form-group"> <form name="roombarform" class="overlaybar-content form-group">
<label class="pull-left control-label hidden-xs">{{_('Room')}}</label> <label class="pull-left control-label hidden-xs">{{_('Room')}}</label>
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
@ -11,5 +11,5 @@
<social-share/> <social-share/>
</div> </div>
</form> </form>
<label class="control-label overlaybaroverlay" title="{{_('Current room')}}">{{roomid}}</label> <label class="control-label overlaybar-overlay" title="{{_('Current room')}}">{{roomid}}</label>
</div> </div>

4
static/partials/screenshare.html

@ -1,8 +1,8 @@
<div class="screenshare" ng-class="{remotesize: !fitScreen}"> <div class="screenshare" ng-class="{remotesize: !fitScreen}">
<div class="screensharepane nicescroll"></div> <div class="screensharepane nicescroll"></div>
<div class="overlaybar form-horizontal" ng-class="{notvisible: hideOptionsBar}"> <div class="overlaybar form-horizontal" ng-class="{notvisible: hideOptionsBar}">
<a class="overlaybarbutton" ng-model="hideOptionsBar" btn-checkbox btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Screen sharing options')}}"><i class="fa fa-cogs"></i></a> <a class="overlaybar-button" ng-model="hideOptionsBar" btn-checkbox btn-checkbox btn-checkbox-true="0" btn-checkbox-false="1" title="{{_('Screen sharing options')}}"><i class="fa fa-cogs"></i></a>
<form class="overlaybarcontent form-group"> <form class="overlaybar-content form-group">
<div class="checkbox"> <div class="checkbox">
<label class="control-label pull-left"> <label class="control-label pull-left">
<input type="checkbox" ng-model="fitScreen"> {{_('Fit screen.')}} <input type="checkbox" ng-model="fitScreen"> {{_('Fit screen.')}}

Loading…
Cancel
Save