Changeset 6609


Ignore:
Timestamp:
Nov 20, 2014, 9:23:17 AM (8 years ago)
Author:
Nicklas Nordborg
Message:

References #1890: Improve skinnability of BASE

Fixed the menu system

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/menu/Menu.java

    r6201 r6609  
    160160  public Menu()
    161161  {
    162     super("menu");
     162    super("menu bg-filled-100");
    163163  }
    164164 

  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/menu/Menuitem.java

    r6576 r6609  
    303303    StringBuilder sb = new StringBuilder();
    304304    sb.append("<div");
    305     addIdAndStyles(sb, isEnabled() ? "enabled" : " disabled", isAutoInitialized ? "auto-init" : null);
     305    addIdAndStyles(sb, isEnabled() ? "interactable" : " disabled", isAutoInitialized ? "auto-init" : null);
    306306    if (isAutoInitialized) sb.append(" data-auto-init=\"menuitem\"");
    307307    if (isEnabled())

  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/menu/Submenu.java

    r6401 r6609  
    257257    StringBuilder sb = new StringBuilder();
    258258    sb.append("<div");
    259     addIdAndStyles(sb, isEnabled() ? "enabled" : "disabled", "auto-init");
     259    addIdAndStyles(sb, isEnabled() ? "interactable" : "disabled", "auto-init");
    260260    if (isEnabled())
    261261    {

  • trunk/www/include/styles/menu.css

    r6415 r6609  
    3131{
    3232  position: fixed;
    33   background: #E8E8E8;
    3433  cursor: default;
    35   border-bottom: 1px solid #A0A0A0;
     34  border-bottom-width: 1px;
    3635}
    3736
    … …  
    4342.menu.horizontal > table > tbody > tr > td
    4443{
    45   border-right: 1px solid #A0A0A0;
     44  border-right-width: 1px;
    4645}
    4746.menu.horizontal > table > tbody > tr > td:last-child
    … …  
    5857.menu.horizontal .menuitem.enabled:hover
    5958{
    60   border: 2px solid #2288AA;
     59  border-width: 2px;
    6160  padding: 1px 4px 1px 4px;
    6261  border-radius: 3px;
    … …  
    7372{
    7473  position: fixed;
    75   background: #E8E8E8;
    76   border: 1px solid #A0A0A0;
    77   box-shadow: 3px 3px 5px #cccccc;
     74  border-width: 1px;
     75  box-shadow: 3px 3px 5px #CCCCCC;
    7876}
    7977
    … …  
    8482}
    8583
    86 .menu.vertical .menuitem.enabled:hover
     84.menu.vertical .menuitem.interactable:hover
    8785{
    88   border: 2px solid #2288AA;
     86  border-width: 2px;
    8987  padding: 1px 2px 1px 2px;
    9088  border-radius: 3px;
    … …  
    9492.menu.vertical .menuseparator
    9593{
    96   background:  #A0A0A0;
     94  border-top-width: 1px;
     95  height: 1px;
    9796  width: 100%;
    98   height: 1px;
    9997}
    10098
    … …  
    128126.menufill .menuseparator
    129127{
    130   border-right: 1px solid #A0A0A0;
     128  border-right-width: 1px;
    131129  margin-right: 4px;
    132130  margin-left: 4px;
Note: See TracChangeset for help on using the changeset viewer.