Browse Source

Improved welcome screen styles.

pull/156/head
Simon Eisenmann 11 years ago
parent
commit
d35e759e4c
  1. 15
      src/styles/global/_pages.scss
  2. 2
      static/css/main.min.css
  3. 4
      static/partials/page/welcome.html

15
src/styles/global/_pages.scss

@ -35,15 +35,17 @@ @@ -35,15 +35,17 @@
text-shadow: 0 0 5px black;
max-width:600px;
min-height: 160px;
padding-left:160px;
padding-left:100px;
padding-right: 0px;
position: relative;
@include breakpt($breakpoint-medium) {
padding-left:0px;
margin: 0 10px;
padding-left:10px;
padding-right:20px;
margin: 0 auto;
}
h1 {
margin-top: 0px;
white-space: nowrap;
@include breakpt($breakpoint-medium) {
white-space: normal;
@ -51,24 +53,23 @@ @@ -51,24 +53,23 @@
}
.welcome-container {
max-width: 450px;
margin: 0 auto;
}
.welcome-logo {
position: absolute;
left: 0px;
top: 20px;
top: 1px;
bottom: 0px;
width: 140px;
width: 80px;
background: $scalable-logo no-repeat left top;
background-size: contain;
@include breakpt($breakpoint-medium) {
position: relative;
margin: 0 auto;
height: 70px;
width: 70px;
margin-top: 30px;
margin-bottom: 20px;
}
}

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

4
static/partials/page/welcome.html

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
<button class="btn btn-success btn-roomcreate" title="{{_('Enter room')}}" type="button" ng-disabled="!roomdata.link" ng-click="joinRoomByName(roomdata.name)"><i class="fa fa-sign-in"></i></button>
</div>
</div>
<p class="room-link small"><span ng-show="roomdata.name"><i class="fa fa-link" title="{{_('Room link')}}"></i> <a href="{{roomdata.link}}" ng-click="joinRoomByName(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></span></p>
<p class="room-link small" ng-show="roomdata.name"><span><i class="fa fa-link" title="{{_('Room link')}}"></i> <a href="{{roomdata.link}}" ng-click="joinRoomByName(roomdata.name);$event.preventDefault()">{{roomdata.link}}</a></span></p>
<div ng-hide="canCreateRooms()">
<p class="h4">{{_("Enter the name of an existing room. Please sign in to create a room.")}}</p>
<p class="h4">{{_("Enter the name of an existing room. You can create your own rooms when you sign in.")}}</p>
<button ng-if="!myuserid && usersettings.loginUserid" type="button" class="btn btn-primary" ng-click="usersettings.loginUserid()">{{_('Sign in')}}</button>
</div>
<p class="rooms-history" ng-show="roomsHistory.length">

Loading…
Cancel
Save