Changeset 3412:a07474dc68c1
- Timestamp:
- 11/19/16 10:56:00 (9 years ago)
- Branch:
- default
- Location:
- admin
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/index.php
r3390 r3412 173 173 174 174 # Dashboard content 175 $dashboardContents = '';176 175 $__dashboard_contents = new ArrayObject(array(new ArrayObject,new ArrayObject)); 177 176 $core->callBehavior('adminDashboardContents', $core, $__dashboard_contents); … … 312 311 } 313 312 314 # Dashboard columns (processed first, as we need to know the result before displaying the icons.)313 # Dashboard items and contents (processed first, as we need to know the result before displaying the icons.) 315 314 $dashboardItems = ''; 316 317 315 foreach ($__dashboard_items as $i) 318 316 { 319 if ($i->count() > 0) 320 { 321 $dashboardItems .= ''; 322 foreach ($i as $v) { 323 $dashboardItems .= $v; 324 } 325 $dashboardItems .= ''; 326 } 327 } 328 329 # Dashboard elements 317 foreach ($i as $v) { 318 $dashboardItems .= $v; 319 } 320 } 321 $dashboardContents = ''; 322 foreach ($__dashboard_contents as $i) 323 { 324 foreach ($i as $v) { 325 $dashboardContents .= $v; 326 } 327 } 328 329 # Dashboard elements: icons then boxes (items then contents) 330 330 echo '<div id="dashboard-main">'; 331 331 … … 391 391 } 392 392 393 foreach ($__dashboard_contents as $i)394 {395 if ($i->count() > 0)396 {397 $dashboardContents .= '';398 foreach ($i as $v) {399 $dashboardContents .= $v;400 }401 $dashboardContents .= '';402 }403 }404 405 393 if ($dashboardContents != '' || $dashboardItems != '') { 406 394 echo 407 395 '<div id="dashboard-boxes">'. 408 '<div class="db-items">'.$dashboardItems.$dashboardContents.'</div>'. 396 '<div class="db-items">'.$dashboardItems.'</div>'. 397 '<div class="db-contents">'.$dashboardContents.'</div>'. 409 398 '</div>'; 410 399 } -
admin/style/default.css
r3409 r3412 506 506 vertical-align: top; 507 507 margin: 0 10px 10px; 508 text-align: left; } 508 text-align: left; 509 flex: 1 1 auto; } 509 510 510 511 .box.small { 511 width: 312px; }512 flex-basis: 312px; } 512 513 513 514 .box.medium { 514 width: 644px; }515 flex-basis: 644px; } 515 516 516 517 .box.large { … … 524 525 525 526 /* ------------------------------------------------------------------------------------ 526 527 UN POIL DE MEDIA QUERIES 527 528 ------------------------------------------------------------------------------------ */ 528 529 @media screen and (max-width: 80em) { … … 2177 2178 flex-wrap: wrap; 2178 2179 justify-content: center; } 2180 2181 .db-items, 2182 .db-contents { 2183 display: flex; 2184 flex-wrap: wrap; 2185 justify-content: center; 2186 flex: 1 1 auto; } 2179 2187 2180 2188 .no-js .outgoing img { -
admin/style/scss/partials/_index.scss
r3398 r3412 122 122 // display: inline-block; 123 123 // text-align: center; 124 display: flex; 125 flex-wrap: wrap; 126 justify-content: center; 127 flex: 1 1 auto; 124 128 } 125 129 -
admin/style/scss/partials/_layout.scss
r3365 r3412 1 1 // Admin layout 2 2 #dotclear-admin { 3 4 5 3 display: flex; 4 min-height: 100vh; 5 flex-direction: column; 6 6 } 7 7 8 8 #header { 9 10 11 9 width: 99.99%; /* Bugfix Chrome >= 49.0.2623.108 */ 10 display: table; 11 position: relative; 12 12 } 13 13 … … 15 15 #top-info-blog, 16 16 #top-info-user { 17 18 19 20 21 17 display: table-cell; 18 padding: 8px 0; 19 margin: 0; 20 font-size: 1em; 21 vertical-align: top; 22 22 } 23 23 24 24 #wrapper { 25 26 27 28 29 30 25 position: relative; 26 padding-top: 1.5em; 27 float: left; 28 width: 100%; 29 z-index: 10; 30 flex: 1; 31 31 } 32 32 33 33 .with-js #wrapper { 34 34 padding-top: 0; 35 35 } 36 36 37 37 #main { 38 39 40 41 38 width: 100%; 39 float: right; 40 margin-left: -14em; 41 margin-top: 0; 42 42 } 43 43 44 44 #content { 45 46 45 margin: 0 0 0 14em; 46 padding: .5em 1.5em .75em 2.5em; 47 47 } 48 48 49 49 #main-menu { 50 51 52 53 54 55 50 width: 14em; 51 float: left; 52 margin: 0; 53 padding-top: .5em; 54 padding-bottom: 1em; 55 overflow: hidden; 56 56 } 57 57 58 58 #footer { 59 60 61 62 59 clear: both; 60 position: relative; 61 padding: .5em 0 .5em 1em; 62 text-align: left; 63 63 } 64 64 … … 67 67 68 68 #collapser { 69 70 71 72 73 74 75 76 77 78 79 69 position: absolute; 70 top: 0; 71 left: 14em; 72 width: $collapser-width; 73 height: 100%; 74 overflow: hidden; 75 display: block; 76 border-right: 0; // 1px solid #999; 77 border-bottom: 0; 78 z-index: 1; 79 transition: none; 80 80 } 81 81 82 82 .expand-mm { 83 83 display: none; 84 84 } 85 85 … … 87 87 88 88 .hide-mm #main { 89 89 margin-left: 0; 90 90 } 91 91 92 92 .hide-mm #content { 93 93 margin-left: $collapser-width; 94 94 } 95 95 96 96 .hide-mm #content > h2 { 97 97 margin-left: calc(-1em - #{$collapser-width}); 98 98 } 99 99 100 100 .hide-mm #main-menu { 101 101 display: none; 102 102 } 103 103 104 104 .hide-mm #collapser { 105 105 left: 0; 106 106 } 107 107 108 108 .hide-mm .collapse-mm { 109 109 display: none; 110 110 } 111 111 112 112 .hide-mm .expand-mm { 113 113 display: block; 114 114 } 115 115 … … 117 117 118 118 .two-cols { 119 119 position: static; 120 120 } 121 121 122 122 .two-cols .col { 123 124 125 123 width: 48%; 124 margin-left: 2%; 125 float: left; 126 126 } 127 127 128 128 .two-cols .col70 { 129 130 131 129 width: 68%; 130 margin-left: 0; 131 float: left; 132 132 } 133 133 134 134 .col30 { 135 136 137 135 width: 28%; 136 margin-left: 2%; 137 float: left; 138 138 } 139 139 140 140 .two-cols .col:first-child, 141 141 .two-cols .col30.first-col { 142 143 142 margin-left: 0; 143 margin-right: 2%; 144 144 } 145 145 146 146 .two-cols .col:last-child, 147 147 .two-cols .col70.last-col { 148 149 148 margin-left: 2%; 149 margin-right: 0; 150 150 } 151 151 152 152 .two-cols table { 153 153 width: 90%; 154 154 } 155 155 … … 158 158 159 159 .three-cols { 160 160 position: static; 161 161 } 162 162 163 163 .three-cols .col { 164 165 166 164 width: 32.3%; 165 float: left; 166 margin-left: 1%; 167 167 } 168 168 169 169 .three-cols .col:first-child { 170 170 margin-left: 0; 171 171 } 172 172 … … 175 175 176 176 .one-box { 177 177 text-align: justify; 178 178 } 179 179 180 180 .two-boxes { 181 181 width: 48.5%; 182 182 } 183 183 184 184 .three-boxes { 185 185 width: 30%; 186 186 } 187 187 188 188 .two-boxes, 189 189 .three-boxes { 190 191 192 193 190 display: inline-block; 191 vertical-align: top; 192 margin: 0 1.5% 1em; 193 text-align: left; 194 194 } 195 195 196 196 .two-boxes:nth-of-type(odd), 197 197 .three-boxes:nth-of-type(3n+1) { 198 198 margin-left: 0; 199 199 } 200 200 201 201 .two-boxes:nth-of-type(even), 202 202 .three-boxes:nth-of-type(3n) { 203 203 margin-right: 0; 204 204 } 205 205 … … 208 208 209 209 .popup h1 { 210 211 212 213 214 215 216 210 display: block; 211 width: 100%; 212 margin: 0; 213 font-size: 1.5em; 214 text-indent: 1em; 215 line-height: 1.5em; 216 font-weight: normal; 217 217 } 218 218 219 219 .popup #wrapper { 220 221 222 223 224 225 220 display: block; 221 float: none; 222 width: 100%; 223 margin: 0; 224 padding: 0; 225 background-position: 0 0; 226 226 } 227 227 228 228 .popup #main { 229 230 229 margin: 0; 230 padding: 0; 231 231 } 232 232 233 233 .popup #content { 234 235 234 margin: 0; 235 padding: 1em; 236 236 } 237 237 238 238 .popup #content h2 { 239 240 239 margin: 0 0 1em 0; 240 padding: 0; 241 241 } 242 242 243 243 .popup #footer p { 244 244 border: none; 245 245 } 246 246 … … 249 249 250 250 .constrained { 251 252 253 254 251 margin: 0; 252 padding: 0; 253 border: none; 254 background: transparent; 255 255 } 256 256 257 257 .table { 258 258 display: table; 259 259 } 260 260 261 261 .cell { 262 263 262 display: table-cell; 263 vertical-align: top; 264 264 } 265 265 266 266 .clear { 267 267 clear: both; 268 268 } 269 269 270 270 .lclear { 271 271 clear: left; 272 272 } 273 273 274 274 .clearer { 275 276 275 height: 1px; 276 font-size: 1px; 277 277 } 278 278 … … 282 282 .clearfix:before, 283 283 .clearfix:after { 284 285 284 content: " "; 285 display: table; 286 286 } 287 287 288 288 .clearfix:after { 289 289 clear: both; 290 290 } 291 291 … … 301 301 302 302 .box { 303 display: inline-block; 304 vertical-align: top; 305 margin: 0 10px 10px; 306 text-align: left; 303 display: inline-block; 304 vertical-align: top; 305 margin: 0 10px 10px; 306 text-align: left; 307 flex: 1 1 auto; 307 308 } 308 309 309 310 .box.small { 310 width: 312px; 311 // width: 312px; 312 flex-basis: 312px; 311 313 } 312 314 313 315 .box.medium { 314 width: 644px; 316 // width: 644px; 317 flex-basis: 644px; 315 318 } 316 319 317 320 .box.large { 318 321 width: 100%; 319 322 } 320 323 321 324 .odd { 322 325 margin-left: 0; 323 326 } 324 327 325 328 .even { 326 329 margin-right: 0; 327 330 } 328 331 329 332 /* ------------------------------------------------------------------------------------ 330 333 UN POIL DE MEDIA QUERIES 331 334 ------------------------------------------------------------------------------------ */ 332 335 333 336 @media screen and (max-width: $xl-screen) { 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 337 #main { 338 margin-left: -17em; 339 } 340 #content { 341 margin: 0 0 0 17em; 342 } 343 #main-menu { 344 width: 17em; 345 } 346 #collapser { 347 left: 17em; 348 } 349 h1 { 350 width: 19.5em; 351 } 352 #top-info-blog #switchblog { 353 max-width: 16em; 354 } 355 #top-info-blog a { 356 margin-left: 2em; 357 } 358 #header { 359 display: block; 360 width: 100%; 361 text-align: right; 362 } 363 #header h1, 364 #header h1 a { 365 width: 120px; 366 margin: 0; 367 } 368 h1, 369 #top-info-blog { 370 display: inline-block; 371 vertical-align: top; 372 margin-right: 1em; 373 } 374 #top-info-user { 375 display: block; 376 width: 100%; 377 } 378 .three-boxes, 379 .three-boxes .box, 380 .two-cols .col70, 381 .two-cols .col30 { 382 width: 100%; 383 margin-left: 0; 384 margin-right: 0; 385 } 383 386 } 384 387 385 388 @media screen and (max-width: $m-screen) { 386 387 388 389 390 391 392 393 394 389 #dashboard-boxes .box.medium, 390 .box.medium, 391 #dashboard-boxes .box.small, 392 .box.small, 393 #dashboard-boxes .box.large, 394 .box.large { 395 width: 95%; 396 margin: 10px auto; 397 } 395 398 } 396 399 397 400 @media screen and (max-width: $s-screen) { 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 401 #help-button { 402 height: 26px; 403 width: 26px; 404 margin: 0; 405 overflow: hidden; 406 } 407 #content.with-help #help-button { 408 top: 10em; // 77px; 409 } 410 .one-box, 411 .two-boxes, 412 .box, 413 .two-cols .col { 414 width: 96%; 415 margin-left: 0; 416 margin-right: 0; 417 } 418 #entry-wrapper { 419 float: none; 420 width: 100%; 421 margin-right: 0; 422 } 423 #entry-content { 424 margin-right: 0; 425 margin-left: 0; 426 } 427 #entry-sidebar { 428 width: 100%; 429 float: none; 430 } 428 431 } 429 432 430 433 @media screen and (max-width: $xs-screen) { 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 434 #header h1, 435 #header h1 a { 436 width: 42px !important; 437 height: 42px; 438 } 439 #wrapper, 440 #main, 441 #main-menu { 442 display: block; 443 float: none; 444 width: 100%; 445 margin: 0; 446 } 447 #main-menu a { 448 display: block; 449 width: 100%; 450 } 451 #main-menu h3 a { 452 display: inline; 453 } 454 #content, 455 .hide-mm #content { 456 margin: 0; 457 } 458 #collapser { 459 display: none; 460 } 461 #main #content > h2 { 462 margin: 0 -.25em 1em; 463 } 464 #dashboard-boxes .box.medium, 465 .box.medium, 466 #dashboard-boxes .box.small, 467 .box.small, 468 #dashboard-boxes .box.large, 469 .box.large { 470 width: 95%; 471 margin: 10px auto; 472 } 473 .cell, 474 #filters-form .cell { 475 display: inline-block; 476 vertical-align: bottom; 477 } 478 .pseudo-tabs li { 479 display: block; 480 float: left; 481 width: 50%; 482 } 480 483 } 481 484 482 485 @media screen and (max-width: $xxs-screen) { 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 } 486 #top-info-blog label, 487 .nomobile { 488 display: none; 489 } 490 #top-info-blog { 491 margin-bottom: .5em; 492 max-width: 75%; 493 } 494 #top-info-blog select { 495 margin-bottom: .5em; 496 } 497 #content.with-help #help-button { 498 top: 10em; // 120px; 499 right: 28rem; // 20.5em; 500 } 501 #content.with-help #help { 502 width: 28rem; 503 } 504 p.top-add { 505 margin-bottom: .5em; 506 } 507 .part-tabs ul { 508 margin: 1em 0; 509 } 510 .part-tabs li a { 511 display: block; 512 width: 100%; 513 } 514 #icons p { 515 width: 9em; 516 } 517 .media-item { 518 width: 90%; 519 } 520 #theme-new, 521 #theme-activate, 522 #theme-deactivate { 523 margin-left: 0; 524 margin-right: 0; 525 } 526 .box.current-theme { 527 margin: 5px; 528 width: 100%; 529 } 530 .current-theme .module-sshot img { 531 margin: 0; 532 float: none; 533 max-width: 100%; 534 } 535 table .maximal { 536 min-width: 14em; 537 } 538 .pseudo-tabs li { 539 display: block; 540 width: 100%; 541 float: none; 542 } 543 }
Note: See TracChangeset
for help on using the changeset viewer.