Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-21 18:54:43 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-06-21 19:01:33 +0300
commit6975a8c3b99ecc0a6a8cc31a552b13259f9c087f (patch)
tree1393c79705e55f18c4ad376da6bc324220b04b63 /app/assets
parentab38557c7d7a86f7b4f15aaa105c53dfbcf34f58 (diff)
Merge branch '18787-user-img-compare' into 'master'
Align avatar and commit content within commit row ## What does this MR do? Aligns the user avatar on `Compare` ## What are the relevant issue numbers? Closes #18787 ## Screenshots (if relevant) <img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px"> <img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px"> See merge request !4764
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/commits.scss12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 761e33f0df7..de534d28421 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -80,9 +80,14 @@
.commit {
padding: 10px 0;
+ position: relative;
@media (min-width: $screen-sm-min) {
- padding-left: 46px;
+ padding-left: 20px;
+
+ .commit-info-block {
+ padding-left: 44px;
+ }
}
&:not(:last-child) {
@@ -95,8 +100,11 @@
vertical-align: baseline;
}
+
.avatar {
- margin-left: -46px;
+ position: absolute;
+ top: 10px;
+ left: 16px;
}
.item-title {