styling fixes for centerContent

This commit is contained in:
Connor Turland 2016-12-12 17:55:42 -05:00
parent 3228a890a4
commit ce9a7dae9e
9 changed files with 69 additions and 39 deletions

View file

@ -1,8 +1,8 @@
.centerContent { .centerContent {
position: relative; position: relative;
margin: 92px auto 0 auto; margin: 0 auto;
padding: 20px 0 60px 20px; width: auto;
width: 760px; max-width: 960px;
overflow: hidden; overflow: hidden;
box-shadow: 0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24); box-shadow: 0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24);
background: #fff; background: #fff;
@ -10,7 +10,7 @@
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
margin-bottom: 10px; box-sizing: border-box;
padding: 15px; padding: 15px;
} }
@ -130,10 +130,8 @@
border-radius: 2px; border-radius: 2px;
} }
.back-to-mapping { .centerContent.withPadding {
margin: 1em auto; margin-top: 1em;
width: auto; margin-bottom: 1em;
max-width: 960px;
box-sizing: border-box;
} }

View file

@ -28,6 +28,8 @@
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
box-sizing: border-box;
padding-top: 92px;
} }
/*.animations { /*.animations {

View file

@ -2,7 +2,7 @@
display: none; display: none;
} }
@media only screen and (max-width : 720px) and (min-width : 504px) { @media only screen and (max-width : 752px) and (min-width : 504px) {
.sidebarSearch .tt-hint, .sidebarSearch .sidebarSearchField { .sidebarSearch .tt-hint, .sidebarSearch .sidebarSearchField {
width: 160px !important; width: 160px !important;
} }
@ -57,7 +57,7 @@
} }
#yield { #yield {
height: 100%; padding-top: 50px;
} }
.new_session, .new_user, .edit_user, .login, .forgotPassword { .new_session, .new_user, .edit_user, .login, .forgotPassword {
@ -66,7 +66,7 @@
left: auto; left: auto;
width: 78%; width: 78%;
padding: 16px 10%; padding: 16px 10%;
margin: 50px auto 0 auto; margin: 0 auto;
} }
.centerGreyForm input[type="text"], .centerGreyForm input[type="email"], .centerGreyForm input[type="password"] { .centerGreyForm input[type="text"], .centerGreyForm input[type="email"], .centerGreyForm input[type="password"] {

View file

@ -22,11 +22,12 @@ $unread_notifications_dot_size: 8px;
.notificationPage, .notificationPage,
.notificationsPage { .notificationsPage {
width: auto;
max-width: 960px;
box-sizing: border-box;
font-family: 'din-regular', Sans-Serif; font-family: 'din-regular', Sans-Serif;
& a:hover {
text-decoration: none;
}
& > .notification-title { & > .notification-title {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding-bottom: 0.25em; padding-bottom: 0.25em;
@ -38,34 +39,62 @@ $unread_notifications_dot_size: 8px;
} }
} }
.notificationsPage {
.notificationsPage .notification { header {
.notification-subject { margin-bottom: 0;
width: 25%;
}
.notification-body {
width: 50%;
}
.notification-read-unread {
width: 10%;
} }
.notification-body, .notification:first-child {
.notification-subject, border-top: none;
.notification-read-unread { }
display: inline-block; .notification:last-child {
vertical-align: top; border-bottom: 1px solid #DCDCDC;
} }
&.unread { .notification {
.notification-body, padding: 10px;
.notification-subject, border:1px solid #DCDCDC;
border-bottom: none;
&:hover {
background: #F6F6F6;
}
& > a {
float: left;
width: 85%;
box-sizing: border-box;
padding-right: 10px;
}
.notification-read-unread { .notification-read-unread {
font-family: 'din-medium', Sans-Serif; float: left;
width: 15%;
}
.notification-body,
.notification-subject {
display: inline-block;
vertical-align: top;
}
.notification-body {
margin-left: 15px;
}
&.unread {
.notification-body,
.notification-subject,
.notification-read-unread {
font-family: 'din-medium', Sans-Serif;
}
} }
} }
} }
.notificationPage .notification-body { .notificationPage .notification-body {
p, div { p, div {
margin: 1em auto; margin: 1em auto;

View file

@ -33,5 +33,6 @@
<% end %> <% end %>
</main> </main>
</div> </div>
<%= render partial: 'shared/back_to_mapping' %>
</div> </div>
<%= render 'script' %> <%= render 'script' %>

View file

@ -50,7 +50,6 @@
<% end %> <% end %>
</p> </p>
<div id="loading"></div> <div id="loading"></div>
<%= render partial: 'shared/back_to_mapping' %>
</div> </div>
<% end %> <% end %>

View file

@ -25,6 +25,7 @@
<%= link_to 'mark as read', mark_read_notification_path(notification.id), remote: true, method: :put %> <%= link_to 'mark as read', mark_read_notification_path(notification.id), remote: true, method: :put %>
<% end %> <% end %>
</div> </div>
<div class="clearfloat"></div>
</li> </li>
<% end %> <% end %>
<% if @notifications.count == 0 %> <% if @notifications.count == 0 %>
@ -34,7 +35,7 @@
</div> </div>
<% if @notifications.total_pages > 1 %> <% if @notifications.total_pages > 1 %>
<div class="centerContent pagination"> <div class="centerContent withPadding pagination">
<%= paginate @notifications %> <%= paginate @notifications %>
</div> </div>
<% end %> <% end %>

View file

@ -9,8 +9,8 @@
</div> </div>
</div> </div>
<div class="centerContent back"> <div class="centerContent withPadding back">
<%= link_to 'Back', notifications_path %> <%= link_to 'Back to notifications', notifications_path %>
</div> </div>
<%= render partial: 'shared/back_to_mapping' %> <%= render partial: 'shared/back_to_mapping' %>

View file

@ -1,3 +1,3 @@
<div class="centerContent back-to-mapping"> <div class="centerContent withPadding back-to-mapping">
<a href="/">Back to mapping</a> <a href="/">Back to mapping</a>
</div> </div>