Changeset 6613


Ignore:
Timestamp:
Nov 21, 2014, 12:47:22 PM (8 years ago)
Author:
Nicklas Nordborg
Message:

References #1890: Improve skinnability of BASE

Minor adjustments.

Location:
trunk/www
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/admin/itemsubtypes/edit_subtype.jsp

    r6387 r6613  
    295295        </table>
    296296      </div>
    297       <div id="filetypes.disabled" style="display: none; border: 1px solid transparent;">
     297      <div id="filetypes.disabled" class="bg-filled-50" style="height: 100%; display: none; border: 1px solid transparent;">
    298298        <div class="messagecontainer error"></div>
    299299      </div>
  • trunk/www/include/scripts/joust-2.js

    r6388 r6613  
    245245   
    246246    // Create main menu <div> container
    247     var menuElement = internal.makeDiv(menuItem.id, 'menuitem', pad);
     247    var menuElement = internal.makeDiv(menuItem.id, 'joustitem', pad);
    248248    menuElement.item = menuItem;
    249249    if (menuItem.className) menuElement.className += ' ' + menuItem.className;
     
    270270   
    271271    // Menu text
    272     var text = internal.makeDiv(menuItem.id+'-text', 'text', menuItem.text);
     272    var text = internal.makeDiv(menuItem.id+'-text', 'text interactable', menuItem.text);
    273273    if (menuItem.tooltip) text.title = menuItem.tooltip;
    274274    menuElement.appendChild(text);
  • trunk/www/include/scripts/main-2.js

    r6610 r6613  
    19561956    controllers['HARDWARE'] = { url:'admin/hardware/index.jsp', width:800, height:500 };
    19571957    controllers['HELP'] = { url:'admin/clients/help/index.jsp', width:600, height:400, noAnyToAny:true };
    1958     controllers['ITEMSUBTYPE'] = { url:'admin/itemsubtypes/index.jsp', width:600, height:400 };
     1958    controllers['ITEMSUBTYPE'] = { url:'admin/itemsubtypes/index.jsp', width:690, height:460 };
    19591959    controllers['JOB'] = { url:'views/jobs/index.jsp', width:750, height:500, popup:true, edit:false };
    19601960    controllers['JOBAGENT'] = { url:'admin/jobagents/index.jsp', width:600, height:400 };
  • trunk/www/include/styles/joust-2.css

    r6386 r6613  
    3434
    3535/* Main div tag for menuitem */
    36 .joust .menuitem
     36.joust .joustitem
    3737{
    3838  height: 1.65em;
     
    4242
    4343/* Child div tags for holding padding, outline, icon and text */
    44 .joust .menuitem > div
     44.joust .joustitem > div
    4545{
    4646  height: 100%;
     
    5151
    5252/* Text part of the menu entry */
    53 .joust .menuitem .text
     53.joust .joustitem .text
    5454{
    55   border: 2px solid transparent;
     55  padding: 2px;
    5656  border-radius: 4px;
    5757  height: auto;
     
    5959
    6060/* Show border around the text when hovering over the menu entry */
    61 .joust .menuitem:hover .text
     61.joust .joustitem .text:hover
    6262{
    6363  cursor: pointer;
    64   border: 2px solid #2288AA;
     64  border-width: 2px;
     65  padding: 0;
    6566}
    6667
    6768/* A selected menu item is highlighted */
    68 .joust .menuitem.selected
     69.joust .joustitem.selected
    6970{
    7071  font-weight: bold;
    7172}
    72 .joust .menuitem.selected .text
     73.joust .joustitem.selected .text
    7374{
    7475  color: #FFFFFF;
     
    7778
    7879/* Used while lazy-loading child items */
    79 .joust .menuitem.working
     80.joust .joustitem.working
    8081{
    8182  cursor: progress;
     
    8384
    8485/* Padding is either empty or a vertical dotted line */
    85 .joust .menuitem .pad
     86.joust .joustitem .pad
    8687{
    8788  width: 18px;
    8889}
    89 .joust .menuitem .pad.line
     90.joust .joustitem .pad.line
    9091{
    9192  background-image: url('../../images/joust/line.png');
  • trunk/www/include/styles/login.css

    r6610 r6613  
    3535  margin: 0em 0px 0px 0px;
    3636  padding: 1px 4px 1px 4px;
    37   border: 0px;
     37  border-width: 0;
    3838  background-color: #224488;
    3939  background-image: url('backgrounds/popup_h1.png');
     
    144144}
    145145
     146h3 img
     147{
     148  margin-right: 3px;
     149}
     150
  • trunk/www/include/styles/main.css

    r6611 r6613  
    481481
    482482/* Regular text-field controls + selection list */
    483 input, textarea, select, .input
     483input, textarea, select, .interactable.input
    484484{
    485485  /* content-box, otherwise the content will jump around when we modify border */
  • trunk/www/include/styles/menu.css

    r6609 r6613  
    5555}
    5656
    57 .menu.horizontal .menuitem.enabled:hover
     57.menu.horizontal .menuitem.interactable:hover
    5858{
    5959  border-width: 2px;
  • trunk/www/include/styles/path.css

    r5918 r6613  
    2727*/
    2828
    29 h1.path
     29.path
    3030{}
    3131
    32 h1.path .pathelement:before
     32.pathelement:before
    3333{
    3434  content: '›';
     
    3838}
    3939
    40 h1.path .pathelement:first-child:before
     40.pathelement:first-child:before
    4141{
    4242  content: '';
  • trunk/www/main.jsp

    r6610 r6613  
    132132      }
    133133      %>
    134       <table style="width: 100%; margin-top: 1em;">
     134      <table style="width: 100%; margin-top: 1em; border-collapse: separate;">
    135135      <tr>
    136136        <td class="base-logo"></td>
  • trunk/www/my_base/index.jsp

    r6606 r6613  
    192192
    193193    <div class="absolutefull" style="height: 50%;">
    194       <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
    195         <h3 style="height: 100%;"><base:icon image="project.png" style="margin-right: 3px;" />Projects (<%=projects.size()%>)</h3>
    196       </div>
    197       <div id="projectsSection" class="absolutefull welcomesection" style="top: 1.75em; bottom: 0.5em;">
     194      <div class="absolutefull" style="height: 2em; overflow: hidden;">
     195        <h3 style="height: 100%;"><base:icon image="project.png" />Projects (<%=projects.size()%>)</h3>
     196      </div>
     197      <div id="projectsSection" class="absolutefull welcomesection" style="top: 2em; bottom: 0.5em;">
    198198      <%
    199199      if (projects.size() == 0)
     
    251251
    252252    <div class="absolutefull" style="height: 50%; top: auto;">
    253       <div class="absolutefull" style="height: 1.75em; top: 0.5em; overflow: hidden;">
    254         <h3 style="height: 100%;"><base:icon image="message.png" style="margin-right: 3px;" />New messages (<%=messages.size()%>)</h3>
    255       </div>
    256       <div id="messagesSection" class="absolutefull news welcomesection" style="top: 2.25em;">
     253      <div class="absolutefull" style="height: 2em; top: 0.5em; overflow: hidden;">
     254        <h3 style="height: 100%;"><base:icon image="message.png" />New messages (<%=messages.size()%>)</h3>
     255      </div>
     256      <div id="messagesSection" class="absolutefull news welcomesection" style="top: 2.5em;">
    257257      <%
    258258      String broadcastTitle = (String)application.getAttribute("broadcast.title");
     
    307307    %>
    308308    <div class="absolutefull" style="left: 1em; right: 0.5em; top: auto; height: 14em; bottom: 1em; ">
    309       <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
    310       <h3 style="height: 100%;"><base:icon image="help.png" style="margin-right: 3px;" />Help</h3>
    311       </div>
    312       <div id="helpSection" class="absolutefull welcomesection" style="top: 1.75em;">
     309      <div class="absolutefull" style="height: 2em; overflow: hidden;">
     310      <h3 style="height: 100%;"><base:icon image="help.png" />Help</h3>
     311      </div>
     312      <div id="helpSection" class="absolutefull welcomesection" style="top: 2em;">
    313313      <%
    314314      if (help != null)
     
    345345 
    346346    <div class="absolutefull" style="left: 0.5em; right: 1em; bottom: 16em;">
    347       <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
    348       <h3 style="height: 100%;"><base:icon image="news.png" style="margin-right: 3px;"/>News and announcements (<%=news.size()%>)
     347      <div class="absolutefull" style="height: 2em; overflow: hidden;">
     348      <h3 style="height: 100%;"><base:icon image="news.png" />News and announcements (<%=news.size()%>)
    349349        <%
    350350        if (RssNewsFeed.isEnabled())
     
    358358      </h3>
    359359      </div>
    360       <div id="newsSection" class="absolutefull news welcomesection" style="top: 1.75em;">
     360      <div id="newsSection" class="absolutefull news welcomesection" style="top: 2em;">
    361361        <%
    362362        if (news.size() == 0)
     
    386386 
    387387    <div class="absolutefull" style="left: 0.5em; right: 1em; top: auto; height: 14em; bottom: 1em;">
    388       <div class="absolutefull" style="height: 1.75em; overflow: hidden;">
    389       <h3 style="height: 100%;"><base:icon image="diskusage.png" style="margin-right: 3px;"/>Disk usage</h3>
    390       </div>
    391       <div id="quotaSection" class="absolutefull welcomesection" style="top: 1.75em;">
     388      <div class="absolutefull" style="height: 2em; overflow: hidden;">
     389      <h3 style="height: 100%;"><base:icon image="diskusage.png" />Disk usage</h3>
     390      </div>
     391      <div id="quotaSection" class="absolutefull welcomesection" style="top: 2em;">
    392392      <%
    393393      if (quotaGroup != null)
Note: See TracChangeset for help on using the changeset viewer.