zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge violasong changes

Browse source
This commit is contained in:
Kyle Drake 2014-10-27 14:29:31 -07:00
commit d47d52b6f8
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sass/_project-sass/_project-Main.scss
View file

@ -55,16 +55,18 @@
padding-right: 6%;
}
.content.misc-page {
background: #FFFFFF;
background: #FAF6F1;
-moz-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
-webkit-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
padding: 1px 3% 40px 3%;
padding: 1px 3% 40px 3%;
h1, h2, h3, h4, h5, h6 {
margin-top: 1em;
}
}
.content.misc-page {
h3, h4, h5, h6 {
margin-top: 1em;
}
.content.single-Col.misc-page {
background: #FFFFFF;
}
.content.misc-page h2 {
font-size: 1.6em;
@ -77,7 +79,7 @@
font-size: 1em;
}
.content.misc-page h1 {
font-size: 2.2em;
font-size: 2em;
margin-bottom: 20px;
}
.content.misc-page hr {
@ -160,6 +162,13 @@
float: left;
font-weight:bold;
margin-top: 4px;
a {
color: white;
}
.fa-angle-right {
font-size: 1.3em;
margin: 0 .2em 0 .2em;
}
}
.files .actions {
float: right;
@ -292,7 +301,7 @@
display: block;
padding-top: 35px;
font-size: 14px;
color: #bbb;
color: #C0C0C0;
font-weight: bold;
margin-left: auto;
margin-right: auto;
@ -311,8 +320,8 @@
display: block;
margin-left: 5px;
}
.overlay i {
font-weight: bold;
.overlay .fa-trash {
vertical-align: 1px;
}
.overlay {
position:absolute;

12
views/dashboard.erb
View file

@ -92,7 +92,7 @@
<% dir_array = @dir.split '/' %>
<% dir_array.each_with_index do |dir,i| %>
<% if i+1 < dir_array.length %>
<a href="/dashboard?dir=<%= Rack::Utils.escape dir %>"><%= dir %></a> /
<a href="/dashboard?dir=<%= Rack::Utils.escape dir %>"><%= dir %></a> <i class="fa fa-angle-right"></i>
<% else %>
<%= dir %>
<% end %>
@ -143,15 +143,19 @@
</a>
<div class="overlay">
<% if file[:is_editable] %>
<a href="/site_files/text_editor<%= file[:path] %>"><i class="fa fa-edit" title="Edit"> Edit</i></a>
<a href="/site_files/text_editor<%= file[:path] %>"><i class="fa fa-edit" title="Edit"></i> Edit</a>
<% end %>
<% if file[:is_directory] %>
<a href="?dir=<%= Rack::Utils.escape file[:path] %>"><i class="fa fa-edit" title="Manage"> Manage</i></a>
<a href="?dir=<%= Rack::Utils.escape file[:path] %>"><i class="fa fa-edit" title="Manage"></i> Manage</a>
<% end %>
<% if !file[:is_root_index] %>
<a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="fa fa-trash" title="Delete"> Delete</i></a>
<a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="fa fa-trash" title="Delete"></i> Delete</a>
<% end %>
<% if file[:is_directory] %>
<a class="link-overlay" href="?dir=<%= Rack::Utils.escape file[:path] %>" title="View <%= file[:path] %>"></a>
<% else %>
<a class="link-overlay" href="http://<%= current_site.username %>.neocities.org<%= file[:path] %>" title="View <%= file[:path] %>" target="_blank"></a>
<% end %>
</div>
</div>
<% end %>