diff options
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/generic/filters.scss | 25 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 9 |
3 files changed, 28 insertions, 14 deletions
diff --git a/app/assets/stylesheets/generic/filters.scss b/app/assets/stylesheets/generic/filters.scss new file mode 100644 index 00000000000..20c6a85de98 --- /dev/null +++ b/app/assets/stylesheets/generic/filters.scss @@ -0,0 +1,25 @@ +.filter-item { + margin-right: 15px; +} + +.issues-state-filters { + li.active a, + li.active a:hover { + background: #f5f5f5; + border-bottom: 1px solid #f5f5f5 !important; + } +} + +.issues-details-filters { + font-size: 13px; + background: #f5f5f5; + margin: -10px 0; + padding: 10px 15px; + margin-top: -15px; + border-left: 1px solid #DDD; + border-right: 1px solid #DDD; + + .btn { + font-size: 13px; + } +} diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 13e09d5596f..a640a4e2051 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -45,11 +45,3 @@ .btn { font-size: 13px; } } - -.filter-item { - margin-right: 15px; - - > span { - margin-right: 4px; - } -} diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 55e648a568f..b8ad26d69cd 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -41,12 +41,9 @@ } .check-all-holder { - height: 36px; + line-height: 36px; float: left; - margin-right: 12px; - padding: 6px 15px; - border: 1px solid #ccc; - @include border-radius(4px); + margin-right: 15px; } .issues_content { @@ -73,7 +70,7 @@ .issues-filters, .issues_bulk_update { select, .select2-container { - width: 140px !important; + width: 150px !important; display: inline-block; } } |