From 6145f1753bb67e7768591c7ca6855a69e3e9392e Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Mon, 18 Mar 2013 23:27:15 +0400 Subject: [PATCH] #26: update styles for issues table --- app/assets/stylesheets/design/custom.scss | 26 +++++++++++++++++++ .../projects/issues/_issues_table.html.haml | 19 +++++++++++--- vendor/assets/stylesheets/bootstrap.css | 6 +++++ 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss index c3a41966c..f5ff102a1 100644 --- a/app/assets/stylesheets/design/custom.scss +++ b/app/assets/stylesheets/design/custom.scss @@ -1860,3 +1860,29 @@ table#myTable thead tr.search th form.button_to div input { #clone-urls > .git-protocol-selector:first-child { margin:0 0 0 10px; } + +#table1 .tracker { + border-top: none; + margin-top: 0; +} +#description-top.issues-filter { + background: #dcecfa; + font-size: 12px; + color: #292929; + border: 1px solid #a9c6dd; + margin: 0; + padding: 15px 0 0; + + li { + cursor: pointer; + } + + li.list-browser-sorts { + float: right; + margin-top: -7px; + border: 1px solid #a9c6dd; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + } +} \ No newline at end of file diff --git a/app/views/projects/issues/_issues_table.html.haml b/app/views/projects/issues/_issues_table.html.haml index 4b62218c7..b34d1fe97 100644 --- a/app/views/projects/issues/_issues_table.html.haml +++ b/app/views/projects/issues/_issues_table.html.haml @@ -7,12 +7,23 @@ #blue-switch-select.selected{:style => "margin-left: #{@status == 'open' ? '0' : '130'}px;"} .both .both + +#description-top.issues-filter + .project-tabnav + %ul.tabnav-tabs + - open = @status == 'open' + %li{:class => (open ? 'selected' : '')} + %a= 'Open' + %li{:class => (!open ? 'selected' : '')} + %a= 'Closed' + %li.list-browser-sorts + %a= 'Updated' + %li.list-browser-sorts.selected.desc + %i.icon-chevron-up + %a= 'Submitted' + #table1 %table#myTable.tablesorter.tracker{:cellpadding => "0", :cellspacing => "0"} - %thead - %tr - %th.th1{:colspan => "2"}=t('layout.issues.number') - %th{:colspan => "2"}=t('layout.issues.description') %tbody = render :partial => 'projects/issues/issue', :collection => issues = will_paginate issues diff --git a/vendor/assets/stylesheets/bootstrap.css b/vendor/assets/stylesheets/bootstrap.css index 9c77d090a..e605d9fb3 100644 --- a/vendor/assets/stylesheets/bootstrap.css +++ b/vendor/assets/stylesheets/bootstrap.css @@ -828,4 +828,10 @@ a.badge:hover { } .icon-question-sign { background-position: -96px -96px; +} +.icon-chevron-up { + background-position: -288px -120px; +} +.icon-chevron-down { +background-position: -313px -119px; } \ No newline at end of file