zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2015-04-29 18:18:07 -07:00
commit 6a8fa080eb
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sass/_project-sass/_project-Base.scss
View file

@ -59,7 +59,7 @@ a{
@import 'project-Main'; // Project Specific Main Content Area Styling @import 'project-Main'; // Project Specific Main Content Area Styling
@import 'project-Footer'; // Project Specific Footer Styling @import 'project-Footer'; // Project Specific Footer Styling
.alert{ .alert-error {
background-color:#F5BA00; color:#fff; background-color:#F5BA00; color:#fff;
} }

6
sass/_project-sass/_project-Header.scss
View file

@ -89,7 +89,11 @@
img { img {
@include vendor(transform, scaleX(-1)); @include vendor(transform, scaleX(-1));
width: 100px; width: 100px;
margin-right: 20px; margin-right: 25px;
&.float-Right {
margin-left: 10px;
}
} }
.intro-text { .intro-text {
font-size: 1.1em; font-size: 1.1em;

2
views/_header_links.erb
View file

@ -1,4 +1,4 @@
<% if request.path == '/' && !signed_in? %> <% if (request.path == '/' && !signed_in?) || request.path == '/education' %>
<li> <li>
<a href="/">Neocities</a> <a href="/">Neocities</a>
</li> </li>

10
views/education.erb
View file

@ -75,12 +75,10 @@
</nav> </nav>
<% if flash.keys.length > 0 %> <% if flash.keys.length > 0 %>
<div class="alert txt-Center"> <div class="alert alert-block txt-Center">
<p style="padding:5px"> <% flash.keys.each do |key| %>
<% flash.keys.each do |key| %> <%== flash[key] %>
<%== flash[key] %> <% end %>
<% end %>
</p>
</div> </div>
<% end %> <% end %>

10
views/index.erb
View file

@ -75,12 +75,10 @@
</nav> </nav>
<% if flash.keys.length > 0 %> <% if flash.keys.length > 0 %>
<div class="alert txt-Center"> <div class="alert alert-block txt-Center">
<p style="padding:5px"> <% flash.keys.each do |key| %>
<% flash.keys.each do |key| %> <%== flash[key] %>
<%== flash[key] %> <% end %>
<% end %>
</p>
</div> </div>
<% end %> <% end %>