Commit 8b9ecd93 by Brian Talbot

studio - reverting footer UI to existing

parent 6042f807
...@@ -50,27 +50,8 @@ h1 { ...@@ -50,27 +50,8 @@ h1 {
// ==================== // ====================
// layout - overall view
.wrapper-view {
min-height: 100%;
position: relative;
}
.wrapper-main {
background: $gray-l5;
margin: ($baseline*1.5) 0 0 0;
padding-bottom: $bottom-height;
}
.wrapper-bottom {
position: absolute;
bottom: 0;
height: $bottom-height;
}
// layout - basic page header // layout - basic page header
.wrapper-mast { .wrapper-mast {
margin: 0;
padding: 0 $baseline; padding: 0 $baseline;
position: relative; position: relative;
...@@ -81,7 +62,7 @@ h1 { ...@@ -81,7 +62,7 @@ h1 {
max-width: $fg-max-width; max-width: $fg-max-width;
min-width: $fg-min-width; min-width: $fg-min-width;
width: flex-grid(12); width: flex-grid(12);
margin: 0 auto $baseline auto; margin: ($baseline*1.5) auto $baseline auto;
color: $gray-d2; color: $gray-d2;
} }
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
// ==================== // ====================
.wrapper-footer { .wrapper-footer {
@include box-shadow(inset 0 1px 2px $shadow-d1);
position: relative; position: relative;
width: 100%; width: 100%;
margin: ($baseline*1.5) 0 $baseline 0;
padding: $baseline; padding: $baseline;
background: $gray-l4;
footer.primary { footer.primary {
@include clearfix(); @include clearfix();
...@@ -15,6 +14,8 @@ ...@@ -15,6 +14,8 @@
min-width: $fg-min-width; min-width: $fg-min-width;
width: flex-grid(12); width: flex-grid(12);
margin: 0 auto; margin: 0 auto;
border-top: 1px solid $gray-l4;
padding: $baseline 0 0 0;
color: $gray-l1; color: $gray-l1;
.colophon { .colophon {
......
...@@ -51,21 +51,15 @@ ...@@ -51,21 +51,15 @@
document.location.protocol + '//www.youtube.com/player_api">\x3C/script>'); document.location.protocol + '//www.youtube.com/player_api">\x3C/script>');
</script> </script>
<div class="wrapper-view wrapper"> <%include file="widgets/header.html" />
<%include file="widgets/header.html" />
<%block name="content"></%block>
<div class="wrapper-main wrapper">
<%block name="content"></%block> % if user.is_authenticated():
% if user.is_authenticated(): <%include file="widgets/sock.html" />
<%include file="widgets/sock.html" /> % endif
% endif
</div> <%include file="widgets/footer.html" />
<div class="wrapper-bottom wrapper">
<%include file="widgets/footer.html" />
</div>
</div>
<%include file="widgets/tender.html" /> <%include file="widgets/tender.html" />
<%block name="jsextra"></%block> <%block name="jsextra"></%block>
</body> </body>
......
...@@ -106,20 +106,6 @@ ...@@ -106,20 +106,6 @@
</%block> </%block>
<%block name="content"> <%block name="content">
<div class="edit-subsection-publish-settings">
<div class="settings">
<h3>Section Release Date</h3>
<div class="picker datepair">
<input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
<input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
<div class="description">
<p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students. Any units marked private will only be visible to admins.</p>
</div>
</div>
<a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
</div>
</div>
<div class="wrapper-mast wrapper"> <div class="wrapper-mast wrapper">
<header class="mast has-actions has-subtitle"> <header class="mast has-actions has-subtitle">
<div class="title"> <div class="title">
...@@ -219,4 +205,18 @@ ...@@ -219,4 +205,18 @@
</div> </div>
</div> </div>
<footer></footer> <footer></footer>
<div class="edit-subsection-publish-settings">
<div class="settings">
<h3>Section Release Date</h3>
<div class="picker datepair">
<input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
<input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
<div class="description">
<p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students. Any units marked private will only be visible to admins.</p>
</div>
</div>
<a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
</div>
</div>
</%block> </%block>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment