Commit 22bb925a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #88 from iamntz/master

small UI changes
parents e5852d41 59445156
...@@ -444,7 +444,24 @@ float: right; ...@@ -444,7 +444,24 @@ float: right;
} }
.account-box.hover{height: 138px;} .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/ */ /* 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); } 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{ ...@@ -477,18 +494,15 @@ header .account-links a:last-child{
border-bottom: 0; border-bottom: 0;
} }
header a.arrow-up{ #no_ssh_key_defined {
display: none; border:1px solid #ee8801;
width: 0; margin:20px;
height: 0; padding:20px;
float: right; background:#ffe3f0;
margin-right: 26px; h2{margin:0;}
margin-bottom: 0; p {margin:10px 0 0;}
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 5px solid white;
} }
/* eo Account Box */ /* 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{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;} input.search-input:focus{ background-color: white; width: 216px;}
...@@ -553,7 +567,17 @@ body.project-page h2.icon span{ background-position: -78px -68px; } ...@@ -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 .project-container{ position: relative; float: left; width: 100%; height: 100%; }
body.project-page .page-title{margin-bottom: 0} 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 {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{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{display: block; position: relative; background: white; padding: 15px 10px; border-bottom: 1px solid #eee}
body.project-page .project-sidebar aside a:first-child{ body.project-page .project-sidebar aside a:first-child{
......
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
<%= image_tag gravatar_icon(current_user.email) %> <%= image_tag gravatar_icon(current_user.email) %>
<% end %> <% end %>
<a href="#" class="arrow-up"></a>
<div class="account-links"> <div class="account-links">
<%= link_to profile_path, :class => "username" do %> <%= link_to profile_path, :class => "username" do %>
<%#= current_user.name %> <%#= current_user.name %>
...@@ -50,3 +48,11 @@ ...@@ -50,3 +48,11 @@
}); });
<% end %> <% end %>
<% end %> <% end %>
<% if current_user.keys.all.empty? %>
<div id="no_ssh_key_defined">
<h2>ATTENTION!</h2>
<p>No SSH Key is defined. You won't be able to use any Git command!
<p>Click <%=link_to( 'here', keys_path ) %> to add one!
</div>
<% end %>
\ No newline at end of file
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
.project-container .project-container
.project-sidebar .project-sidebar
.fixed .fixed
.git_url_wrapper
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"} %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
%aside %aside
= link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil = link_to "History", project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
......
- @projects.in_groups_of(3, false) do |projects| - @projects.in_groups_of(3, false) do |projects|
- projects.each_with_index do |project, i| - projects.each_with_index do |project, i|
%div.grid_1 %div.grid_1.projects_selector
%div{ :class => "project-box ui-box ui-box-big" } %div{ :class => "project-box ui-box ui-box-big" }
= link_to project_path(project) do = link_to project_path(project) do
%h3= project.name %h3= project.name
.data .data
%p.title.repository %p.title.repository.git_url_wrapper
%span Repository: %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 %p.title.activity
%span Last Activity: %span Last Activity:
- last_note = project.notes.last - last_note = project.notes.last
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment