summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-21 15:54:43 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-21 15:54:43 +0000
commitdf689bdf69eec47475dcfd16cc7cf01bfc5686b2 (patch)
tree49a0c9129035b5ff1b45e937b6f60569e593bb4e /app/assets/stylesheets/pages
parent44fe4f63f9ea86253b386561a4d439227c53f50b (diff)
parent459547c259a5bb3e740bb5cba4790e133b16d60a (diff)
downloadgitlab-ce-df689bdf69eec47475dcfd16cc7cf01bfc5686b2.tar.gz
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/stylesheets/pages')
-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 {