Changeset 26140
- Timestamp:
- 11/13/2013 08:05:51 PM (11 years ago)
- Location:
- trunk/src/wp-admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/css/wp-admin.css
r26137 r26140 631 631 #TB_window, 632 632 .tbtitle, 633 .highlight, 634 .editwidget .widget-inside { 633 .highlight { 635 634 border-width: 1px; 636 635 border-style: solid; … … 2559 2558 } 2560 2559 2561 .widget,2562 2560 .postbox, 2563 2561 .stuffbox { … … 2567 2565 } 2568 2566 2569 .widget .widget-top,2570 2567 .postbox h3, 2571 2568 .stuffbox h3 { … … 9703 9700 } 9704 9701 9705 /* widgets */ 9706 9707 /* 2 column liquid layout */ 9708 div.widget-liquid-left { 9709 float: left; 9710 clear: left; 9702 9703 /* General Widget Styles */ 9704 9705 .widget { 9706 margin: 10px auto; 9707 /* min-width: 50%; Not sure if this is needed */ 9708 position: relative; 9709 border: none !important; /* ln 991 in colors-fresh.css */ 9710 box-sizing: border-box; 9711 -moz-box-sizing:border-box; 9712 -webkit-box-sizing:border-box; 9713 } 9714 9715 .widget-top { 9716 font-size: 12px; 9717 font-weight: 600; 9718 background: #f7f7f7; 9719 } 9720 9721 .widget-top a.widget-action, 9722 .widget-top a.widget-action:hover { 9723 text-decoration: none; 9724 } 9725 9726 .widget-title h4 { 9727 margin: 0; 9728 padding: 18px 15px; 9729 line-height: 1; 9730 overflow: hidden; 9731 white-space: nowrap; 9732 text-overflow: ellipsis; 9733 } 9734 9735 .widget-inside { 9736 background: #fff !important; /* ln 1204 in colors.fresh.css */ 9737 padding: 1px 15px 15px 15px; 9738 line-height: 16px; 9739 } 9740 9741 /* Widget Dragging Helpers */ 9742 9743 .widget.ui-draggable-dragging { 9744 width: 280px !important; 9745 min-width: 280px !important; 9746 } 9747 .widget.ui-sortable-helper { 9748 border: 1px solid #DEDEDE; 9749 border-radius: 3px; 9750 box-shadow: 0 1px 3px rgba(0,0,0,0.2); 9751 opacity: 0.8; 9752 z-index: 2000; 9753 } 9754 .widget-placeholder { 9755 border: 1px solid #dedede; 9756 border-bottom: none; 9757 margin: 0 auto; 9758 height: 43px; 9711 9759 width: 100%; 9712 margin-right: -325px; 9713 } 9714 9715 div#widgets-left { 9716 margin-left: 5px; 9717 margin-right: 325px; 9718 } 9719 9720 div#widgets-right { 9721 width: 285px; 9722 margin: 0 auto; 9723 } 9724 9725 div.widget-liquid-right { 9726 float: right; 9727 clear: right; 9728 width: 300px; 9729 } 9730 9731 .widget-liquid-right .widget { 9760 background: #eee; 9761 box-shadow: inset 0 1px 2px rgba(0,0,0,0.05); 9762 -webkit-box-sizing: border-box; 9763 -moz-box-sizing: border-box; 9764 box-sizing: border-box; 9765 } 9766 9767 9768 /* Widget Sidebars */ 9769 .sidebar-name { 9770 border: none; 9732 9771 position: relative; 9733 } 9734 9735 .widget-liquid-right .widget, 9736 .inactive-sidebar .widget, 9737 .widget-liquid-right .sidebar-description { 9738 width: 250px; 9739 margin: 0 auto 20px; 9740 } 9741 9742 .widget-liquid-right .widget, 9743 .widget-liquid-right .sidebar-description { 9744 overflow: hidden; 9745 } 9746 9747 .widget-liquid-right .sidebar-description { 9748 margin-bottom: 10px; 9749 } 9750 9751 .inactive-sidebar .widget { 9752 margin: 0 10px 20px; 9753 display: inline-block; 9754 } 9755 9756 div.sidebar-name h3 { 9772 -webkit-box-sizing: border-box; 9773 -moz-box-sizing: border-box; 9774 box-sizing: border-box; 9775 } 9776 9777 .sidebar-name-arrow { 9778 position: absolute; 9779 top: 0; 9780 right: 0; 9781 bottom: 0; 9782 } 9783 9784 .js .sidebar-name { 9785 cursor: pointer; 9786 } 9787 9788 .sidebar-name h3 { 9757 9789 font-weight: normal; 9758 9790 font-size: 15px; … … 9763 9795 } 9764 9796 9765 div.sidebar-name { 9766 font-size: 13px; 9767 border-bottom-width: 1px; 9768 border-bottom-style: solid; 9769 } 9770 9771 .js .sidebar-name { 9772 cursor: pointer; 9773 } 9774 9775 .js .closed .sidebar-name { 9797 .widgets-holder-wrap .description { 9798 padding: 0; 9799 margin: 0; 9800 font-style: normal; 9801 font-size: 12px; 9802 color: #777; 9803 } 9804 9805 /* Widgets 2-col Layout */ 9806 div.widget-liquid-left { 9807 margin: 0; 9808 width: 38%; 9809 float: left; 9810 border-right: 2px solid #ccc; 9811 } 9812 9813 div.widget-liquid-right { 9814 float: right; 9815 width: 60%; 9816 } 9817 9818 /* Widgets Left - Available Widgets */ 9819 9820 div#widgets-left { 9821 margin: 0; 9822 padding: 12px 5% 0 0; 9823 } 9824 9825 div#widgets-left .closed .sidebar-name, 9826 div#widgets-left .inactive-sidebar.closed .sidebar-name { 9827 margin-bottom: 10px; 9828 } 9829 9830 div#widgets-left .sidebar-name h3 { 9831 padding: 10px 0; 9832 margin: 0 10px 0 0; 9833 } 9834 9835 div#widgets-left .sidebar-name:hover h3 { 9836 color: #464646; 9837 } 9838 9839 div#widgets-left .sidebar-name .sidebar-name-arrow:before { 9840 right: 0; 9841 top: 4px; 9842 padding: 4px 6px 4px 4px; 9843 border-radius: 20px; 9844 } 9845 9846 div#widgets-left .sidebar-name:hover .sidebar-name-arrow:before { 9847 background: #ccc; 9848 } 9849 9850 div#widgets-left .closed .sidebar-name .sidebar-name-arrow:before { 9851 background: #999; 9852 color: #fff; 9853 } 9854 9855 div#widgets-left .widget-holder { 9856 background: transparent; 9857 border: none; 9858 } 9859 9860 #available-widgets { 9861 background: transparent !important; /* ln 1620 colors-fresh.css */ 9862 margin: 0; 9863 border-radius: none; 9864 box-shadow: none; 9865 border: none; 9866 } 9867 9868 #available-widgets .widget-title-action { 9869 display: none; 9870 } 9871 9872 #available-widgets .widget { 9873 margin: 10px 0 0 0; 9874 background: #ddd; 9875 border-radius: 3px; 9876 } 9877 #available-widgets .widget:nth-child(odd) { 9878 clear: both; 9879 } 9880 9881 #available-widgets .widget-top { 9882 border-radius: 3px; 9883 background: #ffffff; /* ln 1047 in colors-fresh.css */ 9884 border: 1px solid #bbb !important; /* ln 991 in colors-fresh.css */ 9885 } 9886 9887 #available-widgets .widget-top:hover { 9888 border-color: #999 !important; /* ln 991 in colors-fresh.css */ 9889 box-shadow: 0 1px 3px rgba(0,0,0,0.2); 9890 } 9891 9892 #available-widgets .widget .widget-description { 9893 display: block; 9894 padding: 10px 16px; 9895 font-size: 12px; 9896 } 9897 9898 /* Inactive Sidebars */ 9899 #widgets-left .inactive-sidebar { 9900 clear: both; 9901 width: 100%; 9902 background: transparent; 9903 padding: 0; 9904 margin: 0 0 20px 0; 9905 border: none; 9906 box-shadow: none; 9907 } 9908 9909 #widgets-left .inactive-sidebar.first { 9910 margin-top: 40px; 9911 } 9912 9913 #widgets-left .inactive-sidebar .widget { 9914 margin: 10px 0 0 0; 9915 } 9916 9917 #widgets-left .inactive-sidebar .widget-inside { 9776 9918 -webkit-border-bottom-right-radius: 3px; 9777 9919 -webkit-border-bottom-left-radius: 3px; 9920 -moz-border-radius-bottomright: 3px; 9921 -moz-border-radius-bottomleft: 3px; 9778 9922 border-bottom-right-radius: 3px; 9779 9923 border-bottom-left-radius: 3px; 9780 } 9781 9782 .widget-liquid-right .widgets-sortables, 9783 #widgets-left .widget-holder { 9784 border-width: 0 1px 1px; 9785 border-style: none solid solid; 9786 -webkit-border-bottom-right-radius: 3px; 9787 -webkit-border-bottom-left-radius: 3px; 9788 border-bottom-right-radius: 3px; 9789 border-bottom-left-radius: 3px; 9924 background: #dfdfdf; 9925 } 9926 9927 #widgets-left .inactive-sidebar .widget-top { 9928 background: #fff !important; /* ln 991 in colors-fresh.css */ 9929 border: 1px solid #bbb !important; /* ln 991 in colors-fresh.css */ 9930 border-radius: 3px; 9931 } 9932 9933 #widgets-left .inactive-sidebar .widget-top:hover { 9934 border-color: #999 !important; /* ln 991 in colors-fresh.css */ 9935 box-shadow: 0 1px 3px rgba(0,0,0,0.2); 9936 } 9937 9938 /* Not sure what this is for... */ 9939 div#widgets-left .inactive-sidebar .widget.expanded { 9940 left: auto; 9941 } 9942 9943 #widgets-left .inactive-sidebar .widget-title-action { 9944 float: right; 9945 position: relative; 9946 top: 13px; 9947 right: 10px; 9948 } 9949 9950 div#widgets-left .inactive-sidebar .widget-action:after { 9951 content: '\f111'; 9952 color: #888; 9953 } 9954 9955 div#widgets-left .inactive-sidebar .widgets-sortables { 9956 min-height: 42px; 9957 padding: 0; 9958 background: transparent; 9959 margin: 0; 9960 position: relative; 9961 } 9962 9963 div#widgets-left .inactive-sidebar .widget-placeholder { 9964 border: 1px solid #ccc; 9965 margin: 0 auto 10px auto; 9966 height: 43px; 9967 width: 100%; 9968 border-radius: 3px; 9969 background: #aaa; 9970 box-shadow: inset 0 1px 2px rgba(0,0,0,0.05); 9971 -webkit-box-sizing: border-box; 9972 -moz-box-sizing: border-box; 9973 box-sizing: border-box; 9974 } 9975 9976 /* Widgets Right */ 9977 9978 div#widgets-right:after { 9979 content: "."; 9980 display: block; 9981 height: 0; 9982 clear: both; 9983 visibility: hidden; 9984 } 9985 9986 div#widgets-right .widgets-holder-wrap { 9987 margin: 10px 0 0 0; 9988 } 9989 9990 div#widgets-right .widget { 9991 margin: 0 auto; 9992 border: 1px solid #dedede !important; /* ln 991 in colors-fresh.css */ 9993 border-bottom: none !important; /* ln 991 in colors-fresh.css */ 9994 margin-left: 0 !important; /* Wide format widgets are the devil */ 9995 width: 100% !important; /* Wide format widgets are the devil */ 9996 } 9997 9998 div#widgets-right .sidebar-description { 9999 border-top: 1px solid #eeeeee; 10000 padding: 10px 15px 15px 15px; 10001 } 10002 10003 div#widgets-right .closed .sidebar-description { 10004 display: none; 10005 } 10006 10007 div#widgets-right .sidebar-name h3 { 10008 padding: 15px 15px; 10009 } 10010 div#widgets-right .sidebar-name .sidebar-name-arrow:before { 10011 right: 0; 10012 top: 4px; 10013 } 10014 div#widgets-right .widget-top { 10015 border-bottom: none; 10016 padding: 0; 10017 background: #f7f7f7; 10018 } 10019 div#widgets-right .widget-title-action { 10020 float: right; 10021 position: relative; 10022 top: 14px; 10023 right: 10px; 10024 } 10025 div#widgets-right a.widget-action:after { 10026 content: '\f111'; 10027 color: #888; 10028 } 10029 div#widgets-right .widget-inside { 10030 border-top: 1px solid #dedede; 10031 } 10032 10033 /* The last widget has some additional borders */ 10034 div#widgets-right .widget:last-child { 10035 border-bottom: 1px solid #dedede !important; /* ln 991 in colors-fresh.css */ 10036 } 10037 10038 div#widgets-right .widgets-sortables { 10039 min-height: 42px !important; /* Inline styles */ 10040 padding: 0 8px; 10041 margin-bottom: 8px; 10042 position: relative; 10043 } 10044 div#widgets-right .widgets-sortables:before { 10045 display: block; 10046 content: ""; 10047 text-align: center; 10048 position: absolute; 10049 left: 8px; 10050 right: 8px; 10051 bottom: 1px; 10052 height: 40px; 10053 border: 1px dashed #dedede; 10054 border-radius: 3px; 10055 line-height: 40px; 10056 font-weight: 600; 10057 color: #aaa; 10058 } 10059 10060 /* Accessibility Mode */ 10061 #available-widgets .widget-control-edit .edit { 10062 display :none; 10063 } 10064 #available-widgets .widget-control-edit .add { 10065 display: block; 10066 position: absolute; 10067 top: 0; 10068 right: 50px; 10069 bottom: 0; 10070 left: 0; 10071 z-index: 40; 10072 text-align: center; 10073 text-indent: -5000px; 10074 } 10075 10076 #widgets-right .widget-control-edit { 10077 background: #EEE; 10078 margin: -14px -10px 0 0; 10079 padding: 16px 15px; 10080 border-left: 1px solid #DDD; 10081 } 10082 #widgets-right .widget-control-edit .add { 10083 display: none; 10084 } 10085 #widgets-right .widget-control-edit:hover { 10086 background: #444; 10087 } 10088 #widgets-right .widget-control-edit:before { 10089 content: '\f111'; 10090 display: inline-block; 10091 -webkit-font-smoothing: antialiased; 10092 -moz-osx-font-smoothing: grayscale; 10093 font: normal 16px/1 'dashicons'; 10094 vertical-align: top; 10095 position: relative; 10096 top: -1px; 10097 padding-right: 4px; 10098 } 10099 10100 .editwidget { 10101 margin: 0 auto; 10102 } 10103 .editwidget .widget-control-actions { 10104 margin-top: 20px; 9790 10105 } 9791 10106 … … 9795 10110 display: none; 9796 10111 } 9797 9798 .widget-liquid-right .widgets-sortables {9799 padding: 15px 0 0;9800 }9801 9802 #available-widgets .widget-holder {9803 padding: 7px 5px 0;9804 }9805 9806 .inactive-sidebar {9807 padding: 5px 5px 0;9808 }9809 9810 #widget-list .widget {9811 width: 250px;9812 margin: 0 10px 15px;9813 border: 0 none;9814 background: transparent;9815 display: inline-block;9816 vertical-align: top;9817 }9818 9819 #widget-list .widget-description {9820 padding: 5px 8px;9821 }9822 9823 .widget-placeholder {9824 border-width: 1px;9825 border-style: dashed;9826 margin: 0 auto 20px;9827 height: 34px;9828 width: 250px;9829 }9830 9831 .inactive-sidebar .widget-placeholder {9832 margin: 0 10px 20px;9833 float: left;9834 }9835 9836 div.widgets-holder-wrap {9837 padding: 0;9838 margin: 10px 0 20px;9839 }9840 9841 #widgets-left #available-widgets {9842 background-color: transparent;9843 border: 0 none;9844 }9845 9846 ul#widget-list {9847 list-style: none;9848 margin: 0;9849 padding: 0;9850 min-height: 100px;9851 }9852 9853 .widget .widget-top {9854 font-size: 12px;9855 font-weight: 600;9856 height: 26px;9857 }9858 9859 .widget .widget-top,9860 .menu-item-handle {9861 margin-top: 0;9862 padding: 4px;9863 }9864 9865 .widget-top .widget-title {9866 padding: 7px 9px;9867 }9868 9869 .widget-top .widget-title-action {9870 float: right;9871 }9872 9873 a.widget-action {9874 display: block;9875 width: 24px;9876 height: 26px;9877 text-decoration: none;9878 }9879 9880 #available-widgets a.widget-action {9881 display: none;9882 }9883 9884 .widget-top a.widget-action,9885 .widget-top a.widget-action:hover {9886 background: none !important;9887 border: none !important;9888 width: 30px;9889 margin-right: 0 !important;9890 margin-top: 3px;9891 text-decoration: none;9892 }9893 9894 10112 .nav-menus-php .item-edit:after, 9895 10113 .widget-top a.widget-action:after, … … 9911 10129 text-decoration: none !important; 9912 10130 } 9913 9914 10131 .control-section .accordion-section-title::after, 9915 10132 .accordion-section-title::after { … … 9918 10135 top: -2px; 9919 10136 } 9920 9921 .widget-top a.widget-action:after {9922 content: '\f140';9923 }9924 9925 10137 .control-section.open .accordion-section-title::after, 9926 10138 #customize-info.open .accordion-section-title::after, … … 9928 10140 content: '\f140'; 9929 10141 } 9930 9931 10142 .nav-menus-php .item-controls .item-type { 9932 10143 padding: 11px; … … 9934 10145 } 9935 10146 9936 .widget .widget-inside, 9937 .widget .widget-description { 9938 padding: 12px 12px 10px; 9939 font-size: 12px; 9940 line-height: 16px; 9941 } 9942 10147 /* Hide Widget Settings by Default */ 9943 10148 .widget-inside, 9944 10149 .widget-description { … … 9946 10151 } 9947 10152 9948 #available-widgets .widget-description { 9949 display: block; 9950 } 9951 9952 .widget .widget-inside p { 9953 margin: 0 0 1em; 9954 padding: 0; 9955 } 9956 9957 .widget-title h4 { 9958 margin: 0; 9959 padding-bottom: 0.2em; 9960 line-height: 1; 9961 overflow: hidden; 9962 white-space: nowrap; 9963 text-overflow: ellipsis; 9964 } 9965 9966 .widgets-sortables { 9967 min-height: 90px; 9968 } 9969 9970 .widget-control-actions { 9971 margin-top: 8px; 9972 } 9973 9974 .widget-control-actions a { 9975 text-decoration: none; 9976 } 9977 9978 .widget-control-actions a:hover { 9979 text-decoration: underline; 9980 } 9981 9982 .widget-control-actions div.alignleft { 9983 margin-top: 6px; 9984 } 9985 9986 div#sidebar-info { 9987 padding: 0 1em; 9988 margin-bottom: 1em; 9989 font-size: 12px; 9990 } 9991 9992 .widget-title a, 9993 .widget-title a:hover { 9994 text-decoration: none; 9995 border-bottom: none; 9996 } 9997 9998 .widget-control-edit { 9999 display: block; 10000 font-size: 12px; 10001 font-weight: normal; 10002 line-height: 26px; 10003 padding: 0 8px 0 0; 10004 } 10005 10006 a.widget-control-edit { 10007 text-decoration: none; 10008 } 10009 10010 .widget-control-edit .add, 10011 .widget-control-edit .edit { 10012 display: none; 10013 } 10014 10015 #available-widgets .widget-control-edit .add, 10016 #widgets-right .widget-control-edit .edit, 10017 .inactive-sidebar .widget-control-edit .edit { 10018 display: inline; 10019 } 10020 10021 .editwidget { 10022 margin: 0 auto 15px; 10023 } 10024 10025 .editwidget .widget-inside { 10026 display: block; 10027 padding: 10px; 10028 } 10029 10030 .inactive p.description { 10031 margin: 5px 15px 10px; 10032 } 10033 10034 #available-widgets p.description { 10035 margin: 0 12px 12px; 10036 } 10037 10038 .widget-position { 10039 margin-top: 8px; 10040 } 10041 10042 .inactive { 10043 padding-top: 2px; 10044 } 10045 10046 .sidebar-name .spinner { 10047 float: none; 10048 margin: -4px 3px; 10049 } 10050 10051 .sidebar-name-arrow { 10052 float: right; 10053 height: 29px; 10054 width: 26px; 10055 } 10056 10057 .widget-title .in-widget-title { 10058 font-size: 12px; 10059 white-space: nowrap; 10060 } 10061 10153 /* Dragging widgets over the available widget area show's a "Deactivate" message */ 10062 10154 #removing-widget { 10063 10155 display: none; … … 10132 10224 10133 10225 #widgets-chooser { 10226 clear: both; 10134 10227 display: none; 10135 10228 margin: auto; … … 10337 10430 -------------------------------------------------------------- */ 10338 10431 10432 @media screen and (max-width: 480px) { 10433 div.widget-liquid-left { 10434 width: 100%; 10435 float: none; 10436 border-right: none; 10437 padding-right: 0; 10438 } 10439 10440 #widgets-left .sidebar-name { 10441 margin-right: 0; 10442 } 10443 10444 #widgets-left #available-widgets .widget-top { 10445 margin-right: 0; 10446 } 10447 10448 #widgets-left .inactive-sidebar .widgets-sortables { 10449 margin-right: 0; 10450 } 10451 10452 div.widget-liquid-right { 10453 width: 100%; 10454 float: none; 10455 } 10456 } 10457 10339 10458 @media only screen and (max-width: 768px) { 10340 10459 /* categories */ … … 10406 10525 max-width: 400px; 10407 10526 width: auto; 10527 } 10528 } 10529 @media only screen and (min-width: 1250px) { 10530 #widgets-left #available-widgets .widget { 10531 width: 49%; 10532 float: left; 10533 } 10534 10535 #widgets-left #available-widgets .widget:nth-child(even) { 10536 float: right; 10537 } 10538 10539 #widgets-right .widgets-holder-wrap { 10540 width: 48.5%; 10541 float: left; 10542 } 10543 10544 #widgets-right .widgets-holder-wrap:nth-child(odd) { 10545 clear: both; 10546 } 10547 10548 #widgets-right .widgets-holder-wrap:nth-child(even) { 10549 float: right; 10550 } 10551 10552 #widgets-right.single-sidebar .widgets-holder-wrap { 10553 width: 100%; 10408 10554 } 10409 10555 } … … 10416 10562 (-webkit-min-device-pixel-ratio: 1.25), 10417 10563 (min-resolution: 120dpi) { 10418 10419 tr.wp-locked .locked-indicator { 10564 tr.wp-locked .locked-indicator { 10420 10565 background-image: url('../images/lock-2x.png'); 10421 10566 background-size: 16px 16px; -
trunk/src/wp-admin/includes/widgets.php
r24229 r26140 68 68 add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' ); 69 69 70 echo "<div id='$sidebar' class='widgets-sortables'>\n";71 72 70 $description = wp_sidebar_description( $sidebar ); 73 71 … … 78 76 } 79 77 78 echo "<div id='$sidebar' class='widgets-sortables'>\n"; 80 79 dynamic_sidebar( $sidebar ); 81 80 echo "</div>\n"; -
trunk/src/wp-admin/js/widgets.js
r26054 r26140 364 364 sidebar.sortable('refresh'); 365 365 366 // Change for MP6 367 // widget.prependTo( sidebar ); 368 sidebar.find( '.sidebar-description' ).after( widget ); 366 widget.prependTo( sidebar ); 369 367 370 368 wpWidgets.save( widget, 0, 0, 1 );
Note: See TracChangeset
for help on using the changeset viewer.