From: Raphaël Gertz Date: Mon, 28 Dec 2020 08:28:01 +0000 (+0100) Subject: Change box model X-Git-Tag: 0.1.7~1 X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/bfd9c347a670c137681add835286f47c9b3f0304 Change box model List new styling Cleanup Update stylesheet --- diff --git a/Resources/public/css/screen.css b/Resources/public/css/screen.css index c63abc3..e162bf8 100644 --- a/Resources/public/css/screen.css +++ b/Resources/public/css/screen.css @@ -38,40 +38,56 @@ dt, h1, h2, h3, h4, h5, h6, label, legend, th, details { /* Default styling */ h1 { font-size: 2rem; - margin: 1.34rem 0; } h2 { font-size: 1.5rem; - margin: 1.245rem 0; + margin: 0 0 .5rem; + padding: .5rem; } h3 { font-size: 1.17rem; - margin: 1.17rem 0; + margin: 0 0 .5rem; + padding: .4rem; } h4 { font-size: 1rem; - margin: 1.33rem 0; + margin: 0 0 .5rem; + padding: .3rem; } h5 { font-size: .85rem; - margin: 1.386rem 0; + margin: 0 0 .5rem; + padding: .2rem; } h6 { font-size: .67rem; - margin: 1.561rem 0; + margin: 0 0 .5rem; + padding: .1rem; } -p, -dt { - font-size: 1rem; +nav strong { + display: block; + font-size: 1.17rem; + margin: 0 0 .5rem; + padding: .4rem; } -dd { +h2, h3, h4, h5, nav strong { + background-color: #cff; + border-bottom: .1rem solid #00c3f9; +} + +strong { + font-weight: bold; +} + +p { + margin: 0 .5rem .3rem; font-size: .9rem; } @@ -81,6 +97,32 @@ body { color: #066; } +nav, +section { + margin: 0 .5rem .5rem; + border: .1rem solid #00c3f9; + border-radius: .3rem; +} + +ul { + display: grid; + margin: 0 .5rem .3rem; + font-size: .9rem; + list-style: ' - ' inside none; + gap: .3rem; +} + +nav ul { + list-style: none inside none; + margin-bottom: .5rem; + gap: .5rem; +} + +nav ul ul { + margin-top: .5rem; + margin-bottom: 0; +} + /* Form */ label { font-size: .8rem; @@ -105,13 +147,10 @@ form { display: flex; flex-direction: column; flex-wrap: wrap; + margin: 0 .5rem .5rem; text-align: center; } -/*form header .message { - margin: 0; -}*/ - form .row { flex-direction: row; } @@ -212,51 +251,57 @@ form .message { border: .1rem solid #00c3f9; border-top: 0; border-radius: 0 0 .5rem .5rem; - margin: .5rem; - margin-top: 0; + margin: 0 .5rem .5rem; display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: space-between; - /*min-width: 180px;*/ + line-height: 32px; + font-size: 32px; + padding: .5rem; + gap: .5rem; } #header h1 { padding: 0; margin: 0; - vertical-align: middle; white-space: nowrap; + width: 171px; + height: 32px; } -#header img { - margin: .5rem; +#header h2 { + display: none; } #header nav { display: flex; - flex-wrap: wrap; - align-items: center; - justify-content: flex-end; - padding: .5rem; + flex: 1 1 auto; + border-style: none; + margin: 0; } -#header nav h2 { - display: none; +#header ul { + display: flex; + flex: 1 1 auto; + flex-direction: row; + flex-wrap: wrap; + margin: 0; + gap: .5rem; } -#header nav a { - flex-grow: 1; - text-align: center; +#header li { + display: flex; + flex: 1 1 auto; border-radius: .2rem; - padding: .25rem .5rem; - margin: 0 0 0 .5rem; border: .1rem solid #00c3f9; - font-weight: bold; background-color: #cff; + justify-content: center; } -#header nav a:first-child { - margin: 0; +#header ul a { + text-align: center; + font-weight: bold; } /* Message */ @@ -278,8 +323,10 @@ form .message { padding: 0 .25rem; } -p.message { - margin: .5rem; +.message ul { + margin: 0; + list-style: none inside none; + gap: .1rem; } .mortal, @@ -360,58 +407,97 @@ p.message { flex-direction: column; } -#dashboard h2, -#form h2, -#recover h2, -#regulation h2 { - background-color: #cff; - border-bottom: .1rem solid #00c3f9; +.panel { + display: flex; + flex-direction: row; + margin: 0 .5rem .5rem; + gap: .5rem; +} + +.grid { + display: flex; + flex-flow: row wrap; + border-style: solid; + border-color: #00c3f9; + border-radius: .2rem; + flex: 1 1 auto; + box-sizing: border-box; + border-collapse: collapse; + gap: .1rem; +} + +.grid section { margin: 0; - padding: .5rem; } -#dashboard h3 { - background-color: #cff; - border-bottom: .1rem solid #00c3f9; +.grid h3 { margin: 0; - padding: .3rem; } -#dashboard h4 { - background-color: #cff; - border-bottom: .1rem solid #00c3f9; +.grid ul { + display: block; + margin: .1rem; + font-size: .8rem; + list-style: none inside none; +} + +.grid p { + margin: 0 0 .3rem; +} + +.grid p:only-child, +.grid p:last-child, +.grid p:last-of-type { margin: 0; - padding: .2rem; } -#form form, -#recover form { - padding: .5rem; +.form { + margin: 0; + display: flex; + flex-direction: column; + gap: .5rem; } -/*#dashboard .calendar h3 { - margin: -.3rem; - margin-bottom: .3rem; -}*/ +.form h2 { + font-size: 1.17rem; + padding: .4rem; +} -#dashboard .subgrid .cell { - padding: .3rem; +.form a { + white-space: nowrap; } -#dashboard .subgrid h4 { - margin: -.3rem; - margin-bottom: .3rem; +.form section { + margin: 0; + border: .05rem solid #00c3f9; + border-radius: .2rem; } -/*#dashboard h4 { - background-color: #cff; - border-bottom: .1rem solid #00c3f9; - margin: -.5rem; - margin-bottom: .5rem; - padding: .1rem; -}*/ +.form form { + gap: .5rem; +} + +#location section { + display: flex; + flex: 1 1 auto; + flex-direction: column; +} + +#location h3 { + margin: 0; + border-style: none; + flex: 1 1 auto; +} + +#location form { + margin-top: .5rem; +} + +#location form label { + width: 4.5rem; +} -#dashboard .panel { +/*#dashboard .panel { display: flex; flex-direction: row; flex-wrap: nowrap; @@ -432,7 +518,7 @@ p.message { #dashboard .panel:last-child, #dashboard .panel:last-of-type { padding-bottom: .5rem; -} +}*/ #dashboard .candidate section, #dashboard .location section { @@ -447,30 +533,17 @@ p.message { border-width: 0; } -#dashboard .grid { +/*#dashboard .grid { display: flex; flex-flow: row wrap; border-style: solid; border-color: #00c3f9; border-radius: .2rem; - /*border-width: .1rem 0 0 .1rem;*/ flex-grow: 1; - /*box-sizing: inherit;*/ box-sizing: border-box; border-collapse: collapse; - /*box-sizing: border-box; - display: table; - padding: 0; - flex-grow: 1; - table-layout: fixed; - border: 0 none; - width: fit-content; - border-collapse: collapse;*/ - /*width: calc(100% - 12rem); - border-collapse: collapse;*/ - /*width: calc(100% - 12rem);*/ gap: .1rem; -} +}*/ /*margin: 0; #dashboard .grid:only-child, @@ -479,10 +552,10 @@ p.message { margin-bottom: 0; }*/ -#dashboard .candidate .grid, +/*#dashboard .candidate .grid, #dashboard .location .grid { padding: .5rem; -} +}*/ #dashboard .dlgrid { display: flex; @@ -517,21 +590,6 @@ p.message { margin-left: 1rem; } -#dashboard ul { - /*padding: 0 .1rem;*/ - margin: .1rem; -} - -#dashboard li { - font-size: .8rem; - margin-bottom: .1rem; -} - -#dashboard li:only-child, -#dashboard li:last-child { - margin-bottom: 0; -} - #dashboard .subgrid { display: flex; flex-flow: row wrap; @@ -574,7 +632,7 @@ p.message { #dashboard .fourth { min-height: 5rem; - width: calc(100% / 4 - (6/7*.1rem)); + width: calc(100% / 4 - (3/4*.1rem)); } #dashboard .seventh { @@ -584,7 +642,7 @@ p.message { #dashboard .third { min-height: 5rem; - width: calc(100% / 3 - (6/7*.1rem)); + width: calc(100% / 3 - (2/3*.1rem)); } #dashboard .session { @@ -648,30 +706,6 @@ p.message { color: #3333c3; } -#dashboard .form { - margin: 0 0 0 .5rem; - display: flex; - flex-direction: column; - gap: .5rem; -} - -#dashboard .form a, -#dashboard .form h2 { - white-space: nowrap; - font-size: 1.17rem; - padding: .3rem; -} - -#dashboard .form section { - border: .05rem solid #00c3f9; - border-radius: .2rem; -} - -#dashboard .form form { - padding: .5rem; - gap: .5rem; -} - /* Weather * TODO: drop >24°C @@ -769,31 +803,19 @@ p.message { display: none; } +#footer ul { + list-style: none inside none; + margin: 0; +} + /* viewport responsive hack */ @media ( max-width: 900px ) { - #header nav { - padding: 0 0 .5rem 0; - } - - #header nav a { - margin: .5rem .5rem 0 0; - white-space: nowrap; - } - - #dashboard .calendar { + .panel { place-content: center; - flex-direction: column; - flex-wrap: wrap; - } - - #dashboard .panel:only-child, - #dashboard .panel:last-child, - #dashboard .panel:last-of-type { - margin-bottom: .5rem; + flex-flow: column wrap; } - #dashboard .form { - margin: .5rem auto 0 auto; + .form { flex-direction: row; } @@ -832,17 +854,21 @@ p.message { #dashboard .seventh:nth-child(7n+2), #dashboard .seventh:nth-child(7n+3), #dashboard .seventh:nth-child(7n+4) { - width: calc(100% / 4 - (6/7*.1rem)); + width: calc(100% / 4 - (3/4*.1rem)); } #dashboard .seventh:nth-child(7n+5), #dashboard .seventh:nth-child(7n+6), #dashboard .seventh:nth-child(7n+7) { - width: calc(100% / 3 - (6/7*.1rem)); + width: calc(100% / 3 - (2/3*.1rem)); } } @media ( max-width: 600px ) { + form label { + margin: 0 auto; + } + form input, form option, form optgroup, @@ -850,22 +876,15 @@ p.message { form textarea, form section section { width: 14rem; + margin: 0 auto; } #header { flex-direction: column; } - #header nav { - justify-content: space-between; - padding: 0 .5rem 0 0; - } - #header nav a { - width: auto; - margin: 0 0 .5rem .5rem; - } #dashboard .seventh:nth-child(n) { - width: calc(100% / 2 - (6/7*.1rem)); + width: calc(100% / 2 - .1rem); } #dashboard .seventh:nth-child(7n) { @@ -873,5 +892,14 @@ p.message { } } -@media ( max-width: 500px ) { +@media ( max-width: 450px ) { + form .row, + .grid, + .form { + flex-direction: column; + } + + #dashboard .seventh:nth-child(n) { + width: calc(100%); + } }