Skip to content

Commit b9ff0ce

Browse files
authored
Merge pull request mdn#59 from jsnkuhn/main
[Border-image generator] floats to grid/flex
2 parents dd54a15 + 0b09374 commit b9ff0ce

File tree

1 file changed

+33
-84
lines changed

1 file changed

+33
-84
lines changed

tools/border-image-generator/styles.css

Lines changed: 33 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -53,33 +53,15 @@
5353
* ========================================================================== */
5454

5555
.section {
56-
clear: both;
5756
padding: 0px;
5857
margin: 0px;
5958
}
6059

61-
/* GROUPING
62-
* ========================================================================== */
63-
64-
.group:before, .group:after {
65-
content: "";
66-
display: table;
67-
}
68-
69-
.group:after {
70-
clear:both;
71-
}
72-
73-
.group {
74-
zoom: 1; /* For IE 6/7 (trigger hasLayout) */
75-
}
76-
7760
/* GRID COLUMN SETUP
7861
* ========================================================================== */
7962

8063
.col {
8164
display: block;
82-
float:left;
8365
margin: 1% 0 1% 1.6%;
8466
}
8567

@@ -96,17 +78,17 @@
9678
font-family: "Segoe UI", Arial, Helvetica, sans-serif;
9779
-moz-user-select: none;
9880
user-select: none;
81+
display: flex;
9982
}
10083

10184
.ui-input-slider * {
102-
float: left;
10385
height: 100%;
10486
line-height: 100%;
10587
}
10688

10789
/* Input Slider */
10890

109-
.ui-input-slider > input {
91+
.ui-input-slider > input {
11092
margin: 0;
11193
padding: 0;
11294
width: 50px;
@@ -250,7 +232,7 @@
250232
top: 0;
251233
}
252234

253-
.ui-dropdown-list > div {
235+
.ui-dropdown-list > div {
254236
width: 100%;
255237
height: 1.6em;
256238
margin: 0.3em 0;
@@ -262,7 +244,7 @@
262244
box-sizing: border-box;
263245
}
264246

265-
.ui-dropdown-list > div:hover {
247+
.ui-dropdown-list > div:hover {
266248
background: #3490D2;
267249
color:#FFF;
268250
border-radius: 2px;
@@ -291,11 +273,11 @@
291273
user-select: none;
292274
}
293275

294-
.ui-checkbox > input {
276+
.ui-checkbox > input {
295277
display: none;
296278
}
297279

298-
.ui-checkbox > label {
280+
.ui-checkbox > label {
299281
font-size: 12px;
300282
padding: 0.333em 1.666em 0.5em;
301283
height: 1em;
@@ -309,7 +291,6 @@
309291
color: #FFF;
310292
border-radius: 2px;
311293
font-weight: bold;
312-
float: left;
313294
}
314295

315296
.ui-checkbox .text {
@@ -323,11 +304,11 @@
323304
background-position: center right 10px;
324305
}
325306

326-
.ui-checkbox > label:hover {
307+
.ui-checkbox > label:hover {
327308
cursor: pointer;
328309
}
329310

330-
.ui-checkbox > input:checked + label {
311+
.ui-checkbox > input:checked + label {
331312
background-image: url("checked.png");
332313
background-color: #379B4A;
333314
}
@@ -379,7 +360,7 @@ body[data-move='Y'] {
379360
cursor: move;
380361
}
381362

382-
[data-draggable='true']:hover > * {
363+
[data-draggable='true']:hover > * {
383364
cursor: default;
384365
}
385366

@@ -395,15 +376,14 @@ body[data-move='Y'] {
395376
}
396377

397378
#image-gallery {
398-
width: 600px;
399-
height: 100px;
400-
margin: 0 auto;
379+
display: flex;
380+
flex-wrap: wrap;
381+
justify-content: center;
401382
transition: margin 0.4s;
402383
}
403384

404385
#image-gallery .image {
405386
height: 80px;
406-
float: left;
407387
margin: 10px;
408388
opacity: 0.5;
409389
background-color: #FFF;
@@ -429,6 +409,7 @@ body[data-move='Y'] {
429409

430410
#load-actions {
431411
margin: 10px 0;
412+
display: flex;
432413
}
433414

434415
#toggle-gallery {
@@ -443,7 +424,6 @@ body[data-move='Y'] {
443424
background-color: #888888 !important;
444425

445426
border-radius: 2px;
446-
float: left;
447427
}
448428

449429
#toggle-gallery:hover {
@@ -469,7 +449,6 @@ body[data-move='Y'] {
469449
line-height: 25px;
470450
background-color: #379B4A;
471451
border-radius: 2px;
472-
float: left;
473452
}
474453

475454
.button:hover {
@@ -478,7 +457,7 @@ body[data-move='Y'] {
478457
}
479458

480459
#load-image {
481-
float: left;
460+
482461
}
483462

484463
#load-remote {
@@ -495,7 +474,6 @@ body[data-move='Y'] {
495474
padding: 0 5px;
496475
border: 1px solid #379B4A;
497476
border-radius: 2px;
498-
float: left;
499477

500478
transition: width 0.5s;
501479
}
@@ -597,7 +575,7 @@ body[data-move='Y'] {
597575
color: #555;
598576
}
599577

600-
#subject [data-active] > * {
578+
#subject [data-active] > * {
601579
opacity: 1;
602580
}
603581

@@ -686,36 +664,38 @@ body[data-move='Y'] {
686664
color: #888;
687665
/*border-radius: 2px;*/
688666
box-shadow: 0 0 3px 0 #BABABA;
667+
display: flex;
668+
flex-wrap: wrap;
669+
row-gap: 10px;
689670
}
690671

691672
#general-controls .property {
692673
width: 130px;
693-
float: left;
674+
display: flex;
694675
}
695676

696677
#general-controls .name {
697678
height: 20px;
698679
margin: 0 10px 0 0;
699680
line-height: 100%;
700681
text-align: right;
701-
float: left;
702682
}
703683

704684
#general-controls .right {
705685
width: 200px;
706-
float: right;
686+
margin-left: auto;
707687
}
708688

709689
#general-controls .ui-checkbox label {
710690
height: 10px;
691+
display: block;
711692
}
712693

713694
#general-controls .separator {
714695
height: 40px;
715696
width: 1px;
716697
margin: -10px 15px;
717698
background-color: #EEE;
718-
float: left;
719699
}
720700

721701
/*
@@ -724,17 +704,18 @@ body[data-move='Y'] {
724704

725705
#controls {
726706
color: #444;
727-
margin: 10px 0 0 0;
707+
margin: 0 auto;
708+
display: grid;
709+
grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
710+
gap: 20px;
711+
padding: 20px;
712+
justify-content: space-between;
728713
}
729714

730715
#controls .category {
731-
height: 190px;
732-
min-width: 260px;
733-
margin: 10px;
734716
padding: 10px;
735717
border: 1px solid #CCC;
736718
border-radius: 3px;
737-
float: left;
738719

739720
box-shadow: 0 0 3px 0 #BABABA;
740721
transition: all 0.25s;
@@ -744,22 +725,6 @@ body[data-move='Y'] {
744725
box-sizing: border-box;
745726
}
746727

747-
@media (min-width: 880px) {
748-
#controls .category {
749-
width: 30%;
750-
margin-left: 1.66%;
751-
margin-right: 1.66%;
752-
}
753-
}
754-
755-
@media (max-width: 879px) {
756-
#controls .category {
757-
width: 37%;
758-
margin-left: 6.5%;
759-
margin-right: 6.5%;
760-
}
761-
}
762-
763728
#controls .category .title {
764729
width: 100%;
765730
height: 30px;
@@ -774,7 +739,7 @@ body[data-move='Y'] {
774739
color: #777;
775740
}
776741

777-
#controls .category > .group {
742+
#controls .category > .group {
778743
border: 1px solid #CCC;
779744
border-radius: 2px;
780745
}
@@ -785,11 +750,11 @@ body[data-move='Y'] {
785750
width: 250px;
786751
height: 20px;
787752
margin: 5px auto;
753+
display: flex;
788754
}
789755

790756
#controls .property .ui-input-slider {
791757
margin: 0;
792-
float: left;
793758
}
794759

795760
#controls .property .ui-input-slider-info {
@@ -812,13 +777,11 @@ body[data-move='Y'] {
812777
padding: 0px 10px 0px 0px;
813778
text-align: right;
814779
line-height: 100%;
815-
float: left;
816780
}
817781

818782
#controls .property .config {
819783
width: 20px;
820784
height: 20px;
821-
float: left;
822785
background: url("config.png") center center no-repeat;
823786
opacity: 0.5;
824787
}
@@ -838,15 +801,14 @@ body[data-move='Y'] {
838801

839802
#controls .property .ui-dropdown {
840803
margin: 0 10px;
841-
float: left;
842804
}
843805

844806
#controls .property .ui-checkbox {
845807
margin: 0 0 0 16px;
846-
float: left;
847808
}
848809

849810
#controls .property .ui-checkbox label {
811+
display: block;
850812
height: 0.85em;
851813
width: 10px;
852814
}
@@ -908,7 +870,7 @@ body[data-move='Y'] {
908870
width: 200px;
909871
}
910872

911-
#additional-properties .ui-input-slider > input {
873+
#additional-properties .ui-input-slider > input {
912874
width: 80px !important;
913875
}
914876

@@ -994,25 +956,14 @@ body[data-move='Y'] {
994956
box-shadow: none !important;
995957
border-radius: 3px;
996958
overflow: hidden;
959+
grid-column: span 2;
997960

998961
-moz-user-select: text;
999962
-webkit-user-select: text;
1000963
-ms-user-select: text;
1001964
user-select: text;
1002965
}
1003966

1004-
@media (min-width: 880px) {
1005-
#output {
1006-
width: 63.33% !important;
1007-
}
1008-
}
1009-
1010-
@media (max-width: 879px) {
1011-
#output {
1012-
width: 87% !important;
1013-
}
1014-
}
1015-
1016967
#output .title {
1017968
width: 100%;
1018969
height: 30px;
@@ -1029,19 +980,17 @@ body[data-move='Y'] {
1029980
color: #555;
1030981
font-size: 14px;
1031982
line-height: 18px;
1032-
float: left;
983+
display: flex;
1033984
}
1034985

1035986
#output .css-property .name {
1036987
width: 30%;
1037988
font-weight: bold;
1038989
text-align: right;
1039-
float: left;
1040990
}
1041991

1042992
#output .css-property .value {
1043993
width: 65%;
1044994
padding: 0 2.5%;
1045995
word-break: break-all;
1046-
float: left;
1047996
}

0 commit comments

Comments
 (0)