Permalink
Browse files

base template and login form

  • Loading branch information...
Wolff09 committed Apr 10, 2013
1 parent b52b832 commit da40279e166d1cc321e911023d28e5d3004e5423
View
@@ -1,3 +1,4 @@
+*.DS_Store
*.rbc
*.sassc
.sass-cache
@@ -8,8 +8,18 @@
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
- *= require_self
*= require jquery-ui
+ *= require foundation_and_overrides
*= require_tree .
+ *= require_self
*/
- *= require foundation_and_overrides
+
+ body {
+ margin-top: 60px;
+ }
+
+ #top-bar {
+ position: fixed;
+ top: 0;
+ z-index: 2;
+ }
@@ -0,0 +1,25 @@
+@import "foundation_and_overrides";
+
+form.inline {
+ label {
+ @include prefix-postfix-base;
+ @include prefix;
+ @include grid-column($columns: 4);
+ @media #{$small} {
+ @include grid-column($columns: 3);
+ }
+ }
+
+ input[type="text"], input[type="password"] {
+ @include grid-column($columns: 8);
+ @media #{$small} {
+ @include grid-column($columns: 9);
+ }
+ }
+
+ .submit {
+ text-align: right;
+ margin-right: 1px;
+ }
+}
+
@@ -15,7 +15,7 @@
// $em-base: 16px;
// We use these to control various global styles
-$body-bg: #9f8331;
+// $body-bg: #9f8331;
// $body-font-color: #222;
// $body-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
// $body-font-weight: normal;
@@ -979,7 +979,7 @@ $body-bg: #9f8331;
// Controlling the styles for the title in the top bar
// $topbar-title-weight: bold;
-// $topbar-title-font-size: emCalc(17px);
+$topbar-title-font-size: emCalc(20px);
// Set the link colors and styles for top-level nav
// $topbar-link-color: #fff;
@@ -1005,7 +1005,7 @@ $body-bg: #9f8331;
// Transitions and breakpoint styles
// $topbar-transition-speed: 300ms;
-// $topbar-breakpoint: emCalc(940px); // Change to 9999px for always mobile layout
+$topbar-breakpoint: 0px; // emCalc(940px); // Change to 9999px for always mobile layout
// $topbar-media-query: "only screen and (min-width "#{$topbar-breakpoint}")";
@@ -1,69 +0,0 @@
-body {
- background-color: #fff;
- color: #333;
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px;
-}
-
-p, ol, ul, td {
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 13px;
- line-height: 18px;
-}
-
-pre {
- background-color: #eee;
- padding: 10px;
- font-size: 11px;
-}
-
-a {
- color: #000;
- &:visited {
- color: #666;
- }
- &:hover {
- color: #fff;
- background-color: #000;
- }
-}
-
-div {
- &.field, &.actions {
- margin-bottom: 10px;
- }
-}
-
-#notice {
- color: green;
-}
-
-.field_with_errors {
- padding: 2px;
- background-color: red;
- display: table;
-}
-
-#error_explanation {
- width: 450px;
- border: 2px solid red;
- padding: 7px;
- padding-bottom: 0;
- margin-bottom: 20px;
- background-color: #f0f0f0;
- h2 {
- text-align: left;
- font-weight: bold;
- padding: 5px 5px 5px 15px;
- font-size: 12px;
- margin: -7px;
- margin-bottom: 0px;
- background-color: #c00;
- color: #fff;
- }
- ul li {
- font-size: 12px;
- list-style: square;
- }
-}
@@ -1,10 +1,24 @@
-<div>
- <% if signed_in? %>
- <%= link_to 'Adressbuch', users_path %>
- <%= link_to 'Profil', user_path(current_user) %>
- <%= link_to 'Logout', logout_path, :method => :delete %>
- <% else %>
- <%= link_to 'Login', login_url %>
- <% end %>
- <%= link_to 'Portokeule', minutes_path %>
+<div id="top-bar" class="contain-to-grid">
+ <nav class="top-bar">
+ <ul class="title-area">
+ <!-- title -->
+ <li class="name"><h1><a href="/">FSIntranet</a></h1></li>
+ <!-- menu for linearisation -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+ </ul>
+
+ <section class="top-bar-section">
+ <ul class="right">
+ <li class="active"><a href="#">Aktiv</a></li>
+ <li><%= link_to 'Protokolle', minutes_path %></li>
+ <% if signed_in? %>
+ <li><%= link_to 'Adressbuch', users_path %></li>
+ <li><%= link_to 'Profil', user_path(current_user) %></li>
+ <li><%= link_to 'Logout', logout_path, :method => :delete %></li>
+ <% else %>
+ <li><%= link_to 'Login', login_url %></li>
+ <% end %>
+ </ul>
+ </section>
+ </nav>
</div>
@@ -4,29 +4,31 @@
<!--[if IE 7 ]> <html class="ie7" lang="en"> <![endif]-->
<!--[if IE 8 ]> <html class="ie8" lang="en"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!--> <html lang="en"> <!--<![endif]-->
- <head>
- <meta charset="utf-8" />
+ <head>
+ <meta charset="utf-8" />
- <!-- Uncomment to make IE8 render like IE7 -->
- <!-- <meta http-equiv="X-UA-Compatible" content="IE=7" /> -->
+ <!-- Uncomment to make IE8 render like IE7 -->
+ <!-- <meta http-equiv="X-UA-Compatible" content="IE=7" /> -->
- <!-- Set the viewport width to device width for mobile -->
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <!-- Set the viewport width to device width for mobile -->
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title><%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
+ <title><%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
- <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
- <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+ <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
+ <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
- <%= javascript_include_tag "vendor/custom.modernizr" %>
- <%= csrf_meta_tags %>
- </head>
+ <%= javascript_include_tag "vendor/custom.modernizr" %>
+ <%= csrf_meta_tags %>
+ </head>
- <body>
- <%= render 'layouts/header' %>
-
- <%= yield %>
-
- <%= javascript_include_tag "application" %>
- </body>
+ <body>
+ <%= render 'layouts/header' %>
+ <div id="content" class="row">
+ <div class="small-12 large-12 columns">
+ <%= yield %>
+ </div>
+ </div>
+ <%= javascript_include_tag "application" %>
+ </body>
</html>
@@ -1,13 +1,17 @@
<h1>Login</h1>
<div>
- <%= form_tag sessions_path do %>
- <%= label_tag :loginname %>
- <%= text_field_tag :loginname %>
-
- <%= label_tag :password %>
- <%= password_field_tag :password %>
-
- <%= submit_tag "Login" %>
+ <%= form_tag sessions_path, :class => 'inline' do %>
+ <div class="field">
+ <%= label_tag :loginname %>
+ <%= text_field_tag :loginname %>
+ </div>
+ <div class="field">
+ <%= label_tag :password %>
+ <%= password_field_tag :password %>
+ </div>
+ <div class="submit">
+ <%= submit_tag "Login", :class => 'button right' %>
+ </div>
<% end %>
</div>

0 comments on commit da40279

Please sign in to comment.