Browse Source

Fixed styles of youtube and presentation component by no longer centering the text.

pull/176/head
Simon Eisenmann 11 years ago
parent
commit
e62ac80216
  1. 4
      src/styles/components/_presentation.scss
  2. 2
      static/css/main.min.css
  3. 2
      static/partials/presentation.html
  4. 18
      static/partials/youtubevideo.html

4
src/styles/components/_presentation.scss

@ -35,10 +35,6 @@
white-space: normal; white-space: normal;
} }
.presentationpane .welcome div {
text-align: center;
}
.presentationpane .welcome button { .presentationpane .welcome button {
margin-top: 30px; margin-top: 30px;
} }

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

2
static/partials/presentation.html

@ -9,7 +9,7 @@
</div> </div>
<div class="welcome container-fluid" ng-hide="currentPresentation || loading"> <div class="welcome container-fluid" ng-hide="currentPresentation || loading">
<h1>{{_('Please upload a document')}}</h1> <h1>{{_('Please upload a document')}}</h1>
<div class="center-block"> <div>
<p>{{_('Documents are shared with everyone in this call. The supported file types are PDF and OpenDocument files.')}}</p> <p>{{_('Documents are shared with everyone in this call. The supported file types are PDF and OpenDocument files.')}}</p>
<p><button class="btn btn-lg btn-primary">{{_('Upload')}}</button></p> <p><button class="btn btn-lg btn-primary">{{_('Upload')}}</button></p>
<p>{{_('You can drag files here too.')}}</p> <p>{{_('You can drag files here too.')}}</p>

18
static/partials/youtubevideo.html

@ -3,32 +3,28 @@
<form class="container-fluid form" role="form"> <form class="container-fluid form" role="form">
<div class="welcome container-fluid" ng-show="!playbackActive && youtubeAPIReady"> <div class="welcome container-fluid" ng-show="!playbackActive && youtubeAPIReady">
<div class="welcome-logo fa fa-youtube"></div>
<h1>{{_('Share a YouTube video')}}</h1> <h1>{{_('Share a YouTube video')}}</h1>
<div class="welcome-container"> <div class="welcome-container">
<p> <p>{{_("Videos play simultaneously for everyone in this call.")}}</p>
<div>{{_("Videos are shared with everyone in this call.")}}</div> <div class="form-group welcome-input">
<div class="form-group welcome-input">
<input type="text" class="form-control input-lg" ng-model="youtubeurl" placeholder="{{_('YouTube URL')}}"> <input type="text" class="form-control input-lg" ng-model="youtubeurl" placeholder="{{_('YouTube URL')}}">
<div class="welcome-input-buttons"> <div class="welcome-input-buttons">
<button class="btn btn-primary" type="button" ng-disabled="!youtubeurl" ng-click="shareVideo(youtubeurl)">{{_("Share")}}</button> <button class="btn btn-primary" type="button" ng-disabled="!youtubeurl" ng-click="shareVideo(youtubeurl)">{{_("Share")}}</button>
</div> </div>
</div> </div>
</p>
</div> </div>
</div> </div>
<div class="welcome container-fluid" ng-show="!youtubeAPIReady"> <div class="welcome container-fluid" ng-show="!youtubeAPIReady">
<div class="welcome-logo fa fa-youtube"></div>
<h1>{{_('Share a YouTube video')}}</h1> <h1>{{_('Share a YouTube video')}}</h1>
<div class="welcome-container text-center"> <div class="welcome-container">
<p> <div>
<p>{{_("Could not load YouTube player API, please check your network / firewall settings.")}}</p> <p>{{_("Could not load YouTube player API, please check your network / firewall settings.")}}</p>
<p ng-if="currentVideoUrl">{{_('Currently playing')}}<br><a href="{{ currentVideoUrl }}" rel="external" target="_blank">{{ currentVideoUrl }}</a></p> <p ng-if="currentVideoUrl">{{_('Currently playing')}}<br><a href="{{ currentVideoUrl }}" rel="external" target="_blank">{{ currentVideoUrl }}</a></p>
<p class="form-group welcome-input"> <p class="form-group welcome-input">
<button class="btn btn-primary btn-lg" type="button" ng-click="loadYouTubeAPI()">{{_("Retry")}}</button> <button class="btn btn-primary btn-lg" type="button" ng-click="loadYouTubeAPI()">{{_("Retry")}}</button>
</p> </p>
</p> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save