Merge pull request #1112 from oohira/fix/margin-after-octicon

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge pull request #1112 from oohira/fix/margin-after-octicon Add margin after octicon master
commit 3a4f9b9027b2cc0964476c062e59b3540d872f60 2 parents f98c849 + 7d7d2f4 Naoki Takezoe authored on 20 Feb 2016

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
               @milestone.title
              <div class="small" style="padding-left: 20px;">
                @milestone.dueDate.map { dueDate =>
                  @if(isPast(dueDate)){
                  <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="milestone-alert">Due by @date(dueDate)</span>
                    <i class="octicon octicon-alert" style="color:#BD2C00;"></i>
                    <span class="milestone-alert">Due by @date(dueDate)</span>
                  } else {
                    <span class="muted">Due by @date(dueDate)</span>
                  }
                }.getOrElse {
               @milestone.title
               <div class="small" style="padding-left: 20px;">
                 @milestone.dueDate.map { dueDate =>
                   @if(isPast(dueDate)){
+                  <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="milestone-alert">Due by @date(dueDate)</span>
+                    <i class="octicon octicon-alert" style="color:#BD2C00;"></i>
+                    <span class="milestone-alert">Due by @date(dueDate)</span>
                   } else {
                     <span class="muted">Due by @date(dueDate)</span>
                   }
                 }.getOrElse {

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
                       <span class="muted">Closed @helper.html.datetimeago(milestone.closedDate.get)</span>
                    } else {
                      @milestone.dueDate.map { dueDate =>
                        @if(isPast(dueDate)){
                          <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="muted milestone-alert">Due by @date(dueDate)</span>
                          <i class="octicon octicon-alert" style="color:#BD2C00;"></i>
                          <span class="muted milestone-alert">Due by @date(dueDate)</span>
                        } else {
                          <span class="muted">Due by @date(dueDate)</span>
                        }
                      }.getOrElse {
                       <span class="muted">Closed @helper.html.datetimeago(milestone.closedDate.get)</span>
                     } else {
                       @milestone.dueDate.map { dueDate =>
                         @if(isPast(dueDate)){
+                          <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="muted milestone-alert">Due by @date(dueDate)</span>
+                          <i class="octicon octicon-alert" style="color:#BD2C00;"></i>
+                          <span class="muted milestone-alert">Due by @date(dueDate)</span>
                         } else {
                           <span class="muted">Due by @date(dueDate)</span>
                         }
                       }.getOrElse {

Ignore Space Show notes View src/main/twirl/gitbucket/core/search/issues.scala.html

Show line notes below