andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/andreassteph/fetsite

Browse Source
This commit is contained in:
Thomas Blazek
2013-11-04 15:35:53 +01:00
parent f739d1ced7 f46bae52dc
commit 47c58827c8
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,8 +18,8 @@
*/ */
// Colorshema #0A64A4 // Colorshema #0A64A4
$color_prim: #0A64A4; $color_prim: #0A64A4;
$color_prim_light: 0B65A5; $color_prim_light: #0B65A5;
$color_prim_vlight: 2B85C5; $color_prim_vlight: #2B85C5;
$color_cont: FFDB73; $color_cont: FFDB73;
$color_cont_light:FFDB73; $color_cont_light:FFDB73;
$linkColor: #03006E; $linkColor: #03006E;
@@ -27,13 +27,13 @@ $white: #FFFFFF;
$bodyBackground: $white; $bodyBackground: $white;
$navbarBackground: $color_cont; $navbarBackground: $color_cont;
$navbarBackground: #EEEEEE; $navbarBackground: #FFFFFF;
$navbarBackgroundHighlight:lighten($navbarBackground,30%); $navbarBackgroundHighlight:lighten($navbarBackground,30%);
//$navbarBackgroundHighlight:#FFFFFF; //$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00; $navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: lighten(#CCCCCC,30%); $navbarLinkBackgroundHover: lighten(#cccccc,10%);
$infoBackground:#65A5D1; $infoBackground:#65A5D1;
$infoText:#03406A; $infoText:#03406A;
$sansFontFamily: Helvetica, Arial; $sansFontFamily: Helvetica, Arial;
@@ -65,7 +65,7 @@ div.header {
background-color: #0A64A4; background-color: #0A64A4;
background-position:15px center; background-position:15px center;
border-bottom:1px solid black; border-bottom:1px solid black;
height:72px; height:41px;
color:#C0C0C0; color:#C0C0C0;
padding-left:87px; padding-left:87px;
padding-top:0px; padding-top:0px;
@@ -75,7 +75,7 @@ div.header {
div.header h1 { div.header h1 {
padding:0; padding:0;
margin:4px; margin:4px;
font-size:23px; font-size:20px;
line-height:32px; line-height:32px;
} }
#menudiv { #menudiv {

6
app/views/fetprofiles/show.html.erb
View File

@@ -13,7 +13,7 @@
<%= @fetprofile.desc %> <%= @fetprofile.desc %>
</p> </p>
<p> <p>
<%= link_to 'Destroy', @fetprofile, method: :delete, data: { confirm: 'Are you sure?' } %>
</p> </p>
</div> </div>
</div> </div>
@@ -24,8 +24,8 @@
<% @fetprofile.memberships.each do |m| %> <% @fetprofile.memberships.each do |m| %>
<li> <li>
<%= render m %> <%= render m %>
<%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"]%> <%= link_to 'edit', edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:delete, m)%>
<%= link_to 'delete', [@fetprofile, m], method: :delete, data: {confirm: 'Sure?'} if params["verwalten"] %> <%= link_to 'delete', [@fetprofile, m], method: :delete, data: {confirm: 'Sure to delete?'} if params["verwalten"] && can?(:delete, m ) %>
</li> </li>
<% end %> <% end %>
</ul> </ul>

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

@@ -18,7 +18,7 @@
<div id="maincontainer" class="container-fluid"> <div id="maincontainer" class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="header"> <div class="header">
<h1 style="display:block">Fachschaft<br> Elektrotechnik</h1> <h1 style="display:block">Fachschaft Elektrotechnik</h1>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">