Download as
Browse Code »

Commit 9bf39477dec99eacda9443e39a631d5b5a11eef6

Authored by gitlabhq
1 parent fb33ccd8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

commit

Showing 4 changed files with 18 additions and 19 deletions   Show diff stats
app/assets/stylesheets/style.scss
  Diff comments   View file @9bf3947
@@ -228,14 +228,14 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} @@ -228,14 +228,14 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
228 /* General */ 228 /* General */
229 229
230 /* Header */ 230 /* Header */
231 -header{background: #474D57 url('../img/bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%} 231 +header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%}
232 header a{color: white; text-shadow: 0 -1px 0 black} 232 header a{color: white; text-shadow: 0 -1px 0 black}
233 header a:hover{color: #f1f1f1} 233 header a:hover{color: #f1f1f1}
234 header h1{ 234 header h1{
235 width: 65px; 235 width: 65px;
236 } 236 }
237 header h1.logo{ 237 header h1.logo{
238 - background: url('../img/images.png') no-repeat -3px -6px; 238 + background: url('images.png') no-repeat -3px -6px;
239 width: 65px; 239 width: 65px;
240 height: 26px; 240 height: 26px;
241 margin: 5px 0; 241 margin: 5px 0;
@@ -282,9 +282,9 @@ header nav a.admin{ @@ -282,9 +282,9 @@ header nav a.admin{
282 border-top-right-radius: 4px; 282 border-top-right-radius: 4px;
283 border-bottom-right-radius: 4px; 283 border-bottom-right-radius: 4px;
284 } 284 }
285 -header nav a.dashboard span{background: url('../img/images.png') no-repeat -161px -4px; width: 20px; height: 20px; }  
286 -header nav a.admin span{background: url('../img/images.png') no-repeat -184px -4px; width: 20px; height: 20px;}  
287 -header nav a.project span{background: url('../img/images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px} 285 +header nav a.dashboard span{background: url('images.png') no-repeat -161px -4px; width: 20px; height: 20px; }
  286 +header nav a.admin span{background: url('images.png') no-repeat -184px -4px; width: 20px; height: 20px;}
  287 +header nav a.project span{background: url('images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px}
288 288
289 header .login-top{float: right; width: 180px; 289 header .login-top{float: right; width: 180px;
290 background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); 290 background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45));
@@ -366,7 +366,7 @@ header a.arrow-up{ @@ -366,7 +366,7 @@ header a.arrow-up{
366 border-bottom: 5px solid white; 366 border-bottom: 5px solid white;
367 } 367 }
368 /* eo Account Box */ 368 /* eo Account Box */
369 -input.search-input{float: right; text-shadow: none; width: 216px; background-image: url('../img/icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px; margin-top: 4px; margin-right: 10px } 369 +input.search-input{float: right; text-shadow: none; width: 216px; background-image: url('icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px; margin-top: 4px; margin-right: 10px }
370 input.search-input:focus{ background-color: white; } 370 input.search-input:focus{ background-color: white; }
371 input.search-input::-webkit-input-placeholder {color: #666} 371 input.search-input::-webkit-input-placeholder {color: #666}
372 /* eo Header */ 372 /* eo Header */
app/views/layouts/_page_title.html.haml
  Diff comments   View file @9bf3947
1 - if content_for?(:page_title) 1 - if content_for?(:page_title)
2 = yield :page_title 2 = yield :page_title
3 - else 3 - else
4 - .page-title 4 + .grid-4
5 .container_3 5 .container_3
6 - %h1= controller.controller_name.capitalize 6 + %h2.icon
  7 + %span= controller.controller_name.capitalize
app/views/layouts/application.html.haml
  Diff comments   View file @9bf3947
@@ -17,16 +17,13 @@ @@ -17,16 +17,13 @@
17 %body#thebody 17 %body#thebody
18 #container 18 #container
19 = render :partial => "layouts/flash" 19 = render :partial => "layouts/flash"
20 -  
21 - - if user_signed_in?  
22 - = render :partial => "layouts/head_panel"  
23 - = render :partial => "layouts/page_title" 20 + = render :partial => "layouts/head_panel"
  21 + %div{ :id => "main", :role => "main", :class => "container_4" }
24 - if @project && !@project.new_record? 22 - if @project && !@project.new_record?
25 .top_bar.container= render :partial => "projects/top_menu" 23 .top_bar.container= render :partial => "projects/top_menu"
26 - if ["keys", "profile"].include?(controller.controller_name) 24 - if ["keys", "profile"].include?(controller.controller_name)
27 .top_bar.container= render :partial => "profile/top_menu" 25 .top_bar.container= render :partial => "profile/top_menu"
28 - if admin_namespace? 26 - if admin_namespace?
29 .top_bar.container= render :partial => "admin/top_menu" 27 .top_bar.container= render :partial => "admin/top_menu"
30 - %div{ :id => "main", :role => "main", :class => "container_3" }  
31 - #content-container  
32 - = yield 28 + = render :partial => "layouts/page_title"
  29 + = yield
app/views/projects/index.html.haml
  Diff comments   View file @9bf3947
1 - content_for(:page_title) do 1 - content_for(:page_title) do
2 - .page-title  
3 - .container_3 2 + .grid-4
  3 + %h2.icon
4 - if current_user.can_create_project? 4 - if current_user.can_create_project?
5 - %a.grey-button{:href => new_project_path} Create new project  
6 - %h1 Projects 5 + %a.grey-button.right{:href => new_project_path} Create new project
  6 + %span
  7 + Projects
7 8
8 - unless @projects.empty? 9 - unless @projects.empty?
9 %div{:class => "tile", :style => view_mode_style("tile")} 10 %div{:class => "tile", :style => view_mode_style("tile")}