Commit 05d76fc4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Bootstrap: login screen

parent 4d9c3f31
...@@ -120,6 +120,7 @@ $blue_link: "#2fa0bb"; ...@@ -120,6 +120,7 @@ $blue_link: "#2fa0bb";
@import "issues.css.scss"; @import "issues.css.scss";
@import "merge_requests.css.scss"; @import "merge_requests.css.scss";
@import "notes.css.scss"; @import "notes.css.scss";
@import "login.scss";
//@import "style.scss"; //@import "style.scss";
......
.application h2.icon span{ background-position: 9px -69px; }
.application header{margin-bottom: 0}
.application .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;} .application .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;}
.application .application-content{ position: relative; float: left; width: 100%; height: 100%; } .application .application-content{ position: relative; float: left; width: 100%; height: 100%; }
.application .news-feed h2{float: left;} .application .news-feed h2{float: left;}
...@@ -7,7 +5,6 @@ ...@@ -7,7 +5,6 @@
body.application aside{ body.application aside{
min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 260px; float: left; border-right: 1px solid $border_color; padding:20px; padding-right:0; min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 260px; float: left; border-right: 1px solid $border_color; padding:20px; padding-right:0;
h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;} h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}
.project-list {list-style: none; margin: 0; padding: 0;} .project-list {list-style: none; margin: 0; padding: 0;}
.project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid $lite_border_color; padding: 14px 6% 14px 0px;} .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid $lite_border_color; padding: 14px 6% 14px 0px;}
.project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px} .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px}
......
/* Login Page */
body.login-page{ padding-top: 10%}
.login-box{
width: 304px;
position: relative;
border-radius: 5px;
margin: auto;
padding: 20px;
background: white;
}
.login-box .login-logo{
margin: 10px 0 30px 0;
display: block;
}
.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}
.login-box input.text.top{
-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
}
.login-box input.text.bottom{
-webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
border-top: 0;
margin-bottom: 20px;
}
.login-box a.forgot{float: right; padding-top: 6px}
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
margin-right:50px margin-right:50px
} }
.sidebar { .project {
.sidebar {
.fixed { .fixed {
position:fixed; position:fixed;
} }
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
font-size:13px; font-size:13px;
font-weight:bold; font-weight:bold;
} }
}
} }
.file_stats { .file_stats {
span { span {
......
...@@ -178,47 +178,6 @@ table thead .image{width:100px} ...@@ -178,47 +178,6 @@ table thead .image{width:100px}
/* eo UI Box */ /* eo UI Box */
/* Login Page */
body.login-page{background-color: #f1f1f1; padding-top: 10%}
.login-box{
width: 304px;
position: relative;
border-radius: 5px;
margin: auto;
padding: 20px;
background: white;
box-shadow: rgba(0, 0, 0, 0.07) 0 1px 0,white 0 2px 0,rgba(0, 0, 0, 0.07) 0 3px 0,white 0 4px 0, rgba(0, 0, 0, 0.07) 0 5px 0;
}
.login-box .login-logo{
margin: 10px 0 30px 0;
display: block;
}
.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}
.login-box input.text.top{
-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
}
.login-box input.text.bottom{
-webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
-moz-border-radius-bottomright: 5px;
-moz-border-radius-bottomleft: 5px;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
border-top: 0;
margin-bottom: 20px;
}
.login-box a.forgot{float: right; padding-top: 6px}
/* Icons */ /* Icons */
.directory, .file{ .directory, .file{
......
%aside %aside
%h4 %h4
- if current_user.can_create_project?
%a.button-small.button-green{:href => new_project_path} New Project
Your Projects Your Projects
- if current_user.can_create_project?
= link_to new_project_path, :class => "btn small" do
New Project
%ol.project-list %ol.project-list
- @projects.each do |project| - @projects.each do |project|
%li %li
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
<%= devise_error_messages! %> <%= devise_error_messages! %>
<%= f.email_field :email, :placeholder => "Email", :class => "text top" %> <%= f.email_field :email, :placeholder => "Email", :class => "text top" %>
<br/> <br/>
<%= f.submit "Reset password", :class => "grey-button" %> <%= f.submit "Reset password", :class => "primary btn" %>
<div class="right"> <%= render :partial => "devise/shared/links" %></div> <div class="right"> <%= render :partial => "devise/shared/links" %></div>
<% end %> <% end %>
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
<% if devise_mapping.rememberable? -%> <% if devise_mapping.rememberable? -%>
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div> <div class="clearfix"> <%= f.label :remember_me %><%= f.check_box :remember_me %></div>
<% end -%> <% end -%>
<br/> <br/>
<%= f.submit "Sign in", :class => "grey-button" %> <%= f.submit "Sign in", :class => "primary btn" %>
<div class="right"> <%= render :partial => "devise/shared/links" %></div> <div class="right"> <%= render :partial => "devise/shared/links" %></div>
<% end %> <% end %>
<%- if controller_name != 'sessions' %> <%- if controller_name != 'sessions' %>
<%= link_to "Sign in", new_session_path(resource_name) %><br /> <%= link_to "Sign in", new_session_path(resource_name), :class => "btn" %><br />
<% end -%> <% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %> <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<% end -%> <% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br /> <%= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn" %><br />
<% end -%> <% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
......
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body.login-page %body.login-page
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
= yield .container-fluid= yield
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment