diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 9e093fd4..cb258134 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -444,7 +444,24 @@ float: right; } .account-box.hover{height: 138px;} -.account-box.hover .account-links, .account-box.hover .arrow-up{display: block;} + +.account-box:hover > .account-links{display: block;} +header .account-links{background: white; display: none; border-radius: 5px; width: 100px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); position:relative;} +header .account-links:before { + content: "."; + width:0; + height:0; + position:absolute; + border:5px solid transparent; + border-color:rgba(255,255,255,0); + border-bottom-color:#fafafa; + text-indent:-9999px; + top:-10px; + line-height:0; + right:10px; + z-index:10; +} + /* Inspired by http://maxvoltar.com/temp/nowplaying/ */ header .account-links{background: white; display: none; z-index: 100000; border-radius: 5px; width: 100px; position: absolute; right: 20px; top: 46px; margin-top: 0; float: right; box-shadow: 0 1px 1px rgba(0,0,0,.2); } @@ -477,18 +494,15 @@ header .account-links a:last-child{ border-bottom: 0; } -header a.arrow-up{ - display: none; - width: 0; - height: 0; - float: right; - margin-right: 26px; - margin-bottom: 0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - - border-bottom: 5px solid white; +#no_ssh_key_defined { + border:1px solid #ee8801; + margin:20px; + padding:20px; + background:#ffe3f0; + h2{margin:0;} + p {margin:10px 0 0;} } + /* eo Account Box */ input.search-input{float: left; text-shadow: none; width: 116px; 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; width: 216px;} @@ -553,7 +567,17 @@ body.project-page h2.icon span{ background-position: -78px -68px; } body.project-page .project-container{ position: relative; float: left; width: 100%; height: 100%; } body.project-page .page-title{margin-bottom: 0} body.project-page .project-sidebar {width: 220px; left: 0; top: 0; height: 100%; bottom: 0; position: absolute; background-color: #f7f7f7; float: left; display: inline-block; background: #f7f7f7; padding: 20px 0 20px 2%; margin: 0; } -body.project-page .project-sidebar input.text.git-url{ font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 8px 14px 8px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -40px;} + +body.project-page input.text.git-url, +body.projects-page input.text.git-url{ font-size: 12px; border-radius: 5px; color: #666; box-shadow: 0 1px 2px rgba(0,0,0,.2) inset; padding: 5px 14px 5px 30px; margin-bottom: 20px; background: white url('images.png') no-repeat 8px -43px;width:100%;border:0;} + +body.projects-page input.text.git-url {margin:10px 0 0 } + +.git_url_wrapper { margin-right:50px } + +.projects_selector:hover > .project-box{ -moz-box-shadow:0px 0px 10px rgba(0, 0, 0, .5); -webkit-box-shadow:0px 0px 10px rgba(0, 0, 0, .5); box-shadow:0px 0px 10px rgba(0, 0, 0, .5); } + + body.project-page .project-sidebar aside{width: 219px} body.project-page .project-sidebar aside a{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee} body.project-page .project-sidebar aside a:first-child{ diff --git a/app/views/layouts/_head_panel.html.erb b/app/views/layouts/_head_panel.html.erb index 6db1d389..20590e25 100644 --- a/app/views/layouts/_head_panel.html.erb +++ b/app/views/layouts/_head_panel.html.erb @@ -8,8 +8,6 @@ <%= image_tag gravatar_icon(current_user.email) %> <% end %> - -
<%= link_to profile_path, :class => "username" do %> <%#= current_user.name %> @@ -50,3 +48,11 @@ }); <% end %> <% end %> + +<% if current_user.keys.all.empty? %> +
+

ATTENTION!

+

No SSH Key is defined. You won't be able to use any Git command! +

Click <%=link_to( 'here', keys_path ) %> to add one! +

+<% end %> \ No newline at end of file diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 0550d89e..078f710c 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -16,7 +16,8 @@ .project-container .project-sidebar .fixed - %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"} + .git_url_wrapper + %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"} %aside = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil diff --git a/app/views/projects/_tile.html.haml b/app/views/projects/_tile.html.haml index 1f2a4a97..5686e544 100644 --- a/app/views/projects/_tile.html.haml +++ b/app/views/projects/_tile.html.haml @@ -1,13 +1,13 @@ - @projects.in_groups_of(3, false) do |projects| - projects.each_with_index do |project, i| - %div.grid_1 + %div.grid_1.projects_selector %div{ :class => "project-box ui-box ui-box-big" } = link_to project_path(project) do %h3= project.name .data - %p.title.repository + %p.title.repository.git_url_wrapper %span Repository: - = project.url_to_repo + %input{ :value => project.url_to_repo, :class => ['git-url', 'one_click_select', 'text', 'project_list_url'], :readonly => 'readonly' } %p.title.activity %span Last Activity: - last_note = project.notes.last