bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

design-tests1

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-06 00:33:12 +02:00
parent 9c316f165c
commit 12f426235f
6 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
app/assets/stylesheets/application.css.scss
View File

@@ -15,45 +15,65 @@
*/
// Colorshema #0A64A4
$bodyBackground: #FFFFFF;
$navbarBackground: #FFCE40;
$navbarBackgroundHighlight:#FFDB73;
$navbarLinkBackgroundHover:#FFBE00;
$infoBackground:#65A5D1;
$infoText:#03406A;
$linkColor: #03006E;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';
h1
{font-size: 23px}
h2
{font-size: 19px}
body,html
{padding:0;margin:0;}
div.header
{display: block;
background: url('/assets/fet_logo_2.png') rgb(235,235,235) no-repeat;
background-position:15px center;
border-bottom:1px solid black;
height:60px;
padding-left:160px;
padding-top:0px;
overflow:hidden;
margin-bottom: 20px
h1 {
font-size: 23px
}
#menudiv
{
width:100%;
h2 {
font-size: 19px
}
body,html {
padding:0;
margin:0;
}
a:hover {
text-decoration:none;
}
div.header {
display: block;
background: url('/assets/fet_logo_2.png') no-repeat;
background-color: #0A64A4;
background-position:15px center;
border-bottom:1px solid black;
height:60px;
color:#CFCFCF;
padding-left:160px;
padding-top:0px;
overflow:hidden;
margin-bottom: 20px
}
#menudiv {
width:100%;
}
.navbar .nav li {
min-width:60%;
min-width:60%;
}
.navbar .nav .divider {
border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
}
#contentdiv{
background: #FFFFFF
}

8
app/assets/stylesheets/neuigkeiten.css.scss
View File

@@ -1,3 +1,11 @@
// Place all the styles related to the neuigkeiten controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
div .neuigkeit_block {
border: 1px solid #ccc;
background: white;
padding:10px;
}

2
app/assets/stylesheets/scaffolds.css.scss
View File

@@ -1,6 +1,4 @@
body {
background-color: #fff;
color: #333;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px;

4
app/views/layouts/application.html.erb
View File

@@ -15,7 +15,7 @@
</head>
<body>
<div class="container-fluid">
<div id="maincontainer" class="container-fluid">
<div class="row-fluid">
<div class="header">
<h1 style="display:block;float:none">Fachschaft Elektrotechnik</h1>
@@ -24,7 +24,7 @@
<div class="row-fluid">
<div class="span2 earlymax">
<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
</div> <div class="span10 earlymax">
</div> <div class="span10 earlymax" id="contentdiv">
<%= yield %>
</div>

2
app/views/layouts/menu.html.erb
View File

@@ -1,7 +1,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="#"><%= t 'home.mtitle'%></a>
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>

25
app/views/neuigkeiten/_neuigkeit.html.erb
View File

@@ -1,15 +1,18 @@
<%= link_to [neuigkeit.rubrik,neuigkeit] do %>
<div class="media">
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %></p>
</div>
<div class="media-body"><div><small><%= neuigkeit.rubrik.name %></small>
<small class="pull-right"><%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small> </div>
<h1><%= neuigkeit.title%></h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
<p></p>
</div>
<div class="media neuigkeit_block">
<div class="pull-left" href="#">
<p><br><%= image_tag neuigkeit.picture.thumb.url unless neuigkeit.picture.url.nil? %>
</p>
</div>
<div class="media-body">
<div>
<small><%= neuigkeit.rubrik.name %></small>
<small class="pull-right"><%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small>
</div>
<h1><%= neuigkeit.title%></h1>
<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
</div>
</div>
<br>
<% end %>