Magellan Linux

  • Back to homepage
    • /[www]/trunk/flyspray/CleanFS-Magellan-differences.patch

    Contents of /trunk/flyspray/CleanFS-Magellan-differences.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 6 - (show annotations) (download) (as text)
    Thu Mar 24 13:33:23 2016 UTC (8 years, 1 month ago) by niro
    File MIME type: application/octet-stream
    File size: 16734 byte(s) 
    -import flyspray-1.0-beta Magellan theme
    1 diff -Naur CleanFS/templates/admin.groups.tpl Magellan/templates/admin.groups.tpl
    2 --- CleanFS/templates/admin.groups.tpl 2015-10-08 01:03:14.000000000 +0200
    3 +++ Magellan/templates/admin.groups.tpl 2016-03-24 13:54:30.258595339 +0100
    4 @@ -74,7 +74,7 @@
    5 .perms thead th, .perms thead td {text-align:center;}
    6 .perms tbody th{text-align:right;}
    7 .perms tbody td{width:100px;text-align:center;}
    8 -.perms tbody span i:first-child {color: #090;}
    9 +.perms tbody span i:first-child {color: #f50;}
    10 </style>
    11 <table class="perms">
    12 <colgroup>
    13 diff -Naur CleanFS/templates/common.editgroup.tpl Magellan/templates/common.editgroup.tpl
    14 --- CleanFS/templates/common.editgroup.tpl 2015-10-08 01:03:14.000000000 +0200
    15 +++ Magellan/templates/common.editgroup.tpl 2016-03-24 13:55:02.062195850 +0100
    16 @@ -203,7 +203,7 @@
    17 <td><a href="<?php echo Filters::noXSS(CreateURL('edituser', $usr['user_id'])); ?>"><?php echo Filters::noXSS($usr['user_name']); ?></a></td>
    18 <td><?php echo Filters::noXSS($usr['real_name']); ?></td>
    19 <?php if ($usr['account_enabled']) : ?>
    20 - <td class="imgcol"><i class="fa fa-check" style="color:#090" title="<?php echo L('yes'); ?>"></i></td>
    21 + <td class="imgcol"><i class="fa fa-check" style="color:#f50" title="<?php echo L('yes'); ?>"></i></td>
    22 <?php else: ?>
    23 <td class="imgcol"><i class="fa fa-ban" style="color:#900" title="<?php echo L('no'); ?>"></i></td>
    24 <?php endif; ?>
    25 diff -Naur CleanFS/templates/toplevel.tpl Magellan/templates/toplevel.tpl
    26 --- CleanFS/templates/toplevel.tpl 2015-10-08 01:03:14.000000000 +0200
    27 +++ Magellan/templates/toplevel.tpl 2016-03-24 14:13:24.448244769 +0100
    28 @@ -49,18 +49,18 @@
    29 <?php if (!$user->isAnon()): ?>
    30 <tr>
    31 <th><?php echo Filters::noXSS(L('activity')); ?></th>
    32 - <td><img width="160px" height="25px" src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=0066CC&amp;do=activity&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>&amp;graph=project"/></td>
    33 + <td><img width="160px" height="25px" src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=FF6600&amp;do=activity&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>&amp;graph=project"/></td>
    34 </tr>
    35
    36 <tr>
    37 <th><?php echo Filters::noXSS(L('myactivity')); ?></th>
    38 - <td><img width="160px" height="25px" src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=0066CC&amp;do=activity&amp;user_id=<?php echo Filters::noXSS($user->id); ?>&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>&amp;graph=user"/></td>
    39 + <td><img width="160px" height="25px" src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=FF6600&amp;do=activity&amp;user_id=<?php echo Filters::noXSS($user->id); ?>&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>&amp;graph=user"/></td>
    40 </tr>
    41 <?php endif; ?>
    42 <?php if ($user->isAnon()): ?>
    43 <tr>
    44 <th><?php echo Filters::noXSS(L('activity')); ?></th>
    45 - <td><img width="160px" height="25px" src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=0066CC&amp;do=activity&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>"/></td>
    46 + <td><img width="160px" height="25px" src="<?php echo Filters::noXSS($_SERVER['SCRIPT_NAME']); ?>?line=FF6600&amp;do=activity&amp;project_id=<?php echo Filters::noXSS($project['project_id']); ?>"/></td>
    47 </tr>
    48 <?php endif; ?>
    49 <tr>
    50 diff -Naur CleanFS/theme.css Magellan/theme.css
    51 --- CleanFS/theme.css 2015-10-08 01:03:14.000000000 +0200
    52 +++ Magellan/theme.css 2016-03-24 14:10:17.886604557 +0100
    53 @@ -68,7 +68,7 @@
    54 #s_loginbox:checked ~ #show_loginbox,
    55 #s_quickactions:checked ~ #actions,
    56 #menu-list a#show_loginbox:hover {
    57 - background-color: #5f9729;
    58 + background-color: #ff6603;
    59 }
    60 body a.button.positive, body button.positive {
    61 color: #fff;
    62 @@ -116,8 +116,8 @@
    63 /*.right { float: right !important; }*/
    64 p .right { margin: 1.5em 0 1.5em 1.5em; padding: 0; }
    65 /*
    66 -a:focus, a:hover { color: #09f; }
    67 -a { color: #06c; text-decoration: underline; }
    68 +a:focus, a:hover { color: #f80; }
    69 +a { color: #f60; text-decoration: underline; }
    70 */
    71 blockquote { margin: 1.5em; font-style: italic;}
    72 strong, dfn { font-weight: bold; }
    73 @@ -172,7 +172,7 @@
    74 /*$top1: lighten(#292626, 2%);*/
    75 /*$dominant: #2C6FB2;*/
    76 /*$dominant: #A82F21;*/
    77 -/*$link: #0066CC;*/
    78 +/*$link: #ff6600;*/
    79 /*lighten(#F9F2F2, 1%);*/
    80 /* ----------------- MIXINS --------------------- */
    81 /* ------------------ HELPER CLASSES -------------------- */
    82 @@ -205,8 +205,8 @@
    83
    84 /* ------------------ STYLE -------------------- */
    85 body {background: #f9f9f9; /* direction:rtl;*/}
    86 -a {color: #336699;}
    87 -a:hover {color: #6699cc;}
    88 +a {color: #ff6603;}
    89 +a:hover {color: #ff1103;}
    90 #container { min-width: 1000px; position: relative; text-align: left; }
    91 #content { padding: 10px 20px 10px 20px; min-width: 660px; }
    92 #footer {
    93 @@ -216,12 +216,9 @@
    94 text-align: right;
    95 }
    96 #title {
    97 - background-color: #3c4041; /* fallback/image non-cover color */
    98 - background-image: -moz-linear-gradient(#3c4041, #242627); /* Firefox 3.6+ */
    99 - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#3c4041), to(#242627)); /* Safari 4+, Chrome 1+ */
    100 - background-image: -webkit-linear-gradient(#3c4041, #242627); /* Safari 5.1+, Chrome 10+ */
    101 - background-image: -o-linear-gradient(#3c4041, #242627); /* Opera 11.10+ */
    102 - /*border-bottom: 1px solid #6cab2e;*/
    103 + background-color: #404040; /* fallback/image non-cover color */
    104 + background-image: #404040;
    105 + /*border-bottom: 1px solid #ff8811;*/
    106 /*border-bottom: 4px solid $dominant;*/
    107 margin: 0;
    108 }
    109 @@ -268,7 +265,7 @@
    110 -moz-border-radius: 4px;
    111 -webkit-border-radius: 4px;
    112 background: #dddddd;
    113 - border: solid 3px #5f9729;
    114 + border: solid 3px #ff6603;
    115 width: 218px;
    116 overflow: auto;
    117 max-height: 25em;
    118 @@ -302,7 +299,7 @@
    119 #projectselector { /*margin-top: 3px;*/ margin-right: 10px; }
    120 #projectselector button { margin-bottom: 2px;}
    121 #projectselector option[selected] { font-weight: bold;}
    122 -#pm-menu{background-color:#222; border-bottom: solid 4px #5f9729;padding: 0px 0px 0px 10px; /*text-align:center;*/ }
    123 +#pm-menu{background-color:#222; border-bottom: solid 4px #ff6603;padding: 0px 0px 0px 10px; /*text-align:center;*/ }
    124 #pm-menu-list {list-style: none;display: inline-block;margin:0;}
    125 #pmcontrol{display: inline-block;float: right;margin: 6px 20px 0px 0px;}
    126 #pm-menu-list li {display: inline-block;}
    127 @@ -313,8 +310,8 @@
    128 #pm-menu-list a:hover { background-color: #000; border-left: 1px solid #000;}
    129 #pm-menu-list a.active {
    130 border-left: none;
    131 - border-top: 1px solid #6cab2e;
    132 - border-right: 1px solid #6cab2e;
    133 + border-top: 1px solid #ff8811;
    134 + border-right: 1px solid #ff8811;
    135 }
    136 #pm-menu-list li:first-child a {border-left: none;}
    137 #toplevellink {background-image: url("img/gray/folder_stroke_12x12.png");}
    138 @@ -373,17 +370,17 @@
    139 a.button.disabled{background-color: #f2f2f2; border: 1px solid #a1a1a1;color: #9e9e9e;}
    140 a.button:active, button.button:active {background-color: #6299c5;border: 1px solid #6299c5;color: #fff;}
    141 body a.positive, body button.positive {
    142 - border: solid 1px #5a8f27;
    143 - border-top: solid 1px #85cb41;
    144 - border-right: solid 1px #85cb41;
    145 + border: solid 1px #ee7703;
    146 + border-top: solid 1px #eeae70;
    147 + border-right: solid 1px #eeae70;
    148 }
    149 a.positive:hover, button.positive:hover {
    150 - background-color: #78bf34;
    151 - border: solid 1px #5f9729;
    152 + background-color: #ee7703;
    153 + border: solid 1px #ff6603;
    154 }
    155 a.positive:active, button.positive:active {
    156 - background-color: #529214;
    157 - border: 1px solid #529214;
    158 + background-color: #ee7703;
    159 + border: 1px solid #ee7703;
    160 }
    161 .button.img.delete {
    162 background-image: url('./img/red/x_alt_24x24.png');
    163 @@ -459,7 +456,7 @@
    164 }
    165 .progress_bar_container .progress_bar {
    166 height: 100%;
    167 - background: #5f9729;
    168 + background: #ff6603;
    169 border-right: 1px solid #2d4713;
    170 position: absolute;
    171 left: 0;
    172 @@ -467,11 +464,11 @@
    173 border-radius: 3px;
    174 -moz-border-radius: 3px;
    175 -webkit-border-radius: 3px;
    176 - background-color: #acdc7d; /* fallback/image non-cover color */
    177 - background-image: -moz-linear-gradient(#acdc7d, #78bf34); /* Firefox 3.6+ */
    178 - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#acdc7d), to(#78bf34)); /* Safari 4+, Chrome 1+ */
    179 - background-image: -webkit-linear-gradient(#acdc7d, #78bf34); /* Safari 5.1+, Chrome 10+ */
    180 - background-image: -o-linear-gradient(#acdc7d, #78bf34); /* Opera 11.10+ */
    181 + background-color: #eeae70; /* fallback/image non-cover color */
    182 + background-image: -moz-linear-gradient(#eeae70, #ee7703); /* Firefox 3.6+ */
    183 + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eeae70), to(#ee7703)); /* Safari 4+, Chrome 1+ */
    184 + background-image: -webkit-linear-gradient(#eeae70, #ee7703); /* Safari 5.1+, Chrome 10+ */
    185 + background-image: -o-linear-gradient(#eeae70, #ee7703); /* Opera 11.10+ */
    186 }
    187 .progress_bar_container span {
    188 text-align: center;
    189 @@ -555,7 +552,7 @@
    190 border: 1px solid #e1e1e1;
    191 border-right: none;
    192 /*border-left: 1px solid lighten($top1, 30%);*/
    193 - border-left: 2px solid #78bf34;
    194 + border-left: 2px solid #ff6603;
    195 }
    196 #controlBox {
    197 border: 1px solid gray;
    198 @@ -709,7 +706,7 @@
    199 border-bottom: 1px solid white;
    200 border-right: bottom;
    201 /*border-top: 1px solid lighten($top1, 30%);*/
    202 - border-top: 2px solid #78bf34;
    203 + border-top: 2px solid #ff6603;
    204 z-index: 5;
    205 }
    206 #submenu li {display: inline;}
    207 @@ -881,7 +878,7 @@
    208 -moz-border-radius: 3px 0 3px 3px;
    209 -webkit-border-radius: 3px 0 3px 3px;
    210 background: #ddd;
    211 - border: solid 3px #5f9729;
    212 + border: solid 3px #ff6603;
    213 right: 2px;
    214 z-index: 200;
    215 min-width: 240px;
    216 @@ -971,7 +968,7 @@
    217 hr { /*color: $box_border;*/ border: none; border-top: 1px solid #e1e1e1;}
    218 .perms{display:inline-block;vertical-align:top;}
    219 .bad{color:#900;}
    220 -.good{color:#090;}
    221 +.good{color:#f50;}
    222
    223 fieldset.advsearch_misc input {vertical-align: middle;}
    224 fieldset.advsearch_misc label {margin-right: 10px; white-space: nowrap;}
    225 @@ -1248,7 +1245,7 @@
    226 color: #333;
    227 }
    228 .autocomplete ul li.selected {
    229 - background-color: #5F9729;
    230 + background-color: #ff6603;
    231 cursor:pointer;
    232 color:HighlightText;
    233 }
    234 @@ -1323,7 +1320,7 @@
    235 /* typical colorings for task type and permissions */
    236 .fa-bug{color:#c30;}
    237 .fa-star{color:#ee0;text-shadow: 0 0 1px rgba(128, 0, 0, 1);}
    238 -.fa-check{color:#090;}
    239 +.fa-check{color:#f50;}
    240 .global.fa-check{color:#990;} /* got permission by global settings, not project settings */
    241 .fa-ban{color:#900;}
    242
    243 @@ -1387,7 +1384,7 @@
    244 #footer{border-top:none;}
    245 #toolboxmenu {float:none;text-align:center;}
    246 #toolboxmenu a {width:31%;display:inline-block;margin-left:0;border-bottom-left-radius: 0;padding:6px 2px;}
    247 -#toolboxmenu a.active {border-top-right-radius:5px;width:31%;padding:6px 2px;float:none;border-color:#78bf34 #78bf34 transparent #78bf34;}
    248 +#toolboxmenu a.active {border-top-right-radius:5px;width:31%;padding:6px 2px;float:none;border-color:#ee7703 #ee7703 transparent #ee7703;}
    249 #toolbox {margin:0;padding:0;border-radius:0;padding-top:10px;position:relative;}
    250 #controlBox {position:relative;margin-left:140px;}
    251 h3 {padding-left:6px;}
    252 diff -Naur CleanFS/title.png Magellan/title.png
    253 --- CleanFS/title.png 1970-01-01 01:00:00.000000000 +0100
    254 +++ Magellan/title.png 2016-03-24 13:16:22.355290151 +0100
    255 @@ -0,0 +1,29 @@
    256 +PNG
    257 +
    258 + IHDR,$;sRGB pHYs  tIME ,EAIDATx]?pWwI$^$˙4XWb$.0 &v2@(AHrxMdHT<yY]ݻ+ ya4սsW_q̀s.^\$0LmLYY9:E$J^8Nqـ8p 80f8O4 {4E84qic78VQuWRu۶G6"]iǧIplsssFarx2==D/4MgE5 8h4H$cb:貱p݅K4c̲,4IH۷˗/Q5MC=AvΝP(p?r6HH!iM
    259 +(xtdcQy(“gώѱh8*dIŜrfY1 Gi. ppyKtM4ƙPXsr6/4ԑ]t>Ѽ4]ט1ңkiKI@ǩp&QRGahD:xyǢ~
    260 + K,Z(ι|c9$?ap"Ohn,]4$@y
    261 +},}P~|;'0T# E/Ԥ%q(̀֋ZU8%Nj 'S)ݚtٖa\B;.VSE`Vēd&Ĝ\mP(<(?'yhڶ}̙/NLLnPh6\i,L.,,D"hfTVHR)<TkZa8ubt:=55E6 R~T:L&jPW%5u >|HdQ}r^/Jab#ȣG|>akkkP(N' LAifY.KeYun޼rceff...Z--EQi]iŷor`xΝ;>\.߽{?qX,JMMMq[V\~FoN$N~j5>~4o޼'bR t]ڊb}S 1fWVVDQK$<u]2! dB͍H$f۶?F $L&љ\.7??
    262 +ɓ' t:jsr>t7(h4矻c5fl6J$Of!h4S]E qp:5B0L&sߟL&t޸q#ͪz ~uAo䳵_Q 8s~4ĉD∓vǦbzA,cJV rpv5]]fD@v^ @ l Iv.~MR$"warmAro_? (8M%Q{
    263 +
    264 +,ӏ@ @3'^d2dҋ
    265 +*O0W-ކ@6%C3Ivɛ ?;vO'dQ-˚$ORX(tjZV4%dLӄ^ !~<X$:ԋb&!Rv:z9oۆa೺mߏF(ϟ?{l,iw:P(Fc/Ij199)j2.cl~~X,uڵӧOժH7\d2Y*N\ /,,*v٤|wuoהqƝqHfyppB'D0xSCPSuu/i^f\.5=xLӼu\.j hQ:xX[[S1C$ŋoܸWLӌD"....vV 8Fٹ{n*r
    266 +^ ÔF/ Wirr2@ @ ?yqͶR$ wuuuzzBΝZMb({J( 70 c}}]0*KqvtP|͛7PYYN&bѲ,}%ƑE3OCKFfT*jZRtgXee
    267 +~?ƀBd0Z@N8
    268 +aYLE vu!&xi<
    269 +%Id*Mqn3`Dd HhpE^"% }7*jV1 @h.5 DrO8,*JDVRPY%N^TB\.g*DFA-L@VG:-X aP8+g KՎt:}f)rINHY?0z\.fRu*Ź 0 OPe:Z!u8rV*}2R݄1 vR4 
    270 +U'w9O}Z&'bZ޻wb&H kpp5\y qCr@zV#Uh4*i<bٔPмC[dg߿論|K'FU;Π\HkiN [j4&ٶڝw޹4' m`RߗSH7JH4MStq"?>dp8<77'PeYB Ĩ!["RT -*
    271 +FZIX_B0
    272 +q?*Ұ{=ӜYtD.Lf=uAg"0i?,̭IC<T !r\cgjf3@L -޽{{&\G0 ?Wva?>C YT`KoY7|%oڶ4=nSPj3=`3g596/$uVun)yR&Ujaк?D,fMHb(b fܹs;Z#IR O_tt:߰PB.i48-Z\\urla0YP)73fgg21R˥%_FAc&A`xhc8* L&Nyޏ#333i⊤V,:T*e.g2nxg8 ٵ&MõcJԩS!Es.N=iHJW޻w\D""ILRn޼TǏä"C't:y# VWWDp8|YߝAAɓ'XDjb12?C70E4zz?DrxxHcPgwwwI7D"pz"_x\.W;f2+m>D@FgwwwvvlmmnRP]\&4??jHɷ:1n۝NsD";9eap1M%bxh>Oau: :<͛7rg6wdHe&Hp5ރ3ECqZ(3RVU Y777>|Yq_l7O|>PaB@5|>/v؉ׯ_SSSdhiu:<_ /֯7盛nT*>aHvwvv>e >-v{JF;FYGK6i *XvٳgW\~>..}N+kuI.0` = =V cP'Bj֭[IYT*
    273 +]_+\m cydiׯ_TqZuݍ7Ū-("
    274 +ec6M2KH3seYb Zp1<g&{<)>`a?`XUE VZP(T:V/_J[0t:_fg΃(QVK ױ'Ay?y8u]Š:h4pb.\Fx/p`ad2I͓yj^Bٖ
    275 +ǭVT*2b[4e2MTKY^pA,\(WF?P0 4mu^W*r [Oi$=A#[(5ݎ'''-70`Lܷi;"-
    276 +yRqwZW#~bKIW
    277 +މ{^EZnc ؆bO~o856̵-zc8ס꧸P{MXdNer.UBlצj
    278 +%#P(QT >dnn4вz.2uq UD T"H^%^w*pXUC\ej?$ՐTRYܶ\:1w'T*<5UZ'Qx9::z$X,DhTA}nji3wuk(`{ߕ, _x9J2{E@=+GT-H!5~unt(RdBQO5CDG~k<qL~MMlp+z>秴~kp?))I1pYBDs
    279 +
    280 +(1rGGlȒBeqIv+"
    281 +WxRU]p|\ZUu i/a^"|rqqeJ)wv[C\64Rṷ2yuީ6^m
    282 +*56үHfWJDDUxU\ ]5zK7+o7<?ٶ=11oXqzVլ;Ȥ2@o~n9-aX#Uz QB~5* AbLK?1J(z@h`ύ뺼!Z7I{(x?rƫ#G]\^Pp
    283 + y;@u1O8>ǿ{|1V1>ǿ?\?@8
    284 +IENDB`
    285 \ No newline at end of file

    Properties

    Name Value
    svn:mime-type application/octet-stream