From b2adb6ab92a32cc129d605f467d612de3dab3751 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 16 Nov 2022 09:32:02 +0800
Subject: [PATCH 1/3] * Fix bug #29839.

---
 module/action/lang/de.php    | 2 ++
 module/action/lang/en.php    | 2 ++
 module/action/lang/fr.php    | 2 ++
 module/action/lang/zh-cn.php | 2 ++
 module/project/model.php     | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index 40ccd09b94..d481dba4de 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr                     = '$date, <strong>$actor</stro
 $lang->action->desc->mergedmr                     = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
 $lang->action->desc->approve                      = '$date, <strong>$actor</strong> approved.';
 $lang->action->desc->reject                       = '$date, <strong>$actor</strong> rejected.';
+$lang->action->desc->linkedrepo                   = '$date, <strong>$actor</strong> linked repo $extra';
+$lang->action->desc->unlinkedrepo                 = '$date, <strong>$actor</strong> unlinked repo $extra';
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index d81a9e8162..4b3f27e21c 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr                     = '$date, <strong>$actor</stro
 $lang->action->desc->mergedmr                     = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
 $lang->action->desc->approve                      = '$date, <strong>$actor</strong> approved.';
 $lang->action->desc->reject                       = '$date, <strong>$actor</strong> rejected.';
+$lang->action->desc->linkedrepo                   = '$date, <strong>$actor</strong> linked repo $extra';
+$lang->action->desc->unlinkedrepo                 = '$date, <strong>$actor</strong> unlinked repo $extra';
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 764d4f04af..262e31e96f 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr                     = '$date, <strong>$actor</stro
 $lang->action->desc->mergedmr                     = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
 $lang->action->desc->approve                      = '$date, <strong>$actor</strong> approved.';
 $lang->action->desc->reject                       = '$date, <strong>$actor</strong> rejected.';
+$lang->action->desc->linkedrepo                   = '$date, <strong>$actor</strong> linked repo $extra';
+$lang->action->desc->unlinkedrepo                 = '$date, <strong>$actor</strong> unlinked repo $extra';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 35745a10ac..080aea9711 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr                     = '$date, 由 <strong>$actor</
 $lang->action->desc->mergedmr                     = '$date, 由 <strong>$actor</strong> 合并了 <a href="$extra">代码</a>。';
 $lang->action->desc->approve                      = '$date, 由 <strong>$actor</strong> 审核通过。';
 $lang->action->desc->reject                       = '$date, 由 <strong>$actor</strong> 拒绝。';
+$lang->action->desc->linkedrepo                   = '$date, 由 <strong>$actor</strong> 关联代码库 $extra';
+$lang->action->desc->unlinkedrepo                 = '$date, 由 <strong>$actor</strong> 取消了项目与代码库 $extra 的关联';
diff --git a/module/project/model.php b/module/project/model.php
index 472a23d353..d7ebfe59f8 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -3086,7 +3086,7 @@ class projectModel extends model
                 ->set('projects')->eq(implode(',', $newProjects))
                 ->where('id')->eq($repo->id)->exec();
 
-            $this->action->create('project', $projectID, 'linkedRepo', $repo->name);
+            $this->action->create('project', $projectID, 'linkedRepo', '', $repo->name);
         }
     }
 

From 4d90d01042291df16f75d35f54b9f2ac745f8bcc Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 16 Nov 2022 09:38:27 +0800
Subject: [PATCH 2/3] * Fix bug #29835.

---
 module/execution/view/linkstory.html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php
index 05e7db5875..bc1af1e745 100644
--- a/module/execution/view/linkstory.html.php
+++ b/module/execution/view/linkstory.html.php
@@ -65,7 +65,11 @@
           <?php echo html::checkbox('stories', array($story->id => sprintf('%03d', $story->id)));?>
           <?php echo html::hidden("products[$story->id]", $story->product);?>
         </td>
-        <td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
+        <td>
+          <?php if($story->pri):?>
+          <span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span>
+          <?php endif;?>
+        </td>
         <td class='text-left nobr' title="<?php echo $story->title?>">
           <?php
           if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";

From 41ecdd3e891c24bb757685ad92162fa2a9e37823 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 16 Nov 2022 10:00:57 +0800
Subject: [PATCH 3/3] * Modify severity style.

---
 .../images/severity/severity-sprite.png       | Bin 5660 -> 5586 bytes
 www/theme/default/style.css                   |  34 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/www/theme/default/images/severity/severity-sprite.png b/www/theme/default/images/severity/severity-sprite.png
index e589db598d7f55dc5d0212fe6a54ed97a4a799f4..d1769864449546accd911e0e8bcfe0c47012fa85 100644
GIT binary patch
literal 5586
zcmZu#WmFS@w?{#m35X(Hqf1Jpgu#G~l+h^Nh;$1BX^_|kf^>}<J-S3GX&4<MN=PFm
zqkaC*dtcr=@54R6Tc7SZzk7c7#=X!{ry^%0Cm<l8f<nNsf5=Zja7T%h_@BqIXE^Z>
z$UGpX-UI}Xxc_5!pfKR!zvLZnn7T4S^%(Q^zktXQqzxh<s7t1}w!TL|@X!$o1{nn0
z**7;&0M7V6-!$?ar>xB9>N~QjfxPtWJy;w9xbtBfv@0KT+4&JGpNly;rbSsn#3O7~
z;jtfc4OzMNU5Q@Xot4tlekR)+p|-APLOP@659!8_YoDPWFgmmIAyH40<}<c2ZO`#F
zZJ2gUdl070pL>pX)Muuut7cpV|IPcif-e(0;h|S+uY2o;<`dwP0fMnVbE0xhH+f4}
z_^w|3{?(g-#~BDorQR5pe#WYsD|&VnJ5?-NQSrlHnhM~|gX|`DLOWG2*!2lD8?TL~
zO&0oc6NsbdAVl*(X|p7kguk}#1$~EwZS{bCXkeV3Kp90oMFNqRv9M)OVee_i?5B`W
zQhr1xQ2gmVlwhc|iAZd?$XY_qs`Sb=lTCZ0|8EfL!1CiwK}rYK-#z2Gz>dzI%^X?m
zO3~ju*naE6LgTKey=eja(BG2A*K=LmzQ*N{$u+>vDAl;{%D((Tz;|NkRN2i{mgVj7
z@A))e=)O&B-#il(n5nazVAvP)^&+E1pV`+{CD%g8$TOtVISCmVnhd;jRWzPSM|%$o
z#}sDQ*Zcpr)|o^|doI84Jop*-9S`Kk?4ws#s91}zG1)g)T@=m`ui;FZG1JE#{3%Uk
z#e6Pejp9uIdhd|xBQ~EANd5i(hDx4G>yDoWZDSGfaHhEZz5YiHbkY-^77;}GqD5o2
zd-#p#tL?8^F~h(}rU5z^PnX|N@iN%uENcDiQ;4_0)1uswD-9g)cAK(GUS`N?$6Q&|
zWoj&I%2li-S7;CsF}Je;#vS(kcE}ijuuN?<G<bxei$n8`8z+5w)4s^$r2hm4=h4Wl
z14h73<L*xX`9+MBCngLRKwQA+BN*B7+y~q@{8IIyL{KO(`muo{^gwQmu$B-~9%mGL
zf{;eI%$ZqdkNfMzwVA$%ulDSZenO+=5`$FgXxRuf7kSULYEXAx)eHw*B2SAUD*&05
zfduveqpbuoaQH-1`Q22b-TTTuZEmy;s&nQ;C@V#$!a^8a*u>30cfi+x3(W_?J+Gyq
zrbC#in6`#K2tuM$1Xd%^fyh|$&?XR(HE_Z~NfJ-=UPX6KuW7HwRUItFMf83dG~9-B
zRcF9Ye7T?s+6|59<C?S;M`YrMsm4|)(qbU6t4oUd{id#&t+0SB&hFhWtJH(ab@PYK
zH25A;P~AHhfXv@%wP4-=A=eZEm+Ij+{caI7;X7fjfWeCE$D)?s0j#@CP+^y2Q*|rw
z1T59<Ykj55=8*`>uPz|`d8RnEDzmJfi_qCQj3~hOx)XoPa*0e8m;>Eo$u7<Jxlc(}
z=(U*rmpYYBnmiYOQ+C2>jzI9VMnoeVzBE~~5bJ?z2j(lv1j}~Y)Q@iPijinwl;q3m
zx9vcU6|9x1;@N9UV(Q-hX$5W&Z8z>H?`BVV@1oO<CnyT+k?2}1bjGjIx+Oa%_RYGM
zqgdTfXD;ir(W&RBm%)E;raG&4<=_LnyqY={+?UJnUZMVw*u&R!Ocq*`!KgMjuA`6$
z{x=`hRxS6dsu->>#{U+r{D~uxQ9T6h$N(JnO100$FPf<6%%^@N%B-j`&KDUjx^+@#
z`Ha?ehv0KQyUauoJq`di{h6sTiVY)8D2=st4%6J-Y8yAp%5t|Y!ZH77^Xcgee*)bl
zK#D}1s~DhV++l$!T0a$zBiKy3uI)o!*vNRT4<NbJlbHXvLv%ggLvp?v5n~M*a7df=
z23Ol98nc~SJ+`aQ)esTH-e=vMDF;Pk-f{|}>~Bns**KdWU4;b;%k?V*eWPPtZ}S$t
z-HW%EBP3@q^;YMypJ(??%%M^ixfUqb-LQq;9mVRk?qr=XXbWLB(PKpbKT_4tN7a2s
zn?|I=t6H1R;e7SR8*!Hb0nRbzH&}`WlAG-_W3Fr1P|*J1qXL!nd$S|A6VS<?AsZXr
z{lLw(@y8G14yia_-c@&e%|U-=T5#hF-@7G55IA!?dxbD{v&!AKX`ChcwX{j6c=iKy
z*e|kuLmSY70vF2hl%vZw8E7gzH-Adh#G;eiz8wV^(z+LE(VA~>VlH`EMW0K4t-y==
zE3yD0j+3eELpyU<L*vK|3sqR8IlVJXAgU;bk<wtp3{DPJ4CM~P5$x2NsCeP5KpU&8
zpfI`_foF?Fdrg}av*wX8n@#226mLn`3kFqGQW&9i-()EZ>+E-O$Grs281yQBI{zI0
zmp#jnoj*XY1?@nzZECJl-?8Q$k+R;wI4?+X<yygjIX4y!B_-n!r1Y|!X*oQ`2!uBN
zO!tPpjg+*7?jS0dMNUUl(ma07e6b{6J;0Q7(2B4r7NDVSWM2WiJPZh%qP5SmMxm#Y
zdjyN=v)jL4waByEcir1n5x4SB^w>Alqe9<l<$`&3RxsmI4P{w^8-Ow+WfTQ!p;V;Q
zT1<Y<{&f1)f@!-X!Z;vd(>%fZ87y#~&B9z^EGyCiIQYo%)X03+A~}?_NlGd>9HpZY
zVpA5qMB`|5S}N(b&8c>ehQqVf5b!8w%Dw`BueYNWFh|<G<It4HqQLmaFYL<2jp%(%
z`JR(vSieUq8xOxgoQy&b+?zIXRX-^`{A+jIS1iiOvX6&0>MY|9F484Y$C0hTP1t2T
zD_pN|nQ~6<zHf?a%nOMkSfKj3@xDCk&k^l!ye^C2688>u4(1K@m{4So5LUvyJ2?77
z%h}Th;Q~YSdEJk?=zJ}FRz3MD@kY^N*>liZ<J6TN-6Y+J?RiJ}Y+kP5&v^pjc4i~F
zI}bPT%!X534mO{i)#wM$#XUDGPT*c1O0%o+p^7N0E;mSFf#RE@!Yk7=caf2I)>V0(
zLj<!?{4-Jj9^v<p;MZc%ldOPX*b<^_UxG$`?t}V|QNNGeD3qybNc4-+uD*dSdEr57
zQ=DvBOFilk8=Y`0(;-1B6G5pK#8wuzC!rGXBd#Y#qs@57n7eT3{~_={N>d_&sAuwh
z;doG;yv93Qmftruy%)+*#Dal%x~XVoQ{s!2SGU2KktrR!=PQX}_Wf1G`zO*>M|18P
z*>4sp7Le;&I%P$9D-jPlW`trLlu@GTnhpYX6is<0S@AyoB?t^Ks43NjM>tD$u1Y)f
zZs^?U-^wL?a0mH4v5>;pCbw*pXu1Kl<!ZCQG}0Muy`z_G=E_Sm53Wq0`WaZg=1f!(
z<3SYmg4{p!7_d;5jWYVM-Hh(dIk9}!;Cowg|33tG``bfb-fd-y66n_0JnBAG=Tv#&
zSZd;8Z$_dB4ovJk$o_j>03U~lLf>mjksGd=<8+wcxLddzMox*|9;w4M5=o4z@<<@f
z2Iqq9eLl+x^S|D0q{(qi1Imm(txbF=d$qH9hZgB79BK`kf8p3_Xh*U0WrFYfiQc%3
zM}t-q`NjB2yGjP>q~Y=t&qtGp_0NK<YM?6`7YP`6E3cm=l}Eu3x=hbFR63+)B``*K
z%FS;$G$UIsf@KKwhEbJQmAC-}Z_rK?X(eWpsnt~!d5nhyGklGB?!o>q##AoYCFxiG
zMl(*Xi+u+V<JZ`W86azFF@vIxD%N`G>Df%xSxm8L1Sd@v8Qq7bG=EV9k=EHv@T<fm
z!W|;pf}QRVCSTL1%TAf!tdpLs@Q>yKKhV`N2ay^xycj6RG#CZVv!^GeVgPCMrP4aR
zP>D1&igT*sb#zVxyGaXv?aRr?7f9k<B1YwFLaJEyCXFVnJsnl~E)5#4t3DAk`s-h%
z&ul32_^)WF8<ux4KLyZA4``ew0^MWN+kg$pQZ$mDeaQt<*jmBciuTcQR!85H9j)gl
zn&K_wE}o&#BtwrFjJ0$2lPnp@KnR7N==IM*2m`&Q+o-$AgM0i{(a3PmU+o1Vs4Alh
z*QTO`E0_GYz6+jswU*4ohDWWNG2U|~<jto@`-{QF)?drRbL|s4YjBAyxHk+kSGwEt
z^cnoAHT_`Rwk{(NsYkO1ty-*Aus~2wiM*`2Q4QPv@dT5fN|cMz^xJ1SN6rn}j|?RE
z?&2z=H7-F=nqfUXxX*j8wdXTEudRbuxCLEBS0v{Ihmxz7zp#Fv-EEIabN>`_`<~?5
z$CDOfa89oY^W8H<$#Pb>b;0#_q`$Y5l9M&9P*{q7c0{@#{b2z=R8Xy!*eO?;Rq`l}
z$6w>QA$Mp3--|%lyDdc%j>_lZa=_1L$GNR%??0g4P~j>b9$eVvYr$3Bf|De<w4lEI
z&n&SEA5^p5`uj=ZVv1^nev2%9PD(K-U3?W7!CCx}^A+ByUBA0f%%dqFL+u?e$f8u%
zYsZYd1UdSs<mxL)L=8)4N2zi$`vcOhm(K`hRi)>n$8}Co7SwXA^YkcTkKO#OWP}ed
z*YV&eS0*@KAcpjD<qQxtoM6X$?o~b=zB^o&@{^^OY1P}N4Hx!*G{OI<ge^6PwG?_C
zRs|iEkrdJnzpp8!{tZGJ%;F<SX%EsLA_M=-4t`BrfuG?<945uN;+XID;DRxI`M0wt
zp{PMw69xzMia-}BP!v_h>3UlR^=Ra}ZqoRKWGo83_ESK8*AHrtYOf^u0Cg5w1@UnD
z{%4wE*B`!l(LZmrYm`^ESt-Pp$G?Ain}P5#uja{Lq%iN^*PY8$F0`w#3Cun2HTj~u
zN*75|Zn7{B#Bc}J+E(dv=n0)uSm~O}UwqVxXA~93n9R2ve#3$5yUL-rCnxInGe(r!
zP0IXP|MstmcGwQQ{V{`HG}X&h_j{$SEGY#|-({Ootqi%@@<!HIvYP2KHCh@sY(_?o
zia}4;*JAWj=o+PmqQNqTY4O1ydu(4aK;z#*5B7#$ZAcP+8&-ROw6i^XMd8_59}Q~_
zEG>X<=H+1UZR(y=G91OwMuke7jXRMi$tMKR8FL!xOuk3Kjjx_vY*|-(2axyGWx%DW
z8(FS{0VyO2iTNbdB?NLD{49;oT9pl#hRjjm4J=#O@9rDJch4>bqpL{uf28G&zf6R^
zwM3aTEMf}yZ3}3b>u0AUYCY|3j91aRdQ%*T;a#s(zw1$63u;A|YOLc&4JutNm<A=`
z0#13u_AK*7;tRb3lS-{|5$;SAJlht7Wjqy5_M*87XHXV@R2m0~M$bnZDP-wlezB7;
zRe4VmFa6@ANyU-`3(yQA=wxc50AAT$YlCbDe6>;!%bpm$+Lr&NnZY}f<fci(RB4sw
zXtaP^3Eqi%fVk`DDTKw6@mIts@s}M#P#}KdDJ;<!xm?)~vU0LxT9K*R_l}>P>ih&~
z;L4-~!*7%<Y|SN3po>VyrlL&Dd8!)KlNW`PIv|!-VtS@`2at5&oZVEUecirCuE4S&
zOF;78)-DCSjP2Cc_`#gTsu*71XKl*<rSSQ^SB7PVKWR+lq5VQ#8E>zq^|?lq;3utL
zd5Q|JMNn8vP8D9vv!$$uk2!=6waSd{Urui28Cc1p!<9V5>>`;EeiXdaP?RYg>uC%Y
z7XnMMKhG<pkmW=PP%_ZNm6pjKjMN@9<891e&<HDjYCqh=jie+|fpu}~l*2zZ;`A$W
zHcy%Jf_E>z{wgb;^JJ^0lXt(}4GjwV@mM^K9Xi1a!T%c}eM!;S?)HeiNzGKts7LNr
z7)axKc!gEwaCWfhb##8Lv0_%s^Rv-%FjuEdYWE*-x2$LdEpkX(4;RMOR!AH4EsM+#
ziUJ$|TPLB%5xhgB2g*MjmB5!$R2p@%YZf_e4|a{}=1DE4ys~M7#(?RHtlVuxCII<X
z9o*Pz&dT<(rEw`BmJds4P2jb!=@+|Ee^R_#9qbp&Rf7QY-h2wAk94l}g}q+3pLOwI
zcG?0KvBxI6yIp$z&>`LU|1OKQIpT~&-P{n*4I%otud!0U0(c!9OGz~PwxfjVi<}p!
zoXRqdTcZ>ePF9&RM$z^%E6Y03DUqF*+v!FUrro@nDA{tTPUt|Z%YUnq<Gls@&=+hk
zzwaQ`OWag*e)7iV$~I@ZgbQRnOlHszWFn=~w{~F5&6EN&tZA0s-j1^99y%)1`VMja
zz83rSDAbI)w2Jn`OiEu1C7LILS6lgzB*6u}FXWk`K7A|ZM8;t_CY-`-EORx98KSJ+
z3jS4<&C|?X{TrV!4TR1pbFP9$xmG^4zh*qgsekev1cE%Vy3irR;dGSDNWi1BoD!WH
zH-nV3oZXUWrLmmbVO7&F4&ESj(b%&Sf;dPnd^-;SUYKCedp&wL+@!4EToi(o^!1a>
z`)yEnNYI%birsTM7)zm=Y1=Cm?pwsUugtu~K4;f<v-Kzr`0zL4yGC{h&nr1IBg%3C
zeICP9rFdeHb9h@G^-o#ZYd@9eW6!Tp@+ZekBujRw6*L%7juNMUswF=opEGfo=HzpQ
zMxMsn@qdD3Jju_gWF<_+^!yn?O$n)T$Qe>4&Rf7Ysyr*?{+rg2_1aT%40ERdr810q
z$0Vc$Of!~A&Yu4h+f7MHt|_{!g;r*)y=LpE@zJQ~g^nlH(iC5o#6)S>NRfD~7qqKl
zo%DNiXf}NRB-H-9QpjI|>)C?>TKjlNUaJ#Pf$xc900qLMgI3zjw!hag?p)s}o>ac~
zH=_jM;+4pI7sT9J(+3pzrR_~Qosj%(NK~qnS$kam+X6;~oHQ%Zt@vUaz4Z`mk#8b^
zp*cpPK3QwddO&G<Sls)&oLuG=%%Hz2F$lPTJDrHO`dq8-*C1)K-@!lhDSiQ`067*L
z9#7(7YRz20!O=dW_UaLJs^xxB2luL*zg1+iyeSNJS=cEN(m+wwBTG&i9yraF&T1_C
zt<5E+aeVM2Oxx7@LQ3NiBKT!XVUb56g=JJ-O`LAznLOR3YN^N4tz6v)p|3tcAT{Is
zo~{LtA{r>{nY-6krW3fC!!{f4`KRS*RPU!{C4~)uUK98p-#P?bXtXxu#8DOa1zEW2
z`$)1qH2=e#m)bb`XU8i>rKg^}T)BZg(vQzVfr*mDwx|d$onmgv(@w$N_pl;+p;6M#
z-uUC-^dU?!d?(=UK&CN!&+L0P((-suHn)eg{@rNvrM=p-#}Cbg<gDA03Ckgj*%xwR
zk?Ngbm8VJ{IjX&NKUsg9-r%kcAXE6bF7UK6l2vH-iGODwuxD0|QG(tMd2(@Xw`MZ%
zsaY<+70ozr?C=>tYh9qM*n3j&eb+hcT1MvgBwzTiifGF_o3}jo9%<Z3`1gV(fU4?%
JtCg+7{|jP1!j1p{

literal 5660
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

diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 42b28041f7..3688826f8f 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -195,35 +195,35 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
 .label-pri-4, .label-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}
 
 .label-severity:before {content: '';}
-.label-selector > .label.label-severity, .label-selector > .label.label-severity.active, .c-severity > .label-severity, .pri-text > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; background-size:cover; border: none; height: 26px; line-height: 32px; background-position: 0px -165px; color: #9EA3B0;}
-.label-selector > .label.label-severity[data-severity="1"], .label-selector > .label.label-severity[data-value="1"] {color: #FB2B2B; background-position: 0px -1px;}
-.label-selector > .label.label-severity[data-severity="2"], .label-selector > .label.label-severity[data-value="2"] {color: #FF8058; background-position: 0px -41px;}
+.label-selector > .label.label-severity, .label-selector > .label.label-severity.active, .c-severity > .label-severity, .pri-text > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; background-size:cover; border: none; height: 26px; line-height: 32px; background-position: 0px -162px; color: #9EA3B0;}
+.label-selector > .label.label-severity[data-severity="1"], .label-selector > .label.label-severity[data-value="1"] {color: #FB2B2B; background-position: 0px 2px;}
+.label-selector > .label.label-severity[data-severity="2"], .label-selector > .label.label-severity[data-value="2"] {color: #FF8058; background-position: 0px -39px;}
 .label-selector > .label.label-severity[data-severity="3"], .label-selector > .label.label-severity[data-value="3"] {color: #FAAE1A; background-position: 0px -80px;}
-.label-selector > .label.label-severity[data-severity="4"], .label-selector > .label.label-severity[data-value="4"] {color: #B89664; background-position: 0px -123px;}
+.label-selector > .label.label-severity[data-severity="4"], .label-selector > .label.label-severity[data-value="4"] {color: #B89664; background-position: 0px -121px;}
 
 .c-severity > .label-severity:after {top: 9px;}
 #legendBasicInfo .label-severity:after {top: 8px;}
 .kanban-item-bug .label-severity, #legendBasicInfo .label-severity, .c-severity > .label-severity {height: 28px;}
-.kanban-item-bug .label-severity, #legendBasicInfo .label-severity, .c-severity > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; border: none; height: 26px; line-height: 32px; background-position: 2px -136px; color: #9EA3B0; background-size: 83%;}
-#legendBasicInfo .label-severity[data-severity="1"], .c-severity > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px 1px;}
-#legendBasicInfo .label-severity[data-severity="2"], .c-severity > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -32px;}
+.kanban-item-bug .label-severity, #legendBasicInfo .label-severity, .c-severity > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; border: none; height: 26px; line-height: 32px; background-position: 2px -133px; color: #9EA3B0; background-size: 83%;}
+#legendBasicInfo .label-severity[data-severity="1"], .c-severity > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px 3px;}
+#legendBasicInfo .label-severity[data-severity="2"], .c-severity > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -31px;}
 #legendBasicInfo .label-severity[data-severity="3"], .c-severity > .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 2px -65px;}
-#legendBasicInfo .label-severity[data-severity="4"], .c-severity > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -101px;}
+#legendBasicInfo .label-severity[data-severity="4"], .c-severity > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -99px;}
 
 .kanban-item-bug .label-severity:after {top: 9px;}
-.kanban-item-bug .label-severity {background-position: 1px -147px; background-size: 90%;}
-.kanban-item-bug .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 1px 0px;}
-.kanban-item-bug .label-severity[data-severity="2"] {color: #FF8058; background-position: 1px -36px;}
-.kanban-item-bug .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 1px -71px;}
-.kanban-item-bug .label-severity[data-severity="4"] {color: #B89664; background-position: 1px -110px;}
+.kanban-item-bug .label-severity {background-position: 1px -145px; background-size: 90%;}
+.kanban-item-bug .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 1px 2px;}
+.kanban-item-bug .label-severity[data-severity="2"] {color: #FF8058; background-position: 1px -34px;}
+.kanban-item-bug .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 0px -72px;}
+.kanban-item-bug .label-severity[data-severity="4"] {color: #B89664; background-position: 1px -108px;}
 
 .pri-text > .label-pri {padding: 1px 5px;}
 .pri-text > .label-pri, .pri-text > .label-severity {height: 20px;}
-.pri-text > .label-severity {background-size: 80%; background-position: 2px -132px;}
-.pri-text > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px -1px;}
-.pri-text > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -33px;}
+.pri-text > .label-severity {background-size: 80%; background-position: 2px -130px;}
+.pri-text > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px 1px;}
+.pri-text > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -31px;}
 .pri-text > .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 2px -64px;}
-.pri-text > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -99px;}
+.pri-text > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -97px;}
 
 .flow-block .footerbar span.label-success {background-color: #0DBB7D;}
 .flow-block .footerbar span.label-default {background-color: #9EA3B0;}