deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

commit

Browse source
This commit is contained in:
gitlabhq 2011-10-31 13:30:53 +03:00
parent fb33ccd87f
commit 9bf39477de
4 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/style.scss
View file

@ -228,14 +228,14 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%}
/* General */ /* General */
/* Header */ /* 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{color: white; text-shadow: 0 -1px 0 black}
header a:hover{color: #f1f1f1} header a:hover{color: #f1f1f1}
header h1{ header h1{
width: 65px; width: 65px;
} }
header h1.logo{ header h1.logo{
background: url('../img/images.png') no-repeat -3px -6px; background: url('images.png') no-repeat -3px -6px;
width: 65px; width: 65px;
height: 26px; height: 26px;
margin: 5px 0; margin: 5px 0;
@ -282,9 +282,9 @@ header nav a.admin{
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-bottom-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.dashboard span{background: url('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.admin span{background: url('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.project span{background: url('images.png') no-repeat -209px -5px; width: 20px; height: 18px; top: 7px}
header .login-top{float: right; width: 180px; header .login-top{float: right; width: 180px;
background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); 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; border-bottom: 5px solid white;
} }
/* eo Account Box */ /* 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:focus{ background-color: white; }
input.search-input::-webkit-input-placeholder {color: #666} input.search-input::-webkit-input-placeholder {color: #666}
/* eo Header */ /* eo Header */

5
app/views/layouts/_page_title.html.haml
View file

@ -1,6 +1,7 @@
- if content_for?(:page_title) - if content_for?(:page_title)
= yield :page_title = yield :page_title
- else - else
.page-title .grid-4
.container_3 .container_3
%h1= controller.controller_name.capitalize %h2.icon
%span= controller.controller_name.capitalize

11
app/views/layouts/application.html.haml
View file

@ -17,16 +17,13 @@
%body#thebody %body#thebody
#container #container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
= render :partial => "layouts/head_panel"
- if user_signed_in? %div{ :id => "main", :role => "main", :class => "container_4" }
= render :partial => "layouts/head_panel"
= render :partial => "layouts/page_title"
- if @project && !@project.new_record? - if @project && !@project.new_record?
.top_bar.container= render :partial => "projects/top_menu" .top_bar.container= render :partial => "projects/top_menu"
- if ["keys", "profile"].include?(controller.controller_name) - if ["keys", "profile"].include?(controller.controller_name)
.top_bar.container= render :partial => "profile/top_menu" .top_bar.container= render :partial => "profile/top_menu"
- if admin_namespace? - if admin_namespace?
.top_bar.container= render :partial => "admin/top_menu" .top_bar.container= render :partial => "admin/top_menu"
%div{ :id => "main", :role => "main", :class => "container_3" } = render :partial => "layouts/page_title"
#content-container = yield
= yield

9
app/views/projects/index.html.haml
View file

@ -1,9 +1,10 @@
- content_for(:page_title) do - content_for(:page_title) do
.page-title .grid-4
.container_3 %h2.icon
- if current_user.can_create_project? - if current_user.can_create_project?
%a.grey-button{:href => new_project_path} Create new project %a.grey-button.right{:href => new_project_path} Create new project
%h1 Projects %span
Projects
- unless @projects.empty? - unless @projects.empty?
%div{:class => "tile", :style => view_mode_style("tile")} %div{:class => "tile", :style => view_mode_style("tile")}