seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Brian Smith 2013-12-08 22:32:02 -05:00
parent 833eb45379 1b77065826
commit 6b4e42dfc5
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
web/app/assets/stylesheets/client/createSession.css.scss
View File

@ -1,5 +1,20 @@
.create-session {
.content {
.content-head {
position:absolute;
z-index:1;
padding: 4px 0;
width:100%;
.content-icon {
margin-left:4px;
}
}
}
}
.session-wrapper {
padding: 0 35px;
padding: 29px 35px 10px;
white-space: initial;
> div.session {

11
web/app/views/clients/_createSession.html.erb
View File

@ -1,5 +1,5 @@
<!-- Create Session Screen -->
<div layout="screen" layout-id="createSession" class="screen secondary">
<div layout="screen" layout-id="createSession" class="screen secondary create-session">
<div class="content">
<div class="content-head">
<div class="content-icon">
@ -10,8 +10,8 @@
<%= render "screen_navigation" %>
</div>
<form id="create-session-form">
<div class="content-scroller">
<div class="content-scroller">
<form id="create-session-form">
<div class="content-wrapper">
<!-- left column -->
<div class="session-wrapper">
@ -159,10 +159,11 @@
</div>
</div>
</div>
<div class="clearall"></div>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
</div>