Changeset 2164:ea097afa23e4
- Timestamp:
- 09/30/13 11:04:17 (10 years ago)
- Branch:
- dcRepo
- Parents:
- 2163:d41b59b0ae2e (diff), 2162:ff2e89cb94bb (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. - Files:
-
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/style/default.css
r2152 r2164 1947 1947 } 1948 1948 /* -------------------------------------------------------------------- plugins.php */ 1949 #plugins td.action {1949 .modules td.action, .modules td.icon { 1950 1950 vertical-align: middle; 1951 1951 } 1952 .distrib img { 1952 .modules td.icon img:last-child { 1953 width: 16px; 1954 height: 16px; 1955 } 1956 .modules td.icon img.expand { 1957 margin-bottom: 3px; 1958 } 1959 .modules td.distrib img { 1953 1960 display: block; 1954 1961 float: right; 1955 margin-top: -1em; 1962 } 1963 .modules dt { 1964 font-weight: bold; 1965 } 1966 .modules a.details { 1967 background: transparent url(search.png) no-repeat 2px 2px; 1968 padding: 4px 4px 0 20px; 1969 } 1970 .modules a.support { 1971 background: transparent url(../images/page_help.png) no-repeat 2px 2px; 1972 padding: 4px 4px 0 20px; 1973 } 1974 #m_search { 1975 background: transparent url(search.png) no-repeat 4px center; 1976 padding-left: 20px; 1977 } 1978 .modules tr.expand, .modules td.expand { 1979 background: #f7f7f7; 1980 border-color: #bee74b; 1981 } 1982 .modules tr.expand td:first-child { 1983 font-weight: bold; 1984 background: #DFE5E7; 1985 } 1986 .modules td.expand { 1987 padding: 0; 1988 } 1989 .mod-more, .mod-more li { 1990 margin: .25em 0 0 1em; 1991 padding: 0; 1992 list-style-type: none; 1993 } 1994 .mod-more { 1995 padding-top: .5em; 1956 1996 } 1957 1997 /* ---------------------------------------------------------- post.php, page.php */ -
admin/style/default.css
r2158 r2164 149 149 } 150 150 /* ------------------------------------------------- layout: optionnal one/two-boxes */ 151 .one-box, .two-boxes, .three-boxes, .box {152 margin-bottom: 1em;153 }154 151 .one-box { 155 152 text-align: justify; 156 153 } 154 .two-boxes, .three-boxes, .box { 155 display: inline-block; 156 vertical-align: top; 157 margin: 0 1.5% 1em; 158 -moz-box-sizing: border-box; 159 -webkit-box-sizing: border-box; 160 box-sizing: border-box; 161 } 157 162 .two-boxes { 158 163 width: 47%; 159 display: inline-block; 160 vertical-align: top; 161 margin-right: 2%; 162 -moz-box-sizing: border-box; 163 -webkit-box-sizing: border-box; 164 box-sizing: border-box; 165 } 166 .two-boxes:first-child, .two-boxes.odd, .two-boxes.odd:last-child { 167 margin-right: 3%; 168 margin-left: 0; 169 } 170 .two-boxes.even:last-child, .two-boxes.even { 171 margin-left: 3%; 172 margin-right: 0; 173 } 164 } 174 165 .three-boxes { 175 166 width: 30%; 176 display: inline-block; 177 vertical-align: top; 178 margin-left: 1.5%; 179 margin-right: 1.5%; 180 -moz-box-sizing: border-box; 181 -webkit-box-sizing: border-box; 182 box-sizing: border-box; 183 } 184 .three-boxes:first-child, .three-boxes.first-child { 185 margin-left: 0; 186 } 187 .three-boxes:last-child, .three-boxes.last-child { 188 margin-right: 0; 189 } 190 /* boîtes intérieures distribuées horizontalement */ 167 } 191 168 .box { 192 display: inline-block; 193 vertical-align: top; 194 margin-right: 3%; 195 text-align: left; 196 } 197 .box:last-child { 169 margin-left: 0; 170 margin-right: 0; 171 } 172 .odd { 173 margin-left: 0; 174 } 175 .even { 198 176 margin-right: 0; 199 177 } … … 448 426 h1 a:link, h1 a:visited { 449 427 border: none; 428 } 429 .discrete a { 430 color: #333; 450 431 } 451 432 /* ---------------------------------------------------------------------------- … … 1474 1455 } 1475 1456 .box.small { 1476 width: 3 00px;1457 width: 320px; 1477 1458 } 1478 1459 .box.medium { 1479 width: 6 40px;1460 width: 660px; 1480 1461 } 1481 1462 .box.large { … … 2434 2415 display: block; 2435 2416 } 2417 /* ---------------------------------------------- Couleurs ajoutées via javascript 2418 /* color-picker.js */ 2419 .color-color-picker { 2420 border: 1px solid #000; 2421 width: 195px; 2422 background: #fff; 2423 } 2424 /* _blog_theme.js */ 2425 .select-button { 2426 font-weight: bold; 2427 } 2428 /* _media_item.js */ 2429 .color-div { 2430 border: 1px solid #ccc; 2431 } 2432 /* fadings ('color' est utilisé comme variable, pas comme text color) */ 2433 .colorBeginPassword, .colorBeginValidatorErr, .colorBeginUserMail { 2434 color: #fff; 2435 } 2436 .colorEndPassword, .colorEndError, .colorEndValidatorErr, .colorEndUserMail { 2437 color: #ffbaba; 2438 } 2439 .colorBeginMessage { 2440 color: #ccc; 2441 } 2442 .colorEndMessage, .colorBeginValidatorMsg { 2443 color: #676e78; 2444 } 2445 .colorBeginError { 2446 color: #ffdec8; 2447 } 2448 .colorBeginSuccess { 2449 color: #9BCA1C; 2450 } 2451 .colorEndSuccess { 2452 color: #bee74b; 2453 } 2454 .colorEndValidatorMsg { 2455 color: #ffcc00; 2456 } 2436 2457 /* ------------------------------------------------------------------------------------ 2437 2458 UN POIL DE MEDIA QUERIES … … 2473 2494 #top-info-user a.active { 2474 2495 padding: 2px 8px; 2496 background: #999; 2497 color: #FFF; 2498 border-width: 0; 2499 -webkit-border-radius: 6px; 2500 border-radius: 6px; 2475 2501 } 2476 2502 .three-boxes, .three-boxes .box, 2477 .three-boxes:first-child, .three-boxes.first-child,2478 .three-boxes:last-child, .three-boxes.last-child,2479 2503 .two-cols .col70, .two-cols .col30 { 2480 2504 width: 100%; … … 2497 2521 top: 77px; 2498 2522 } 2499 .one-box, .two-boxes, 2500 .one-box .box, .two-boxes .box, .two-boxes.odd, .two-boxes.even, 2501 .two-boxes:first-child, .two-boxes.odd, .two-boxes.odd:last-child, 2502 .two-boxes.even:last-child, .two-boxes.even, 2523 .one-box, .two-boxes, .two-boxes.odd, .two-boxes.even, .box, 2503 2524 .two-cols .col { 2504 2525 width: 100%; … … 2533 2554 display: inline; 2534 2555 } 2535 #content {2556 #content, .hide-mm #content { 2536 2557 margin: 0; 2537 2558 padding: 0 .5em !important; … … 2542 2563 #main #content > h2 { 2543 2564 margin: 0; 2544 padding: 6px 0;2565 padding: 6px 30px 6px 0; 2545 2566 } 2546 2567 #dashboard-boxes .box.medium, 2547 2568 #dashboard-boxes .box.small, 2548 2569 #dashboard-boxes .box.large { 2549 width: 90%;2570 width: 100%; 2550 2571 margin: 10px auto; 2551 2572 } 2552 2573 } 2553 @media screen and (max-width: 500px) {2574 @media screen and (max-width: 420px) { 2554 2575 h1, h1 a { 2555 2576 padding: 0; … … 2559 2580 display: none; 2560 2581 } 2582 #top-info-blog { 2583 margin-bottom: .5em; 2584 max-width: 75%; 2585 } 2561 2586 #top-info-blog select { 2562 2587 margin-bottom: .5em; 2563 margin-right: 0 !important;2564 }2565 #top-info-blog p {2566 display: block;2567 2588 } 2568 2589 #icons p { … … 2573 2594 } 2574 2595 } 2575 /* ---------------------------------------------- Couleurs ajoutées via javascript2576 /* color-picker.js */2577 .color-color-picker {2578 border: 1px solid #000;2579 width: 195px;2580 background: #fff;2581 }2582 /* _blog_theme.js */2583 .select-button {2584 font-weight: bold;2585 }2586 /* _media_item.js */2587 .color-div {2588 border: 1px solid #ccc;2589 }2590 /* fadings ('color' est utilisé comme variable, pas comme text color) */2591 .colorBeginPassword, .colorBeginValidatorErr, .colorBeginUserMail {2592 color: #fff;2593 }2594 .colorEndPassword, .colorEndError, .colorEndValidatorErr, .colorEndUserMail {2595 color: #ffbaba;2596 }2597 .colorBeginMessage {2598 color: #ccc;2599 }2600 .colorEndMessage, .colorBeginValidatorMsg {2601 color: #676e78;2602 }2603 .colorBeginError {2604 color: #ffdec8;2605 }2606 .colorBeginSuccess {2607 color: #9BCA1C;2608 }2609 .colorEndSuccess {2610 color: #bee74b;2611 }2612 .colorEndValidatorMsg {2613 color: #ffcc00;2614 } -
inc/admin/lib.dc.page.php
r2161 r2164 605 605 self::jsVar('dotclear.msg.load_enhanced_uploader', 606 606 __('Loading enhanced uploader, please wait.')). 607 608 self::jsVar('dotclear.msg.module_author', 609 __('Author:')). 610 self::jsVar('dotclear.msg.module_details', 611 __('Details')). 612 self::jsVar('dotclear.msg.module_support', 613 __('Support')). 614 self::jsVar('dotclear.msg.module_help', 615 __('Help:')). 616 self::jsVar('dotclear.msg.module_section', 617 __('Section:')). 618 self::jsVar('dotclear.msg.module_tags', 619 __('Tags:')). 607 620 "\n//]]>\n". 608 621 "</script>\n"; -
inc/admin/lib.dc.page.php
r2157 r2164 54 54 55 55 # List of user's blogs 56 if ($core->auth-> blog_count == 1 || $core->auth->blog_count> 20)56 if ($core->auth->getBlogCount() == 1 || $core->auth->getBlogCount() > 20) 57 57 { 58 58 $blog_box = … … 60 60 html::escapeHTML($core->blog->name).'</strong>'; 61 61 62 if ($core->auth-> blog_count> 20) {62 if ($core->auth->getBlogCount() > 20) { 63 63 $blog_box .= ' - <a href="blogs.php">'.__('Change blog').'</a>'; 64 64 } … … 108 108 $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon; 109 109 if (!$user_ui_hide_std_favicon) { 110 echo '<link rel="icon" type="image/png" href="images/favicon.png" />'; 111 } 112 110 echo 111 '<link rel="icon" type="image/png" href="images/favicon96-login.png" />'. 112 '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />'; 113 } 113 114 echo 114 115 self::jsCommon().
Note: See TracChangeset
for help on using the changeset viewer.