Merge branch 'dashboard_list'

This commit is contained in:
Kyle Drake 2015-07-17 13:14:54 -07:00
commit 78dcd83191
2 changed files with 14 additions and 4 deletions

View file

@ -492,7 +492,7 @@
.html-thumbnail.misc.fileimagehover .overlay {
margin: 1px 0 0 2px;
}
.files .list.list-view {
@mixin dashboard-list-view {
padding: 0;
.upload-Boundary {
@ -588,6 +588,14 @@
}
}
}
@media (max-device-width:480px), screen and (max-width:800px) {
.files .list {
@include dashboard-list-view;
}
}
.files .list.list-view {
@include dashboard-list-view;
}
.site-actions {
float: left;
margin-top: 20px;

View file

@ -74,9 +74,11 @@
</optgroup>
</select>
</div>
<a id="saveButton" class="btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><i class="fa fa-save"></i>Save</a>
<a class="btn-Action" href="<%= current_site.uri %>/<%= @filename %>" target="_blank">View</a>
<a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'>Share</a>
<a id="saveButton" class="btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><span class="hide-on-mobile"><i class="fa fa-save"></i></span>Save</a>
<div class="hide-on-mobile">
<a class="btn-Action" href="<%= current_site.uri %>/<%= @filename %>" target="_blank">View</a>
<a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site, page_uri: "#{current_site.uri}/#{@filename}"} %>'>Share</a>
</div>
<!-- <a id="saveAndExitButton" class="btn-Action" href="#" onclick="saveTextFile(true); return false" style="opacity: 0.5"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Exit</a> -->
<div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 12.5em;">
<div class="tooltip-arrow"></div>