marco/cccs-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move everything in container, fix menu problem

Browse source
This commit is contained in:
Stefan Schlott 2013-08-23 12:32:26 +02:00
parent 943b8f0f49
commit 0132b46d5a
3 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
content/styles/_customstyles.scss
View file

@ -71,11 +71,14 @@ h4 small { font-size: $baseFontSize; }
background-color: transparent; background-color: transparent;
background-image: none; background-image: none;
border: 0; border: 0;
padding: 0;
} }
@media (min-width: $navbarCollapseDesktopWidth) {
.nav-collapse { .nav-collapse {
margin-top: 65px; margin-top: 65px;
} }
}
.nav { .nav {
border-bottom: 3px; border-bottom: 3px;
@ -85,6 +88,8 @@ h4 small { font-size: $baseFontSize; }
.navbar .nav > li > a { .navbar .nav > li > a {
padding-bottom: 5px; padding-bottom: 5px;
padding-left: 12px;
padding-right: 12px;
} }
.navbar .nav > li > a.active, .navbar .nav > li > a.active,

2
content/styles/_variables.scss
View file

@ -176,7 +176,7 @@ $wellBackground: #f5f5f5 !default;
// Navbar // Navbar
// ------------------------- // -------------------------
$navbarCollapseWidth: 979px !default; $navbarCollapseWidth: 767px !default;
$navbarCollapseDesktopWidth: $navbarCollapseWidth + 1; $navbarCollapseDesktopWidth: $navbarCollapseWidth + 1;
$navbarHeight: 40px !default; $navbarHeight: 40px !default;

33
layouts/default.html
View file

@ -10,18 +10,13 @@
<script src="/js/bootstrap-collapse.js" type="text/javascript"></script> <script src="/js/bootstrap-collapse.js" type="text/javascript"></script>
</head> </head>
<body> <body>
<div class="navbar navbar-static-top">
<div class="navbar-inner">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span1"> <div class="span1 hidden-phone" style="margin-top: 20px">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="/"><img src="/img/logo.png" alt="CCCStuttgart"></a> <a class="brand" href="/"><img src="/img/logo.png" alt="CCCStuttgart"></a>
</div> </div>
<div class="navbar navbar-static-top span11">
<div class="navbar-inner">
<div class="nav-collapse collapse"> <div class="nav-collapse collapse">
<ul class="nav span11"> <ul class="nav span11">
<li><a class="active" href="/about/">Wir über uns</a> <li><a class="active" href="/about/">Wir über uns</a>
@ -30,16 +25,7 @@
<li><a href="#">Projekte</a> <li><a href="#">Projekte</a>
<li><a href="/members/">Members</a> <li><a href="/members/">Members</a>
<li><a href="#">Planet CCCS</a> <li><a href="#">Planet CCCS</a>
<li class="dropdown"> <li><a href="#">Archiv</a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Archiv <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">2013</a>
<li><a href="#">2012</a>
<li><a href="#">2011</a>
<li class="divider"></li>
<li><a href="#">Die alte Webseite</a>
</ul>
</li>
</ul> </ul>
<ul class="nav span11"> <ul class="nav span11">
<li><a href="#">Aktuell</a> <li><a href="#">Aktuell</a>
@ -47,13 +33,15 @@
</ul> </ul>
</div> </div>
</div> </div>
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
</div> </div>
</div> </div>
</div>
<div class="container">
<% render("#{@item[:kind]}_body") do %><%= yield %><% end %> <% render("#{@item[:kind]}_body") do %><%= yield %><% end %>
</div> <div id="footer">
<div class="container" id="footer">
<div id="footerimage"> <div id="footerimage">
<img src="/img/silhouette.png"> <img src="/img/silhouette.png">
</div> </div>
@ -61,5 +49,6 @@
<a href="#">Impressum</a> <a href="#">Impressum</a>
</footer> </footer>
</div> </div>
</div>
</body> </body>
</html> </html>