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 branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Kyle Drake 2014-10-27 19:08:10 -07:00
commit 6122a188b6
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@
.site-url { .site-url {
font-size:18px; font-size:18px;
margin-bottom: 8px; margin-bottom: 8px;
word-wrap: break-word;
} }
.site-url a { .site-url a {
color: #e93250; color: #e93250;
@ -377,7 +378,6 @@
position: relative; position: relative;
clear: both; clear: both;
width: 100%; width: 100%;
overflow: hidden;
} }
.col-left { .col-left {
float: left; float: left;
@ -401,7 +401,6 @@
margin-top: 0; margin-top: 0;
} }
.right-col .col-left { .right-col .col-left {
background-color: white;
right: 33%; right: 33%;
} }
.content.misc-page.columns .col, .site-profile-padding { .content.misc-page.columns .col, .site-profile-padding {
@ -411,13 +410,19 @@
.content.misc-page.columns .col-66 { .content.misc-page.columns .col-66 {
width: 67%; width: 67%;
left: 33%; left: 33%;
background: white;
} }
.site-profile .content.misc-page.columns .col-66 { .site-profile .content.misc-page.columns .col-66 {
padding: 0; padding: 0;
min-height: 38em;
}
.news-feed .content.misc-page.columns .col-66 {
min-height: 56em;
} }
.content.misc-page.columns .col-33 { .content.misc-page.columns .col-33 {
width: 33%; width: 33%;
left: 33%; left: 33%;
float: right;
} }
.interior .header-Outro.with-columns { .interior .header-Outro.with-columns {
padding-top: 22px; padding-top: 22px;
@ -498,11 +503,11 @@
margin-top: .2em; margin-top: .2em;
margin-bottom: -.2em; margin-bottom: -.2em;
} }
a.tag { a.tag, a.tag:visited {
font-size: .7em; font-size: .7em;
text-transform: uppercase; text-transform: uppercase;
background: #FFFFCC; background: #FFFFCC;
color: #C1A009; color: #C1A009!important;
float: left; float: left;
padding: 1px 5px; padding: 1px 5px;
-moz-box-shadow: 1px 1px 1px 0px rgba(0,0,0,0.2); -moz-box-shadow: 1px 1px 1px 0px rgba(0,0,0,0.2);
@ -807,10 +812,9 @@ a.tag:hover {
} }
.post-comment { .post-comment {
background: #DAEEA5; background: #DAEEA5;
float: left;
width: 100%; width: 100%;
padding: 20px 0 10px 30px; padding: 20px 0 15px 30px;
margin: 0 0 28px 0; margin: 0 0 3px 0;
} }
.post-comment input { .post-comment input {
width: 84%; width: 84%;

4
views/home.erb
View file

@ -19,12 +19,10 @@
</div> </div>
</div> </div>
<div class="container"> <div class="container news-feed">
<div class="content misc-page columns right-col"> <div class="content misc-page columns right-col">
<div class="col-left"> <div class="col-left">
<div class="col col-66"> <div class="col col-66">
<% if site.followings_dataset.count == 0 %> <% if site.followings_dataset.count == 0 %>
<div class="welcome"> <div class="welcome">
<h4>Welcome to your Neocities news feed!</h4> <h4>Welcome to your Neocities news feed!</h4>