Changeset 5e8730a6


Ignore:
Timestamp:
Jun 3, 2017 2:11:33 PM (3 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
4c6af7cd
Parents:
6acca289
Message:

Console:

  • (light, dark, midnight) Fix minor alignment issues with Arabic CSS
  • JRobin (graphs):
    • Fix font size issue for non-title text on graphs
    • Optimise layout (tweaked padding, legend box size etc)
    • Tweak graph lines (now dotted, slightly less opaque)
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • apps/jrobin/java/src/org/jrobin/graph/RrdGraphConstants.java

    r6acca289 r5e8730a6  
    162162         * Default minor grid color
    163163         */
    164         Color DEFAULT_GRID_COLOR = new Color(171, 171, 171, 95);
     164        Color DEFAULT_GRID_COLOR = new Color(100, 100, 100, 75);
    165165        // Color DEFAULT_GRID_COLOR = new Color(140, 140, 140);
    166166        /**
    167167         * Default major grid color
    168168         */
    169         Color DEFAULT_MGRID_COLOR = new Color(255, 91, 91, 95);
     169        Color DEFAULT_MGRID_COLOR = new Color(255, 91, 91, 110);
    170170        // Color DEFAULT_MGRID_COLOR = new Color(130, 30, 30);
    171171        /**
     
    252252         */
    253253        String DEFAULT_FONT_NAME = System.getProperty("os.name").toLowerCase().contains("windows") ?
    254                         "Lucida Sans Typewriter" : "Monospaced";
     254                        "Lucida Console" : "Monospaced";
    255255
    256256        /**
     
    279279         * Used internally
    280280         */
    281         double LEGEND_BOX = 0.9; // chars
     281        double LEGEND_BOX = 0.7; // chars
    282282        /**
    283283         * Used internally
     
    287287         * Used internally
    288288         */
    289         int PADDING_LEFT = 10; // pix
    290         /**
    291          * Used internally
    292          */
    293         int PADDING_TOP = 12; // pix
    294         /**
    295          * Used internally
    296          */
    297         int PADDING_TITLE = 6; // pix
    298         /**
    299          * Used internally
    300          */
    301         int PADDING_RIGHT = 16; // pix
    302         /**
    303          * Used internally
    304          */
    305         int PADDING_PLOT = 2; //chars
    306         /**
    307          * Used internally
    308          */
    309         int PADDING_LEGEND = 2; // chars
     289        int PADDING_LEFT = 5; // pix
     290        /**
     291         * Used internally
     292         */
     293        int PADDING_TOP = 9; // pix
     294        /**
     295         * Used internally
     296         */
     297        int PADDING_TITLE = 7; // pix
     298        /**
     299         * Used internally
     300         */
     301        int PADDING_RIGHT = 20; // pix
     302        /**
     303         * Used internally
     304         */
     305        double PADDING_PLOT = 1.7; //chars
     306        /**
     307         * Used internally
     308         */
     309        double PADDING_LEGEND = 2.1; // chars
    310310        /**
    311311         * Used internally
     
    321321         */
    322322        // solid line
    323         Stroke GRID_STROKE = new BasicStroke(1);
     323        //Stroke GRID_STROKE = new BasicStroke(1);
    324324
    325325        // dotted line
    326         // Stroke GRID_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, new float[] {1, 1}, 0);
     326        Stroke GRID_STROKE = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, new float[] {1, 1}, 0);
    327327        /**
    328328         * Stroke used to draw ticks
  • apps/jrobin/java/src/org/jrobin/graph/RrdGraphDef.java

    r6acca289 r5e8730a6  
    133133        }
    134134
    135         fonts[FONTTAG_DEFAULT]   = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 8);
    136         fonts[FONTTAG_TITLE]     = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 9);
    137         fonts[FONTTAG_AXIS]      = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 7);
    138         fonts[FONTTAG_UNIT]      = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 8);
    139         fonts[FONTTAG_LEGEND]    = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 8);
     135        fonts[FONTTAG_DEFAULT]   = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10);
     136        fonts[FONTTAG_TITLE]     = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10);
     137        fonts[FONTTAG_AXIS]      = new Font("Droid Sans Mono", Font.PLAIN, 10);
     138        fonts[FONTTAG_UNIT]      = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10);
     139        fonts[FONTTAG_LEGEND]    = new Font("Droid Sans Mono", Font.PLAIN, 10);
    140140        fonts[FONTTAG_WATERMARK] = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 1).deriveFont(5.5F);
    141141    }
     
    174174                System.err.println(exception.getLocalizedMessage());
    175175            }
    176             font = new Font(DEFAULT_FONT_NAME, Font.PLAIN, 10);
     176            font = new Font("Monospaced", Font.PLAIN, 10);
    177177        }
    178178
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java

    r6acca289 r5e8730a6  
    3636    private final SummaryListener _listener;
    3737    private final I2PAppContext _context;
    38     private static final Color AREA_COLOR = new Color(100, 160, 200, 240);
     38    private static final Color AREA_COLOR = new Color(100, 160, 200, 200);
    3939    private static final Color LINE_COLOR = new Color(0, 30, 110, 255);
    4040    private static final Color RESTART_BAR_COLOR = new Color(223, 13, 13, 255);
     
    136136            //    small = small.deriveFont(small.getSize2D() + 1.0f);
    137137            // if specified font family is missing, jrobin will use fallback
    138                   small = new Font("Droid Sans Mono", Font.PLAIN, 11);
     138                  small = new Font("Droid Sans Mono", Font.PLAIN, 10);
    139139            //    large = large.deriveFont(large.getSize2D() + 1.0f);
    140140                  large = new Font("Droid Sans", Font.PLAIN, 13);
  • history.txt

    r6acca289 r5e8730a6  
    4545     - Change sidebar snark icon to match homepage icon
    4646     - Bump div.main text color from #222 to #333 (reduce contrast)
     47     - (light, dark, midnight) fix minor alignment issues with Arabic CSS
     48     - JRobin (graphs):
     49       - Fix font size issue for non-title text on graphs
     50       - Optimise layout (tweaked padding, legend box size etc)
     51       - Tweak graph lines (now dotted, slightly less opaque)
    4752   * i2ptunnel:
    4853     - Remove redundant labels and spans for keyaccess
  • installer/resources/themes/console/dark/console.css

    r6acca289 r5e8730a6  
    32973297
    32983298#sidebarconf td:nth-child(3), #sidebarconf td:nth-child(4) {
    3299      width: 75px;
     3299     width: 1%;
    33003300     padding: 0;
    33013301     white-space: nowrap;
     
    33083308#sidebarconf td:nth-child(4) {
    33093309     text-align: left;
    3310      padding-right: 0;
     3310     padding-right: 5px;
    33113311}
    33123312
     
    33183318#sidebarconf tr:last-child td:last-child {
    33193319     padding: 0;
    3320      text-align: left;
     3320     text-align: center;
    33213321}
    33223322
  • installer/resources/themes/console/dark/console_ar.css

    r6acca289 r5e8730a6  
    316316}
    317317
     318.h3navlinks, h3#servicedebug a, h3#graphinfo a, #config_stats.main h3 a, #config_logging.main h3 a, #configstats th a {
     319     float: left;
     320}
     321
     322#i2pupdates .optbox {
     323     margin-right: 10px;
     324}
     325
     326#reseedconfig input {
     327     margin-left: 8px !important;
     328     margin-right: 0 !important;
     329}
     330
     331#reseedconfig textarea {
     332     width: calc(100% - 20px) !important
     333}
     334
     335#configstats th {
     336     text-align: right !important;
     337}
     338
     339#configstats td:first-child {
     340     text-align: center !important;
     341}
     342
     343#configstats td.optionsave {
     344     text-align: left !important;
     345}
     346
     347#configstats td:nth-child(2) {
     348     padding-right: 15px;
     349}
     350
     351#clientconfig th:first-child, #clientconfig td:first-child, #loggingoptions td:first-child, #i2pupdates td:first-child, #tunnelconfig td:first-child,
     352table#i2pupdates input[name*="URL"], table#i2pupdates textarea, #addkeyring td:first-child, #reseedconfig td:first-child {
     353     text-align: left !important;
     354}
     355
     356#config_logging p, #reseedconfig td.infohelp {
     357     text-align: right !important;
     358}
     359
     360#clientconfig td:nth-child(2) {
     361     text-align: center !important;
     362}
     363
     364#bannedips, #bannedips table {
     365     direction: ltr !important;
     366}
     367
     368table#addkeyring td.infohelp {
     369     text-align: right !important;
     370}
     371
     372p#helptranslate, #floodfillconfig tr:first-child .infohelp {
     373     text-align: right !important;
     374     padding-right: 50px !important;
     375     background-image: url(images/infohelp.png);
     376     background-position: right 12px center !important;
     377}
     378
    318379#consolepass input[name="nofilter_pw"], #externali2cp input[name="nofilter_pw"], #consolepass input[name="nofilter_pw"]:focus, #externali2cp input[name="nofilter_pw"]:focus,
    319380#consolepass input[name="name"], #externali2cp input[name="user"], #consolepass input[name="name"]:focus, #externali2cp input[name="user"]:focus {
     
    326387select, select:hover, select:focus {
    327388     background-position: left center !important;
    328      padding: 3px 2px 3px 16px;
     389     padding: 3px 2px 3px 16px !important;
    329390}
    330391}
  • installer/resources/themes/console/light/console.css

    r6acca289 r5e8730a6  
    38023802
    38033803.cells {
    3804      border-left: 1px outset #ddf;
     3804     border-left: 1px inset #ddf;
    38053805     border-top: 1px inset #ddf !important;
    38063806     border-bottom: 1px inset #ddf !important;
     
    56215621}
    56225622
     5623@media screen and (min-width: 1200px) {
     5624#ntcpconnections td:first-child, #udpconnections td:first-child {
     5625     padding-left: 5px !important;
     5626}
     5627}
     5628
    56235629@media screen and (min-width: 1500px) {
    56245630body, .main, .main td, .news p, #news p, .tab, .tab2, .main li b, div.joblog li, .themelabel, .ui_lang, .applabel a, #changelog pre, .routersummary button.download,
     
    58235829/* end Edge/IE tweaks */
    58245830
     5831/* /peers */
     5832/* TODO: merge with main classes */
     5833
     5834#ntcpconnections th:nth-child(6), #ntcpconnections th:nth-child(7), #ntcpconnections th:nth-child(8), #ntcpconnections th:nth-child(9), #ntcpconnections th:nth-child(10),
     5835#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
     5836#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
     5837#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16) {
     5838     text-align: right;
     5839     white-space: nowrap;
     5840}
     5841
     5842#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
     5843#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
     5844#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
     5845     text-align: right;
     5846}
     5847
     5848#udpconnections .tablefooter td:nth-child(9) {
     5849     text-align: center !important;
     5850}
     5851
     5852#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
     5853#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6) {
     5854     padding-left: 1vw !important;
     5855     padding-right: 1vw !important;
     5856}
     5857
     5858#ntcpconnections td:nth-child(4), #ntcpconnections td:nth-child(5), #udpconnections td:nth-child(4),
     5859#udpconnections td:nth-child(5), #udpconnections td:nth-child(8), #udpconnections td:nth-child(12) {
     5860     white-space: nowrap;
     5861}
     5862
     5863#udpconnections .tablefooter td {
     5864     padding-left: 5px;
     5865     padding-right: 5px;
     5866}
     5867
     5868@media screen and (min-width: 1500px) {
     5869#ntcpconnections td:nth-child(6), #ntcpconnections td:nth-child(7), #ntcpconnections td:nth-child(8), #ntcpconnections td:nth-child(9), #ntcpconnections td:nth-child(10),
     5870#udpconnections td:nth-child(6), #udpconnections td:nth-child(7), #udpconnections td:nth-child(9), #udpconnections td:nth-child(10), #udpconnections td:nth-child(11),
     5871#udpconnections td:nth-child(13), #udpconnections td:nth-child(14), #udpconnections td:nth-child(15), #udpconnections td:nth-child(16),
     5872#ntcpconnections .tablefooter td:nth-child(3), #ntcpconnections .tablefooter td:nth-child(4), #ntcpconnections .tablefooter td:nth-child(5), #ntcpconnections .tablefooter td:nth-child(6),
     5873#udpconnections .tablefooter td:nth-child(3), #udpconnections .tablefooter td:nth-child(4), #udpconnections .tablefooter td:nth-child(7), #udpconnections .tablefooter td:nth-child(8),
     5874#udpconnections .tablefooter td:nth-child(10), #udpconnections .tablefooter td:nth-child(11), #udpconnections .tablefooter td:nth-child(12), #udpconnections .tablefooter td:nth-child(13) {
     5875     padding-right: 10px !important;
     5876}
     5877
     5878.cells {
     5879     border-left: none;
     5880     border-right: none;
     5881}
     5882}
     5883
     5884/* end peers */
     5885
  • installer/resources/themes/console/light/console_ar.css

    r6acca289 r5e8730a6  
    7878button.search:active, input[type="submit"]:active, input[type="reset"]:active {
    7979    background-position: right 6px center !important;
    80     padding: 5px 22px 5px 7px !important;
     80    padding: 5px 24px 5px 7px !important;
    8181}
    8282
    8383select, select:hover, select:focus, select:active {
    84      padding: 4px 4px 4px 16px;
     84     padding: 4px 4px 4px 16px !important;
    8585     background-position: left center !important;
    8686     text-align: right !important;
     
    199199}
    200200
     201#graphs td.infohelp {
     202     text-align: right;
     203     padding-right: 40px !important;
     204}
     205
    201206.langbox {
    202207     float: left;
     
    204209     padding-left: 0;
    205210     margin-left: 4px;
     211}
     212
     213p#helptranslate {
     214     padding-right: 50px !important;
     215     text-align: right !important;
     216     background-position: right 14px center !important;
     217     background-image: url("/themes/console/images/info/infohelp.png");
     218     background-size: 28px auto !important;
     219}
     220
     221#loggingoptions p {
     222     text-align: right;
    206223}
    207224
     
    433450}
    434451
     452.main[id^="config_"] select, .main[id^="config_"] textarea, .main[id^="config_"] .optbox {
     453     margin-right: 3px;
     454}
     455
     456#i2pupdates input[type="text"]:not([readonly]), #i2pupdates textarea, .main[id^="config_"] textarea, input[name="newsURL"] {
     457    width: calc(100% - 10px);
     458}
     459
     460#i2pupdates td:first-child, #reseedconfig td:first-child {
     461     text-align: left;
     462}
     463
    435464.homelinkedit th:first-child, .homelinkedit td:first-child {
    436465     text-align: center;
     
    488517
    489518.tab, .tab2 {
    490      font-size: 10pt;
     519     font-size: 12pt !important;
    491520     margin-top: -5px;
    492521}
     
    649678}
    650679
    651 p#profiles_overview, #profiles .widescroll + h3, #thresholds + h3, ul#banlist {
     680p#profiles_overview, #profiles .widescroll + h3, #thresholds + h3, #profiles #banlist {
    652681     margin-right: -16px !important;
    653682}
    654683
    655 p#profiles_overview, #profiles .widescroll + h3, #thresholds + h3, ul#banlist {
    656      margin-left: 16px;
     684p#profiles_overview, #profiles .widescroll + h3, #thresholds + h3, #profiles #banlist {
     685     margin-left: 16px !important;
    657686}
    658687
     
    669698}
    670699
    671 #profilelist th:last-child, #profilelist td:last-child {
    672      text-align: left;
    673 }
    674 
    675 #profiledefs td:last-child {
     700#profilelist th:last-child, #profilelist td:last-child, #addkeyring td:first-child {
     701     text-align: left;
     702}
     703
     704#profile_defs td:first-child {
     705     text-align: left !important;
     706}
     707
     708#profile_defs td:last-child, td.infohelp {
    676709     text-align: right !important;
    677710}
     
    709742.logtable tr:first-child td {
    710743     direction: ltr;
    711 } 
     744}
    712745
    713746#wrapperlogs pre {
     
    762795     padding: 4px 20px 4px 4px !important;
    763796     margin: 5px 3px 5px 15px !important;
     797}
     798
     799label {
     800     text-align: right !important;
     801     display: inline-block;
     802}
     803
     804#graphs input {
     805     margin-left: 8px !important;
     806}
     807
     808#graphs td:first-child {
     809     padding-right: 10px;
    764810}
    765811
  • installer/resources/themes/console/midnight/console.css

    r6acca289 r5e8730a6  
    48334833.main#tunnelmgr {
    48344834     padding: 0 5px;
    4835      min-width: 1000px;
     4835     min-width: 630px;
    48364836}
    48374837
    48384838#i2ptunnelframe {
    4839      margin: -5px 0 -10px;
     4839     margin: -5px 0;
    48404840}
    48414841
  • installer/resources/themes/console/midnight/console_ar.css

    r6acca289 r5e8730a6  
    305305#tunnelconfig th {
    306306     text-align: right;
     307}
     308
     309.h3navlinks, h3#servicedebug a, h3#graphinfo a, #config_stats.main h3 a, #config_logging.main h3 a, #configstats th a {
     310     float: left;
     311}
     312
     313#i2pupdates .optbox {
     314     margin-right: 10px;
     315}
     316
     317#reseedconfig input {
     318     margin-left: 8px !important;
     319     margin-right: 0 !important;
     320}
     321
     322#reseedconfig textarea {
     323     width: calc(100% - 20px) !important
     324}
     325
     326#configstats th {
     327     text-align: right !important;
     328}
     329
     330#configstats td:first-child {
     331     text-align: center !important;
     332}
     333
     334#configstats td.optionsave {
     335     text-align: left !important;
     336}
     337
     338#configstats td:nth-child(2) {
     339     padding-right: 15px;
     340}
     341
     342#clientconfig th:first-child, #clientconfig td:first-child, #loggingoptions td:first-child, #i2pupdates td:first-child, #tunnelconfig td:first-child,
     343table#i2pupdates input[name*="URL"], table#i2pupdates textarea, #addkeyring td:first-child, #reseedconfig td:first-child {
     344     text-align: left !important;
     345}
     346
     347#config_logging p, #reseedconfig td.infohelp {
     348     text-align: right !important;
     349}
     350
     351#clientconfig td:nth-child(2) {
     352     text-align: center !important;
     353}
     354
     355#bannedips, #bannedips table {
     356     direction: ltr !important;
     357}
     358
     359table#addkeyring td.infohelp {
     360     text-align: right !important;
     361}
     362
     363p#helptranslate, #floodfillconfig tr:first-child .infohelp {
     364     text-align: right !important;
     365     padding-right: 50px !important;
     366     background-image: url(/themes/console/images/info/infohelp.png);
     367     background-position: right 12px center !important;
    307368}
    308369
Note: See TracChangeset for help on using the changeset viewer.