Changeset b49ab59


Ignore:
Timestamp:
Oct 3, 2009 6:07:38 PM (11 years ago)
Author:
dev <dev@…>
Branches:
master
Children:
08634c1f
Parents:
7e1171e (diff), 9ecba4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '1e5ca44c3d69e2a7712396e0ea4f43f05a201f14'

and 'afad15f1e34ff7456efc1b53fb8d8b11df49e57e'

Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/config.jsp

    r7e1171e rb49ab59  
    2828 <h3>Bandwidth limiter</h3><p>
    2929 <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
    30  </p><p>
     30 </p>
    3131   <div class="wideload"><table><tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps In
    3232        </td><td>(<jsp:getProperty name="nethelper" property="inboundRateBits" />)</td>
  • installer/resources/themes/console/classic/console.css

    r7e1171e rb49ab59  
    250250div.main {
    251251     margin: 0px 0px 0px 195px;
    252      padding: 15px 15px 15px 15px;
     252     padding: 15px;
    253253     background: #eef;
    254254     border: 5px solid #bbf;
     
    393393h2 {
    394394     font-size: 14pt;
    395      padding: 10px;
     395     padding: 0px 10px 10px 10px;
    396396     border-bottom: 5px solid #bbf;
    397397     border-top: 0px solid #bbf;
     
    415415     border-collapse: collapse;
    416416     border: 5px solid #bbf;
    417      margin: 5px 0px;
     417     margin: 0 0 5px 0;
    418418     cell-padding: 1px;
    419      font-size: 7pt;
     419     font-size: 7.5pt;
    420420     background: #fff;
    421421     width: 100%;
  • installer/resources/themes/console/dark/console.css

    r7e1171e rb49ab59  
    206206div.warning {
    207207     margin: 5px 20px 10px 240px;
    208      padding: 0px 25px 20px 75px;
     208     padding: 5px 25px 20px 75px;
    209209     background: #005;
    210210     border: 1px solid #99f;
     
    269269
    270270div.news {
    271      margin: 0px 15px 20px 220px;
     271     margin: 15px 15px 15px 220px;
    272272     padding: 20px 30px 20px 30px;
    273273     border: 1px solid #99f;
    274274     background: #004;
    275      background: url("images/darkbluetile.png");
     275     background-image: -moz-linear-gradient(top, bottom, from(#003), to(#005), color-stop(30%, #003), color-stop(100%, #001));
     276/*     background: #003 url("images/darkbluetile.png");*/
    276277     color: #eef;
    277278     border-radius: 4px;
     
    543544     text-shadow: 0px 0px 3px rgba(255, 255, 255, 0.8);
    544545     white-space: normal;
    545      background: #004 url('images/darkbluebg.png');
     546     background: #002 //url('images/darkbluebg.png');
     547     background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001));
    546548     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
    547549     -khtml-box-shadow: inset 0px 0px 1px 0px #eef;
     
    559561     text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5);
    560562     letter-spacing: 0.05em;
    561      background: #003 url('images/titletile.png');
     563     background: #002; // url('images/darkbluebg.png');
     564     background-image: -moz-linear-gradient(top, bottom, from(#001), to(#003), color-stop(30%, #001), color-stop(100%, #001));
    562565     padding: 5px 10px 8px 10px;
    563566     wordwrap: none;
     
    591594     -moz-border-radius: 0 4px 4px 0;
    592595     -khtml-border-radius: 0 4px 4px 0;
    593      background: #007;
     596     background: #002;
    594597/*     background: url(images/lightbluebg.png);*/
    595598}
     
    796799.joblog {
    797800     margin:    15px 0 15px 0;
    798      padding: 20px !important;
     801     padding: 5px 20px 10px 20px !important;
    799802     border: 1px solid #99f;
    800803     background-color: #004;
  • installer/resources/themes/console/light/console.css

    r7e1171e rb49ab59  
    269269div.news {
    270270     margin: 0px 15px 10px 220px;
    271      padding: 20px 30px 20px 30px;
     271     padding: 10px 25px 15px 25px;
    272272     border: 1px solid #003;
    273273     color: #410;
     
    347347
    348348div.configure {
    349      padding: 0 15px 0px 15px !important;
     349     padding: 5px 15px 0px 15px !important;
    350350     margin: 0px 0px 15px 0;
    351351     background: #ddf url('images/lightbluetile.png');
     
    596596     -moz-border-radius: 4px;
    597597     -khtml-border-radius: 4px;
    598      margin: 15px 0px 10px 0 !important;
     598     margin: 15px 0px 5px 0 !important;
    599599     -moz-box-shadow: inset 0px 0px 1px 0px #002;
    600600     word-wrap: break-word;
     
    613613     border-left: 5px solid #002;
    614614     padding: 3px 5px 3px 5px;
    615      margin: 10px 0 15px 0;
     615     margin: 15px 0 15px 0;
    616616     border-radius: 0 4px 4px 0;
    617617     -moz-border-radius: 0 4px 4px 0;
  • router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java

    r7e1171e rb49ab59  
    10661066            Collections.sort(countryList);
    10671067            buf.append("<table>\n");
    1068             buf.append("<tr><th>Country</th><th>Count</th></tr>\n");
     1068            buf.append("<tr><th align=\"left\">Country</th><th>Count</th></tr>\n");
    10691069            for (String country : countryList) {
    10701070                int num = countries.count(country);
Note: See TracChangeset for help on using the changeset viewer.