Download as
Browse Code »

Commit 05d76fc4d03f8174f54c601d20392b0bf22fdbf9

Authored by Dmitriy Zaporozhets
1 parent 4d9c3f31
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Bootstrap: login screen

Showing 10 changed files with 64 additions and 63 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @05d76fc
@@ -120,6 +120,7 @@ $blue_link: "#2fa0bb"; @@ -120,6 +120,7 @@ $blue_link: "#2fa0bb";
120 @import "issues.css.scss"; 120 @import "issues.css.scss";
121 @import "merge_requests.css.scss"; 121 @import "merge_requests.css.scss";
122 @import "notes.css.scss"; 122 @import "notes.css.scss";
  123 +@import "login.scss";
123 124
124 //@import "style.scss"; 125 //@import "style.scss";
125 126
app/assets/stylesheets/dashboard.scss
  Diff comments   View file @05d76fc
1 -.application h2.icon span{ background-position: 9px -69px; }  
2 -.application header{margin-bottom: 0}  
3 .application .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;} 1 .application .news-feed{margin-left: 285px; min-height: 600px; margin-top: 20px; margin-right:2px; padding:20px;}
4 .application .application-content{ position: relative; float: left; width: 100%; height: 100%; } 2 .application .application-content{ position: relative; float: left; width: 100%; height: 100%; }
5 .application .news-feed h2{float: left;} 3 .application .news-feed h2{float: left;}
@@ -7,7 +5,6 @@ @@ -7,7 +5,6 @@
7 body.application aside{ 5 body.application aside{
8 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; 6 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;
9 h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;} 7 h4{margin: 0; border-bottom: 1px solid #ccc; padding: 20px 20px 20px 0px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
10 - h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}  
11 .project-list {list-style: none; margin: 0; padding: 0;} 8 .project-list {list-style: none; margin: 0; padding: 0;}
12 .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid $lite_border_color; padding: 14px 6% 14px 0px;} 9 .project-list li a {background: white; color: #{$blue_link}; display: block; border-bottom: 1px solid $lite_border_color; padding: 14px 6% 14px 0px;}
13 .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px} 10 .project-list li a span.project-name{font-size: 14px; display: block; margin-bottom: 8px}
app/assets/stylesheets/login.scss 0 → 100644
  Diff comments   View file @05d76fc
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
  1 +/* Login Page */
  2 +body.login-page{ padding-top: 10%}
  3 +
  4 +.login-box{
  5 + width: 304px;
  6 + position: relative;
  7 + border-radius: 5px;
  8 + margin: auto;
  9 + padding: 20px;
  10 + background: white;
  11 +}
  12 +
  13 +.login-box .login-logo{
  14 + margin: 10px 0 30px 0;
  15 + display: block;
  16 +}
  17 +
  18 +.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}
  19 +
  20 +.login-box input.text.top{
  21 + -webkit-border-top-left-radius: 5px;
  22 + -webkit-border-top-right-radius: 5px;
  23 + -moz-border-radius-topleft: 5px;
  24 + -moz-border-radius-topright: 5px;
  25 + border-top-left-radius: 5px;
  26 + border-top-right-radius: 5px;
  27 +}
  28 +
  29 +.login-box input.text.bottom{
  30 + -webkit-border-bottom-right-radius: 5px;
  31 + -webkit-border-bottom-left-radius: 5px;
  32 + -moz-border-radius-bottomright: 5px;
  33 + -moz-border-radius-bottomleft: 5px;
  34 + border-bottom-right-radius: 5px;
  35 + border-bottom-left-radius: 5px;
  36 + border-top: 0;
  37 + margin-bottom: 20px;
  38 +}
  39 +
  40 +.login-box a.forgot{float: right; padding-top: 6px}
  41 +
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @05d76fc
@@ -2,18 +2,20 @@ @@ -2,18 +2,20 @@
2 margin-right:50px 2 margin-right:50px
3 } 3 }
4 4
5 -.sidebar {  
6 - .fixed {  
7 - position:fixed;  
8 - } 5 +.project {
  6 + .sidebar {
  7 + .fixed {
  8 + position:fixed;
  9 + }
9 10
10 - aside a {  
11 - display:block;  
12 - position:relative;  
13 - padding:15px 10px;  
14 - margin:10px 0 0 0;  
15 - font-size:13px;  
16 - font-weight:bold; 11 + aside a {
  12 + display:block;
  13 + position:relative;
  14 + padding:15px 10px;
  15 + margin:10px 0 0 0;
  16 + font-size:13px;
  17 + font-weight:bold;
  18 + }
17 } 19 }
18 } 20 }
19 .file_stats { 21 .file_stats {
app/assets/stylesheets/style.scss
  Diff comments   View file @05d76fc
@@ -178,47 +178,6 @@ table thead .image{width:100px} @@ -178,47 +178,6 @@ table thead .image{width:100px}
178 178
179 /* eo UI Box */ 179 /* eo UI Box */
180 180
181 -/* Login Page */  
182 -body.login-page{background-color: #f1f1f1; padding-top: 10%}  
183 -  
184 -.login-box{  
185 - width: 304px;  
186 - position: relative;  
187 - border-radius: 5px;  
188 - margin: auto;  
189 - padding: 20px;  
190 - background: white;  
191 - 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;  
192 -}  
193 -  
194 -.login-box .login-logo{  
195 - margin: 10px 0 30px 0;  
196 - display: block;  
197 -}  
198 -  
199 -.login-box input.text{background-color: #f1f1f1; font-size: 16px; border-radius: 0; padding: 14px 10px; width: 280px}  
200 -  
201 -.login-box input.text.top{  
202 - -webkit-border-top-left-radius: 5px;  
203 - -webkit-border-top-right-radius: 5px;  
204 - -moz-border-radius-topleft: 5px;  
205 - -moz-border-radius-topright: 5px;  
206 - border-top-left-radius: 5px;  
207 - border-top-right-radius: 5px;  
208 -}  
209 -  
210 -.login-box input.text.bottom{  
211 - -webkit-border-bottom-right-radius: 5px;  
212 - -webkit-border-bottom-left-radius: 5px;  
213 - -moz-border-radius-bottomright: 5px;  
214 - -moz-border-radius-bottomleft: 5px;  
215 - border-bottom-right-radius: 5px;  
216 - border-bottom-left-radius: 5px;  
217 - border-top: 0;  
218 - margin-bottom: 20px;  
219 -}  
220 -  
221 -.login-box a.forgot{float: right; padding-top: 6px}  
222 181
223 /* Icons */ 182 /* Icons */
224 .directory, .file{ 183 .directory, .file{
app/views/dashboard/_sidebar.html.haml
  Diff comments   View file @05d76fc
1 %aside 1 %aside
2 %h4 2 %h4
3 - - if current_user.can_create_project?  
4 - %a.button-small.button-green{:href => new_project_path} New Project  
5 Your Projects 3 Your Projects
  4 + - if current_user.can_create_project?
  5 + = link_to new_project_path, :class => "btn small" do
  6 + New Project
6 %ol.project-list 7 %ol.project-list
7 - @projects.each do |project| 8 - @projects.each do |project|
8 %li 9 %li
app/views/devise/passwords/new.html.erb
  Diff comments   View file @05d76fc
@@ -3,6 +3,6 @@ @@ -3,6 +3,6 @@
3 <%= devise_error_messages! %> 3 <%= devise_error_messages! %>
4 <%= f.email_field :email, :placeholder => "Email", :class => "text top" %> 4 <%= f.email_field :email, :placeholder => "Email", :class => "text top" %>
5 <br/> 5 <br/>
6 - <%= f.submit "Reset password", :class => "grey-button" %> 6 + <%= f.submit "Reset password", :class => "primary btn" %>
7 <div class="right"> <%= render :partial => "devise/shared/links" %></div> 7 <div class="right"> <%= render :partial => "devise/shared/links" %></div>
8 <% end %> 8 <% end %>
app/views/devise/sessions/new.html.erb
  Diff comments   View file @05d76fc
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %> 4 <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
5 5
6 <% if devise_mapping.rememberable? -%> 6 <% if devise_mapping.rememberable? -%>
7 - <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div> 7 + <div class="clearfix"> <%= f.label :remember_me %><%= f.check_box :remember_me %></div>
8 <% end -%> 8 <% end -%>
9 <br/> 9 <br/>
10 - <%= f.submit "Sign in", :class => "grey-button" %> 10 + <%= f.submit "Sign in", :class => "primary btn" %>
11 <div class="right"> <%= render :partial => "devise/shared/links" %></div> 11 <div class="right"> <%= render :partial => "devise/shared/links" %></div>
12 <% end %> 12 <% end %>
app/views/devise/shared/_links.erb
  Diff comments   View file @05d76fc
1 <%- if controller_name != 'sessions' %> 1 <%- if controller_name != 'sessions' %>
2 - <%= link_to "Sign in", new_session_path(resource_name) %><br /> 2 + <%= link_to "Sign in", new_session_path(resource_name), :class => "btn" %><br />
3 <% end -%> 3 <% end -%>
4 4
5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %> 5 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <% end -%> 7 <% end -%>
8 8
9 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> 9 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
10 - <%= link_to "Forgot your password?", new_password_path(resource_name) %><br /> 10 +<%= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn" %><br />
11 <% end -%> 11 <% end -%>
12 12
13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> 13 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
app/views/layouts/devise.html.haml
  Diff comments   View file @05d76fc
@@ -13,4 +13,4 @@ @@ -13,4 +13,4 @@
13 REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; 13 REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
14 %body.login-page 14 %body.login-page
15 = render :partial => "layouts/flash" 15 = render :partial => "layouts/flash"
16 - = yield 16 + .container-fluid= yield