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

Merge branch 'header-overflow-small-devices' into 'master'
6fb523d2 · Jacob Schatz · df1cdefe · 7f1c26cf · 6fb523d2 · 6fb523d2
Commit 6fb523d2 authored Feb 22, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.scss app/assets/stylesheets/framework/common.scss +0 -1

header.scss app/assets/stylesheets/framework/header.scss +1 -0

No files found.
--- 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 {

--- 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;