diff options
author | James Lopez <james@jameslopez.es> | 2016-06-13 14:00:19 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-06-13 14:00:19 +0200 |
commit | e83fc684a583140ce30644a7062f8470880fdf43 (patch) | |
tree | 6c2a2f52da54d58def135757fcb5f14db8dd8a20 /app/assets/stylesheets/pages/todos.scss | |
parent | f70c000924c82bc579310fe784a6df159d15618b (diff) | |
parent | 6f0c503397e184d2a68eec8d4285288abc29ce9a (diff) | |
download | gitlab-ce-e83fc684a583140ce30644a7062f8470880fdf43.tar.gz |
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
# Conflicts:
# Gemfile.lock
# app/helpers/todos_helper.rb
# app/models/todo.rb
# app/views/projects/edit.html.haml
# lib/gitlab/import_export/import_service.rb
Diffstat (limited to 'app/assets/stylesheets/pages/todos.scss')
-rw-r--r-- | app/assets/stylesheets/pages/todos.scss | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss index e51c3491dae..afc00a68572 100644 --- a/app/assets/stylesheets/pages/todos.scss +++ b/app/assets/stylesheets/pages/todos.scss @@ -29,6 +29,17 @@ .todo-item { .todo-title { @include str-truncated(calc(100% - 174px)); + overflow: visible; + } + + .status-box { + margin: 0; + float: none; + display: inline-block; + font-weight: normal; + padding: 0 5px; + line-height: inherit; + font-size: 14px; } .todo-body { @@ -76,12 +87,11 @@ @media (max-width: $screen-xs-max) { .todo-item { - padding-left: $gl-padding; - .todo-title { white-space: normal; overflow: visible; max-width: 100%; + margin-bottom: 10px; } .avatar { |