fixes & forums started

This commit is contained in:
jomo
2013-08-02 07:55:32 +02:00
parent 45ebd0bd05
commit e052ad8859
39 changed files with 358 additions and 436 deletions

BIN
app/assets/images/bg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/assets/images/bg2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1015 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -1,6 +1,9 @@
$(function(){
$('[data-confirm]').click(function(){
var c = confirm($(this).attr('data-confirm'));
if (!c) return false;
})
$('#flash').delay(3000).fadeOut('slow');
})

View File

@@ -10,8 +10,5 @@
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
//
//= #require jquery
//= #require jquery_ujs
//= #require_tree .
//= require jquery
//= require confirm
//= require app

View File

@@ -17,6 +17,10 @@ and (min-width: 1000px)
overflow-y: scroll;
}
body {
background-image: url('/assets/bg.png');
}
a {
transition: color 0.25s;
color: $darkred;
@@ -25,67 +29,39 @@ and (min-width: 1000px)
color: #F00;
}
}
#notice {
background: #8e8;
#flash {
text-align: center;
padding: 10px;
border-bottom: 3px dashed #8d8;
font-weight: bold;
}
#alert {
background: #ebb;
text-align: center;
padding: 10px;
border-bottom: 3px dashed #fdd;
font-weight: bold;
position: fixed;
top: 0;
left: 0;
right: 0;
&.notice {
background: #8e8;
border-bottom: 3px dashed #8d8;
}
&.alert {
background: #ebb;
border-bottom: 3px dashed #fdd;
}
}
#head {
width: 100%;
height: 50px;
background: $lightgrey;
border-bottom: 10px solid $darkgrey;
vertical-align: middle;
font-weight: bold;
box-shadow: 0 0 2px;
z-index: 99;
position: relative;
width: 800px;
margin: -10px auto 20px auto;
padding: 20px 13px 13px 13px;
background-image: url('/assets/head_bg.png');
box-shadow: 0 0 10px -7px inset;
border-bottom: 1px solid #fff;
border-radius: 0 0 10px 10px;
overflow: hidden;
#logo {
margin: 9px;
margin-left: 20px;
height: 32px;
width: 32px;
float: left;
background: url('/assets/logo.png');
}
a {
color: $midgrey;
&:hover {
color: $darkred;
}
}
#menu {
margin: auto;
display: table;
ul {
float: left;
margin-top: 0;
li {
float: left;
height: 100%;
margin: auto 10px;
display: block;
font-size: 2.3em;
}
}
}
#userinfo {
float: right;
padding: 0 10px;
margin-top: 6px;
text-align: right;
&.logged-out {
margin-top: 2px;
}
margin-top: 14px;
img.avatar {
border: 1px solid #000;
border-radius: 16px;
@@ -103,6 +79,30 @@ and (min-width: 1000px)
line-height: 1em;
}
}
a {
color: $midgrey;
&:hover {
color: $darkred;
}
}
#menu {
width: 100%;
background: url('/assets/head_bg.png') #fff;
input {
display: inline;
}
ul {
float: left;
margin-top: 0;
li {
float: left;
height: 100%;
margin: auto 10px;
display: block;
font-size: 1.5em;
}
}
}
}
img.user-avatar {
border: 1px solid #000;
@@ -133,53 +133,50 @@ and (min-width: 1000px)
h1 {
font-weight: normal;
font-size: 400%;
font-size: 200%;
margin: 0;
color: #888;
text-shadow: 0 1px #999;
}
}
#posts {
#post {
margin-bottom: 50px;
#post-title {
margin-bottom: 10px;
h2 {
font-weight: normal;
color: #700;
text-transform: uppercase;
display: inline;
font-size: 250%;
}
.comment-counter {
float: right;
.post {
margin-bottom: 50px;
.post-title {
margin-bottom: 10px;
word-wrap: break-word;
h2 {
font-weight: normal;
color: #700;
text-transform: uppercase;
display: inline;
font-size: 200%;
}
.comment-counter {
float: right;
}
}
.post-info {
border-bottom: 2px dashed #999;
color: #888;
a {
color: #755;
&:hover{
color: #d55;
}
}
}
}
.post-info {
border-bottom: 2px dashed #999;
color: #888;
a {
color: #755;
&:hover{
color: #d55;
.post-content {
margin-top: 10px;
clear: both;
word-wrap: break-word;
overflow: hidden;
img {
max-width: 100%;
}
}
}
#post-content {
margin-top: 10px;
clear: both;
word-wrap: break-word;
overflow: hidden;
img {
max-width: 100%;
}
}
#comments {
margin: 50px 0 0 40px;
.comment {
@@ -350,8 +347,34 @@ and (min-width: 1000px)
width: 100%;
}
.clear {
clear: both;
display: block;
visibility: hidden;
}
#forum_groups {
.group {
margin: 10px 0;
.header {
background: #ddd;
border-radius: 5px 5px 0 0;
padding: 5px 10px;
border-bottom: 1px solid #ccc;
}
.forums {
border: 1px solid #ddd;
border-top: none;
border-bottom: none;
.forum {
display: block;
font-weight: bold;
padding: 5px 10px;
border-bottom: 1px solid #ddd;
}
}
}
}
}