summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 17:54:29 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-06 17:54:29 +0000
commit165199cb476a781e6ef732b2c23780e1bd0630e7 (patch)
tree991308d44f2c8fb95879517c3b69d70af4d06d96
parent39865feb8324a022df30c594853632a0d1edf3ac (diff)
parent33a510685706549fcf61f78021ce7099ea23e067 (diff)
downloadgitlab-ce-165199cb476a781e6ef732b2c23780e1bd0630e7.tar.gz
Merge branch 'event-last-push-styling-fix' into 'master'
event-last-push styling fix When viewing a fresh install of GitLab on a mobile device after a branch with a name of sufficient length, the broken styling can be seen as follows: ![Screen Shot 2015-01-05 at 9.37.32 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/9b3ca84f1a/Screen_Shot_2015-01-05_at_9.37.32_PM.png) I modified the css for .event-last-push and .event-last-push-text to make it look correct: ![Screen Shot 2015-01-05 at 9.37.50 PM](https://gitlab.com/uploads/cloudwindhk/gitlab-ce/43d5a912b3/Screen_Shot_2015-01-05_at_9.37.50_PM.png) As this is a purely css change, I don't believe it will break any tests. The only occurrence of .event-last-push* is in ./app/views/events/_event_last_push.html.haml See merge request !279
-rw-r--r--app/assets/stylesheets/sections/events.scss6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 93ad17f57c0..3c3a0d92c6e 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -145,8 +145,12 @@
* Last push widget
*/
.event-last-push {
+ overflow: auto;
.event-last-push-text {
- @include str-truncated(75%);
+ @include str-truncated(100%);
+ float:left;
+ margin-right: -150px;
+ padding-right: 150px;
line-height: 24px;
}
}