diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-14 10:16:27 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-14 10:16:27 +0200 |
commit | ef05423f47fdd970498d880cf18f282fa0205596 (patch) | |
tree | e796066289a955ffa87863c8b6160f6cd83b5607 /app/assets/stylesheets | |
parent | 10f14136f570863c2898f429c936de6c0114206a (diff) | |
download | gitlab-ce-ef05423f47fdd970498d880cf18f282fa0205596.tar.gz |
Finish select2-ajax for users. Added Select2Helper for tests
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/application.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/common.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/selects.scss (renamed from app/assets/stylesheets/ref_select.scss) | 20 |
3 files changed, 21 insertions, 15 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f4afc354678..71068e4ae95 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,7 +15,7 @@ @import "gitlab_bootstrap.scss"; @import "common.scss"; -@import "ref_select.scss"; +@import "selects.scss"; @import "sections/header.scss"; @import "sections/nav.scss"; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 2e7df61e0a9..9afbd8fb53c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -555,17 +555,3 @@ img.emoji { display: none; } -.ajax-users-select { - width: 400px; -} - -.user-result { - .user-image { - float: left; - } - .user-name { - } - .user-username { - color: #999; - } -} diff --git a/app/assets/stylesheets/ref_select.scss b/app/assets/stylesheets/selects.scss index 284d1c324e5..a2c99d02303 100644 --- a/app/assets/stylesheets/ref_select.scss +++ b/app/assets/stylesheets/selects.scss @@ -1,3 +1,23 @@ +.ajax-users-select { + width: 400px; +} + +.user-result { + .user-image { + float: left; + } + .user-name { + } + .user-username { + color: #999; + } +} + +.select2-no-results { + padding: 7px; + color: #666; +} + /** Branch/tag selector **/ .project-refs-form { margin: 0; |