diff options
author | gitlabhq <m@gitlabhq.com> | 2011-10-31 14:30:53 +0400 |
---|---|---|
committer | gitlabhq <m@gitlabhq.com> | 2011-10-31 14:30:53 +0400 |
commit | 9bf39477dec99eacda9443e39a631d5b5a11eef6 (patch) | |
tree | eed56b8e16f1387b4f22e61ce668be89379f4cf2 /app | |
parent | fb33ccd87f742db0a8e6e5d106ebc98d07124e70 (diff) |
commit
Diffstat (limited to 'app')
-rwxr-xr-x | app/assets/stylesheets/style.scss | 12 | ||||
-rw-r--r-- | app/views/layouts/_page_title.html.haml | 5 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 11 | ||||
-rw-r--r-- | app/views/projects/index.html.haml | 9 |
4 files changed, 18 insertions, 19 deletions
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 34bcff1fff7..9d300d81f50 100755 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -228,14 +228,14 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} /* General */ /* Header */ -header{background: #474D57 url('../img/bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%} +header{background: #474D57 url('bg-header.png') repeat-x bottom; z-index: 10000; height: 44px; padding: 10px 2% 6px 2%} header a{color: white; text-shadow: 0 -1px 0 black} header a:hover{color: #f1f1f1} header h1{ width: 65px; } header h1.logo{ - background: url('../img/images.png') no-repeat -3px -6px; + background: url('images.png') no-repeat -3px -6px; width: 65px; height: 26px; margin: 5px 0; @@ -282,9 +282,9 @@ header nav a.admin{ border-top-right-radius: 4px; border-bottom-right-radius: 4px; } -header nav a.dashboard span{background: url('../img/images.png') no-repeat -161px -4px; width: 20px; height: 20px; } -header nav a.admin span{background: url('../img/images.png') no-repeat -184px -4px; width: 20px; height: 20px;} -header nav a.project span{background: url('../img/images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px} +header nav a.dashboard span{background: url('images.png') no-repeat -161px -4px; width: 20px; height: 20px; } +header nav a.admin span{background: url('images.png') no-repeat -184px -4px; width: 20px; height: 20px;} +header nav a.project span{background: url('images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px} header .login-top{float: right; width: 180px; background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); @@ -366,7 +366,7 @@ header a.arrow-up{ border-bottom: 5px solid white; } /* eo Account Box */ -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 } +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 } input.search-input:focus{ background-color: white; } input.search-input::-webkit-input-placeholder {color: #666} /* eo Header */ diff --git a/app/views/layouts/_page_title.html.haml b/app/views/layouts/_page_title.html.haml index bdd56c6a885..9cd028bea36 100644 --- a/app/views/layouts/_page_title.html.haml +++ b/app/views/layouts/_page_title.html.haml @@ -1,6 +1,7 @@ - if content_for?(:page_title) = yield :page_title - else - .page-title + .grid-4 .container_3 - %h1= controller.controller_name.capitalize + %h2.icon + %span= controller.controller_name.capitalize diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a96f070f1d4..54a2ada41f8 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -17,16 +17,13 @@ %body#thebody #container = render :partial => "layouts/flash" - - - if user_signed_in? - = render :partial => "layouts/head_panel" - = render :partial => "layouts/page_title" + = render :partial => "layouts/head_panel" + %div{ :id => "main", :role => "main", :class => "container_4" } - if @project && !@project.new_record? .top_bar.container= render :partial => "projects/top_menu" - if ["keys", "profile"].include?(controller.controller_name) .top_bar.container= render :partial => "profile/top_menu" - if admin_namespace? .top_bar.container= render :partial => "admin/top_menu" - %div{ :id => "main", :role => "main", :class => "container_3" } - #content-container - = yield + = render :partial => "layouts/page_title" + = yield diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index 89c7e3fdbb3..45187b444f8 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -1,9 +1,10 @@ - content_for(:page_title) do - .page-title - .container_3 + .grid-4 + %h2.icon - if current_user.can_create_project? - %a.grey-button{:href => new_project_path} Create new project - %h1 Projects + %a.grey-button.right{:href => new_project_path} Create new project + %span + Projects - unless @projects.empty? %div{:class => "tile", :style => view_mode_style("tile")} |