Unverified Commit 6718f800 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix UI bug introduced in new project page


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 9bae27484721
.alert_holder {
margin: -16px;
.alert-link {
font-weight: normal;
}
......@@ -31,20 +31,20 @@
margin: -$gl-padding;
padding: $gl-padding;
padding: 44px 0 17px 0;
.project-identicon-holder {
margin-bottom: 16px;
.avatar, .identicon {
margin: 0 auto;
float: none;
}
.identicon {
@include border-radius(50%);
}
}
.project-home-dropdown {
margin: 11px 3px 0;
}
......@@ -86,15 +86,15 @@
top: 17px;
margin-bottom: 44px;
}
.project-repo-buttons {
margin-top: 12px;
margin-bottom: 0px;
.btn {
@include bnt-project;
@include btn-info;
.count {
display: inline-block;
}
......@@ -105,7 +105,7 @@
.split-one {
display: inline-table;
margin-right: 12px;
a {
margin: -1px !important;
}
......@@ -129,10 +129,10 @@
&.git-protocols {
padding: 0;
border: none;
.input-group-btn:last-child > .btn {
@include border-radius-right(0);
border-left: 1px solid #c6cacf;
margin-left: -2px !important;
}
......@@ -141,55 +141,55 @@
}
.projects-search-form {
.input-group .form-control {
height: 42px;
}
}
.input-group-btn {
.btn {
.btn {
@include bnt-project;
@include btn-middle;
&:hover {
outline: none;
}
&:focus {
outline: none;
}
&:active {
outline: none;
}
}
.active {
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
border: 1px solid #c6cacf !important;
background-color: #e4e7ed !important;
}
.btn-green {
@include btn-green
}
}
.split-repo-buttons {
display: inline-table;
margin: 0 12px 0 12px;
.btn{
@include bnt-project;
@include btn-info;
}
.dropdown-toggle {
margin: -5px;
}
}
}
#notification-form {
......@@ -202,7 +202,7 @@
.open > .dropdown-new.btn {
@include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
border: 1px solid #c6cacf !important;
background-color: #e4e7ed !important;
text-transform: uppercase;
......@@ -214,21 +214,21 @@
.dropdown-menu {
@include box-shadow(rgba(76, 86, 103, 0.247059) 0px 0px 1px 0px, rgba(31, 37, 50, 0.317647) 0px 2px 18px 0px);
@include border-radius (0px);
border: none;
padding: 16px 0;
font-size: 14px;
font-weight: 100;
li a {
color: #5f697a;
line-height: 30px;
&:hover {
background-color: #3084bb !important;
background-color: #3084bb !important;
}
}
.fa-fw {
margin-right: 8px;
}
......@@ -370,7 +370,7 @@ table.table.protected-branches-list tr.no-border {
ul.nav-pills {
display:inline-block;
}
.nav-pills li {
display:inline;
}
......@@ -378,12 +378,12 @@ table.table.protected-branches-list tr.no-border {
.nav > li > a {
@include btn-info;
@include bnt-project;
background-color: transparent;
border: 1px solid #f7f8fa;
margin-left: 12px;
}
li {
display:inline;
}
......@@ -418,27 +418,27 @@ pre.light-well {
.git-empty {
margin: 0 7px 0 7px;
h5 {
color: #5c5d5e;
}
.light-well {
@include border-radius (2px);
color: #5b6169;
font-size: 13px;
line-height: 1.6em;
font-size: 13px;
line-height: 1.6em;
}
}
.prepend-top-20 {
.project-footer {
margin-top: 20px;
.btn-remove {
@include btn-middle;
@include btn-remove;
float: left !important;
}
}
......@@ -446,7 +446,7 @@ pre.light-well {
/*
* Projects list rendered on dashboard and user page
*/
.projects-list {
@include basic-list;
......
......@@ -75,7 +75,7 @@
- if current_user
- access = user_max_access_in_project(current_user, @project)
- if access
.prepend-top-20
.prepend-top-20.project-footer
.gray-content-block.footer-block.center
You have #{access} access to this project.
- if @project.project_member_by_id(current_user)
......
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