theme_anpassung

This commit is contained in:
Andreas Stephanides
2014-01-15 13:47:35 +01:00
parent b86d3aca23
commit 9e26c49f0e
11 changed files with 83 additions and 125 deletions

View File

@@ -62,7 +62,7 @@ a:hover {
div.header { div.header {
display: block; display: block;
background: url('/header1.png') no-repeat; // background: url('/header1.png') no-repeat;
background-color: #FFF; background-color: #FFF;
background-position: right; background-position: right;
border-bottom:1px solid black; border-bottom:1px solid black;

View File

@@ -1,25 +1,31 @@
ul.linkbox-list
{
max-width:70em;
}
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
// Colorshema #0A64A4 }
$color_prim: #0A64A4;
$color_prim_light: #0B65A5;
$color_prim_vlight: #2B85C5;
$color_cont: FFDB73;
$color_cont_light:FFDB73;
$linkColor: #03006E;
$white: #FFFFFF;
$bodyBackground: $white; a.linkbox:hover
$navbarBackground: $color_cont; {
$navbarBackground: #FFFFFF; box-shadow: 1px 1px 2px 2px lightgray;
}
$navbarBackgroundHighlight:lighten($navbarBackground,30%); a.linkbox li
//$navbarBackgroundHighlight:#FFFFFF; {
}
ul.linkbox-list li
{
margin-bottom:10px;
}
$navbarLinkBackgroundHover:#FFBE00; div.contentbox
$navbarLinkBackgroundHover: lighten(#cccccc,10%); {
$infoBackground:#65A5D1; margin: 5px;
$infoText:#03406A; }
$sansFontFamily: Helvetica, Arial;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';

View File

@@ -28,15 +28,21 @@ $color_cont_light:FFDB73;
$linkColor: $color_prim_vdark; $linkColor: $color_prim_vdark;
$white: #FFFFFF; $white: #FFFFFF;
$bodyBackground: $white; $bodyBackground: #EEE;
$navbarBackground: $color_prim;
$navbarText: black;$navbarLinkColor: black;
$navbarBackground: $color_prim;
$navbarText: black;
$navbarLinkColor: black;
$navbarLinkColorHover: black;
$dropdownLinkColor: black;
$navbarBackgroundHighlight: $color_prim; $navbarBackgroundHighlight: $color_prim;
//$navbarBackgroundHighlight:#FFFFFF; //$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00; $navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: darken($navbarBackground,10%); $navbarLinkBackgroundHover: darken($navbarBackground,10%);
$infoBackground:#65A5D1; $infoBackground:#65A5D1;
$infoText:#03406A; $infoText:#03406A;
$sansFontFamily: Helvetica, Arial; $sansFontFamily: Helvetica, Arial;
@@ -110,91 +116,31 @@ min-height:0;
} }
#contentdiv #contentdiv
{ {
background: #FFFFFF //background: #FFFFFF
} }
#contentdiv .container-fluid #contentdiv .container-fluid
{ { padding:0;
padding:0;
} }
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius: 10px;
border: lightgray solid 1px;
}
a.linkbox:hover
{
box-shadow: 1px 1px 2px 2px lightgray;
}
a.linkbox li
{
}
ul.linkbox-list li
{
margin-bottom:10px;
}
ul.linkbox-list
{
max-width:70em;
}
div.contentbox
{
margin: 5px;
}
table.calendar tr td
{
width:14.28%;
height:2em;
position:relative;
padding:0
}
table.calendar tr td.day div
{
display:block;
position:absolute;
padding:2px;
}
table.calendar tr td.day div div
{
display:none;
position:relative;
}
table.calendar tr td.day.events
{ color:blue
}
table.calendar tr td.day div:hover div
{
display:block;
z-index: 10000;
background:none;
border: none;
}
table.calendar tr td.day div:hover
{
background:white;
border: solid black 1px;
z-index:9999;
}
table.calendar tr td.day div:hover div
{
}
table.calendar tr td.day div div.day_number
{
display:block;
}
.navbar .nav li { .navbar .nav li {
min-width:0; min-width:0;
background:44F;
} }
div.content-wrap {
margin-left:auto;
margin-right:auto;
//max-width:70em;
}
div.content-column {
max-width:70em;
}
$box-border: lightgray solid 1px;
$box-border-radius:8px;
$box-background: white;
@import 'layout'

View File

@@ -1,6 +1,6 @@
<%= render 'fetprofiles/tabs' %> <%= render 'fetprofiles/tabs' %>
<div class="content-wrap content-column">
<h1> <h1>
<%= I18n.t 'profile.all_members' if params[:filter] == "all" %> <%= I18n.t 'profile.all_members' if params[:filter] == "all" %>
<%= I18n.t 'profile.active_members' if params[:filter].nil? || params[:filter]== "active" <%= I18n.t 'profile.active_members' if params[:filter].nil? || params[:filter]== "active"
@@ -43,7 +43,7 @@
<div class="span12"> <div class="span12">
<%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %> <%= link_to I18n.t('fetprofiles.new'), new_fetprofile_path %>
</div> </div>
</div> </div></div>
</div> </div>

View File

@@ -1,4 +1,5 @@
<%= render 'fetprofiles/tabs' %> <%= render 'fetprofiles/tabs' %>
<div class="content-wrap content-column">
<h1>Alle Gremien</h1> <h1>Alle Gremien</h1>
<% unless params[:filter].nil? %> <% unless params[:filter].nil? %>
@@ -16,3 +17,4 @@
</li> </li>
<% end %> <% end %>
</ul> </ul>
</div>

View File

@@ -1,5 +1,6 @@
<%= render 'fetprofiles/tabs' %> <%= render 'fetprofiles/tabs' %>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div class="content-wrap content-column">
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<h1> <h1>
@@ -33,6 +34,7 @@
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
</div>
</div> </div>
<%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) %> <%= link_to I18n.t('common.edit'), edit_gremium_path(@gremium) %>

View File

@@ -1,6 +1,6 @@
<%= render 'tabs' %> <%= render 'tabs' %>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div class="content-wrap">
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
@@ -23,6 +23,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>

View File

@@ -1,8 +1,10 @@
<%= render 'tabs' %> <%= render 'tabs' %>
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div class="content-wrap">
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<h1><%= @rubrik.name %></h1> <h1><%= @rubrik.name %></h1>
<p> <p>
<%= @rubrik.desc %> <%= @rubrik.desc %>
@@ -34,8 +36,9 @@
</div> </div>
</div> </div>
<br> <br>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div> </div>
</div>

View File

@@ -1,20 +1,16 @@
<div class="container-fluid"> <div class="container-fluid">
<%= render 'studien/tabs' %> <%= render 'studien/tabs' %>
<div class="row-fluid"> <div class="row-fluid">
<div class="content-wrap content-column">
<h1><%= I18n.t("studien.list") %></h1> <h1><%= I18n.t("studien.list") %></h1>
<ul class="unstyled linkbox-list">
<ul class="unstyled linkbox-list">
<% @studien.each do |studium|%> <% @studien.each do |studium|%>
<li> <li>
<%= render studium%> <%= render studium%>
</li> </li>
<% end %> <% end %>
</ul> </ul>
<br> <br>
</div> <%= render :partial=>'layouts/pretty_toolbar'%>
</div> </div>
<%= render :partial=>'layouts/pretty_toolbar'%>
</div> </div>

View File

@@ -1,3 +1,4 @@
<div class="content-wrap content-column">
<ul class="unstyled linkbox-list"> <ul class="unstyled linkbox-list">
<li> <li>
<% @themengruppen.each do |themengruppe| %> <% @themengruppen.each do |themengruppe| %>
@@ -20,7 +21,7 @@
</ul> </ul>
<br/> <br/>
</div>
<script class="hidden-phone"> <script class="hidden-phone">
<!-- make_equal_height(); <!-- make_equal_height();

View File

@@ -12,6 +12,7 @@
<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %> <li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
</li> </li>
<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li> <li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
<li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li> <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
<li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li> <li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li>
<li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li> <li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li>