summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-02-22 17:00:43 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-02-22 17:00:43 +0000
commit6fb523d2bfb145044a6cddb82339b1da6ab1d49a (patch)
tree8f34fcf723267fe457bbe79abbf896b30c5565af /app
parentdf1cdefe88b96c6ce19ddf2cde7824d602e39577 (diff)
parent7f1c26cfeef9a3a33b6ba9122e5fd2339222ed37 (diff)
downloadgitlab-ce-6fb523d2bfb145044a6cddb82339b1da6ab1d49a.tar.gz
Merge branch 'header-overflow-small-devices' into 'master'
Fixed issue with header overflow Fixes #13492 Before: ![Screen_Shot_2016-02-22_at_15.32.42](/uploads/aefec4e67368d0387f22448be8eea65c/Screen_Shot_2016-02-22_at_15.32.42.png) After: ![Screen_Shot_2016-02-22_at_15.32.09](/uploads/76b0d96cd5d9a4076c9d0883aaaba003/Screen_Shot_2016-02-22_at_15.32.09.png) See merge request !2921
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/common.scss1
-rw-r--r--app/assets/stylesheets/framework/header.scss1
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index ea56d9e12a0..0ddbf612543 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -377,7 +377,6 @@ table {
}
.project-item-select-holder {
- display: inline-block;
position: relative;
.project-item-select {
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index a81e258573d..531dedb89fe 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -77,6 +77,7 @@ header {
line-height: $header-height;
font-weight: normal;
color: #4c4e54;
+ overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
white-space: nowrap;