Dotclear


Ignore:
Timestamp:
10/17/13 07:18:33 (12 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
2.6
Parents:
2394:d7117f1bbfc5 (diff), 2413:6af4dde5a9c0 (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 last PR from default branch

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • plugins/widgets/style.css

    r2342 r2415  
    3838     margin-bottom: 1em; 
    3939     list-style: none; 
     40} 
     41#dndnav > li.empty-widgets, 
     42#dndextra > li.empty-widgets, 
     43#dndcustom > li.empty-widgets { 
     44     border: 0; 
    4045} 
    4146#dndnav > li.ui-sortable-placeholder, 
     
    97102     display: none; 
    98103} 
    99 .removeWidget { 
    100      padding: 8px 6px; 
    101      margin: 0; 
     104.toolsWidget { 
     105     float: right; 
    102106} 
    103107.widgetSettings { 
  • plugins/widgets/style.css

    r2401 r2415  
    1616#sidebarsWidgets { 
    1717     float: left; 
    18      width: 47%; 
     18     width: 49%; 
    1919     margin: 0 0 0 1%; 
    2020     padding: 0 1%; 
     
    118118#listWidgets { 
    119119     float: left; 
    120      width: 46%; 
     120     width: 49%; 
    121121     background: #eee; 
    122122     padding: 1.5em 1% 0;  
Note: See TracChangeset for help on using the changeset viewer.

Sites map