summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-05 19:25:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-05 19:25:18 +0300
commit3b0cf49f33aa972428113393ffc30279fb6857cb (patch)
treee502c05ed2571af60e76911881b300a10cb5bd16 /app
parent2a1be883c88f41eaa8ef494be91c234e17c08eff (diff)
downloadgitlab-ce-3b0cf49f33aa972428113393ffc30279fb6857cb.tar.gz
Fix project description and avatar alignment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/pages/projects.scss84
-rw-r--r--app/views/layouts/_head_panel.html.haml3
-rw-r--r--app/views/projects/_home_panel.html.haml7
-rw-r--r--app/views/projects/show.html.haml1
4 files changed, 25 insertions, 70 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index e523dc959c3..0ab096112cf 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -17,31 +17,25 @@
.project-home-panel {
margin-bottom: 20px;
position: relative;
- padding-left: 85px;
-
- &.empty-project {
- border-bottom: 0px;
- padding-bottom: 15px;
- margin-bottom: 0px;
- }
+ padding-left: 65px;
+ border-bottom: 1px solid #DDD;
+ padding-bottom: 10px;
+ padding-top: 5px;
+ min-height: 50px;
.project-identicon-holder {
position: absolute;
left: 0;
- top: -20px;
+ top: -10px;
.avatar {
- width: 60px;
- height: 60px;
+ width: 50px;
+ height: 50px;
}
.identicon {
- font-size: 28px;
- line-height: 60px;
- }
-
- .avatar, .identicon {
- box-shadow: 0 1px 2px #ddd;
+ font-size: 26px;
+ line-height: 50px;
}
}
@@ -199,50 +193,22 @@ ul.nav.nav-projects-tabs {
}
.project-side {
- .btn-block {
- background-image: none;
-
- .btn, &.btn {
- white-space: normal;
- text-align: left;
- padding: 10px 15px;
-
- &.dropdown-toggle {
- text-align: center;
- }
-
- &:hover {
- background-color: #eee;
- border-color: #DDD;
- }
- }
-
- .count {
- float: right;
- font-weight: 500;
- text-shadow: 0 1px #FFF;
- }
-
- &.btn-group-justified {
- .btn {
- width: 100%;
- }
- .dropdown-toggle {
- width: 30px;
- padding: 10px;
- }
- ul {
- width: 100%;
- }
- }
- }
-
.project-fork-icon {
float: left;
font-size: 26px;
margin-right: 10px;
line-height: 1.5;
}
+
+ .well {
+ h4 {
+ font-weight: normal;
+ }
+
+ .nav-pills a {
+ padding: 10px;
+ }
+ }
}
.transfer-project .select2-container {
@@ -312,13 +278,3 @@ table.table.protected-branches-list tr.no-border {
float: left;
margin-right: 10px;
}
-
-.project-home-dropdown {
- margin-top: 8px;
-
- a {
- padding: 4px 10px;
- color: #888;
- border-color: #ddd;
- }
-}
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 3329a712430..ef685a0434e 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -4,7 +4,8 @@
= link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
= brand_header_logo
%h3 GitLab
- %h1.title= title
+ %h1.title
+ = title
%button.navbar-toggle{type: 'button', data: {target: '.navbar-collapse', toggle: 'collapse'}}
%span.sr-only Toggle navigation
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index 89582d2e3ba..f9cdda4a3ba 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,5 +1,5 @@
- empty_repo = @project.empty_repo?
-.project-home-panel{:class => ("empty-project" if empty_repo)}
+.project-home-panel.clearfix{:class => ("empty-project" if empty_repo)}
.project-identicon-holder
= project_icon(@project, alt: '', class: 'avatar project-avatar')
.project-home-row.project-home-row-top
@@ -9,7 +9,7 @@
- if can?(current_user, :admin_project, @project)
&ndash;
= link_to 'Edit', edit_namespace_project_path
- - elsif !@project.empty_repo? && @repository.readme
+ - elsif !empty_repo && @repository.readme
- readme = @repository.readme
&ndash;
= link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do
@@ -26,7 +26,7 @@
Star
%span.count
= @project.star_count
- - unless @project.empty_repo?
+ - unless empty_repo
- if current_user && can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
.inline.fork-buttons.prepend-left-10
- if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
@@ -35,4 +35,3 @@
- else
= link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-sm btn-default' do
= link_to_toggle_fork
-%hr
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index d944b325952..2259dea0865 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -7,7 +7,6 @@
= render 'shared/no_password'
= render "home_panel"
-
= render 'shared/show_aside'
.row