From 0e2df15483ad796490d078bb77844814ad2f4f69 Mon Sep 17 00:00:00 2001 From: Jonathan Jaubart Date: Sat, 20 Jun 2020 12:36:52 +0100 Subject: [PATCH] Improvements to edit forms Minor CSS improvements on blocks --- src/sass/resources/images/block_bg.png | Bin 2347 -> 4181 bytes src/sass/rural/_global.scss | 33 +++++---- src/sass/rural/_main.scss | 23 +++++++ src/sass/rural/_pages-blocks.scss | 91 +++++++++++++++++-------- 4 files changed, 103 insertions(+), 44 deletions(-) diff --git a/src/sass/resources/images/block_bg.png b/src/sass/resources/images/block_bg.png index 51284181fd764142d7b3b6633740050d1acf15e0..e84f39d951f98acc055bf595269ee9973d67dff5 100644 GIT binary patch literal 4181 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 literal 2347 zcmds2`8N~_1D(>TP`p&=2{V?N7{)qdHv2M&(b$ruXk=ezY=hB!W8bNS(kCTJc}Q7a z%EL!gBBL)^vt^pijCID4Jnx_Qe)#S=_uL=vz31F>Ztev%PMF z2|X$S035(IBm)5e3BUy>cUyIJ4UuSz&lhmHJQj=n>C?#2&~ShMKyB?4Ya6@kGS48=gQJ&^Z%%#zOi!=<)vIU{DKaW*Qz%?r zTU+MyIb1HA!~v->vSkgF%YT{qIL^f85FjS6#t40~Cgc>LZ>7R{70OL$RBm^+RNHx?@ zCCo@Q0i_;|P>Vxr#G*7vChEzi5HeCD%0!)n(g=gAQO(Z9W5Ka#aImr3bxUnB8XSXx zB$;c+n`%+av{P+hG;3IvgJF`TZaU5|#afSMYmn!J$UKioJ&!1GHND|(9&3*xJ7P1u z>{Hxr&zqr=qQWkLWc25*9*1L*g-z7!)`Hp^;*)oouR2HG@(ubra2X63n0p7O-e6lx}C3;fP4Hhv(tZ z@m2;|PN)(u8xmYS7730>g$)je=oUp zs~|srZ*T9{uV1^nyFY*a+}YXL-rg3A#amljB9TZa6mD*AZftCbi^*gzEiElBF3!)-&&|!v&d$!v%uG*DPfkvbkB^Uy zjdgW(b#`_>fBw9op`os>uA-u%u&@vghs(>$OG!!X$Jk%#{}O74twQ$wrs7=jZu{>4 zrvLzlS@ivyk|g^}u>gRy+&?@pIz#&j036~t*jTzF3o~!;_>DA&)H@6jho;-x7TPewH4f=!-c@ayTe+kk&QJ`hJVm8K0Ei?RCfC>7%dM z3&zR<-eQU4*udS}@4p?vPKvy%TV?O~D@GGHDpc~ounK5FQO`I4^Rh~H>uJl6D-QQ% z{tz$^m)J`7TGmSRgNS)LC35$iK7(q?S$iQZAF8pe9 zvgVC`m_#6qA|n);_F7gcBVG>@KqeK`nlF_ejv#Z1HoCL9mDK%pQ-xDks1NnEC;^=Q zs;Mr+Kby}zY0pmxbTJUWjum!VGo}zQaU53FuiW^?n>R>-NY>~%nb132{w_%GaJ*oOmdAm3ypMtXkF*I#u9D7|z1=29zB)=mFTv**~^QmF!A?xPXnI zKe!CSIgMVKZXK@5oOYfh-F-y6b~&7OO(LwI}TXuYhWp6WAX80jservg#+m3DxfIzZ?R z)jfeL55XR<)Q!0w?pEjmEgxK9$;+})Ux^-LoT+BR>_&~E#+!1QWz28MrB6j^GrArF z3_p0yx?!~kJ&1Q}=D_d7j=j(eDI*O3|H7Gk{5yvC%;fb$7)`i&Jx+x;MBDuJv9Mj* zPEiW{IzqIPh`m{UfR)U<7Et1LpRXl>Jlb1>E2hX^`*wU= z3$4f;Hpx!S@Ew1wXTEzZOvu7iab7N@rS)ZqCosg`4U&GJYUVV5+ZT)pdy(9{8}DrD zsLae|n?RlfH#$2P;jDa{pi23&r}paJPt14}*=uNiNNCck&Bm#JZNjNNn!Ze&xJeie z7AxEtsXDq5lP?kV2jl6didM3xM>aYF@t={@doqLY<#9F=P40<2taQ{K@7|Ns{=*-u zoO!!O7BcAYc#{?i^Dqv!c$-Em|FpjW D<}0=$ diff --git a/src/sass/rural/_global.scss b/src/sass/rural/_global.scss index 1f4da3c..e6bdce2 100644 --- a/src/sass/rural/_global.scss +++ b/src/sass/rural/_global.scss @@ -179,22 +179,22 @@ input, select, .custom-select{ * Select2 overrides */ -.select2 { + .select2-container { .select2-selection, .select2-dropdown { background-color: $maj-c-theme-lighter; } - .select2-selection.select2-selection--single { + .select2-selection--single { min-height: 28px; height: auto; - } - - .select2-container .select2-selection--single .select2-selection__rendered { - padding-left: 2px; - } - - .select2-selection--single .NAME { - padding-left: 4px; + + .select2-selection__rendered { + padding-left: 2px; + } + + .NAME { + padding-left: 4px; + } } } @@ -202,14 +202,17 @@ input, select, .custom-select{ * Common classes */ - .maj-font-color-brown { +.center { + text-align: center; +} + +.maj-font-color-brown { @include maj-font-color($maj-c-theme-dark, $maj-c-theme-medium); - } +} - .maj-font-color-blue { +.maj-font-color-blue { @include maj-font-color($maj-c-bluegray, $maj-c-bluegray-dark); - } - +} .maj-content-tabs { diff --git a/src/sass/rural/_main.scss b/src/sass/rural/_main.scss index f473c79..1f94fbd 100644 --- a/src/sass/rural/_main.scss +++ b/src/sass/rural/_main.scss @@ -124,6 +124,29 @@ text-align: center; } + +form.wt-page-content { + @extend .container; + + > .form-group { + + background-color: $maj-c-theme-light; + + .col-form-label { + color: $maj-c-theme-primary; + background-color: $maj-c-theme-medium; + } + + > div { + padding: $input-padding-y $input-padding-x; + } + } + + > .card { + @extend .row; + } +} + /* Tabs */ .nav-tabs { diff --git a/src/sass/rural/_pages-blocks.scss b/src/sass/rural/_pages-blocks.scss index 2d8da84..03646a4 100644 --- a/src/sass/rural/_pages-blocks.scss +++ b/src/sass/rural/_pages-blocks.scss @@ -21,8 +21,16 @@ * along with webtrees-MyArtJaub. If not, see . */ + @mixin maj-block-large { + padding-top: 0; + padding-left: 46px; + background-image: url(block_bg.png); + background-repeat: repeat-y; + } + .wt-block { border-style: none; + background-color: transparent; &:first-child { margin-top: 1rem; @@ -36,17 +44,18 @@ .wt-side-blocks &.wt-side-block-optional { display: none !important; } + + #edit-blocks & { + @include maj-block-large; + } - @include media-breakpoint-up(md) { - .wt-main-blocks & { + .wt-main-blocks & { + @include media-breakpoint-up(md) { + @include maj-block-large; + &:first-child { margin-top: 1rem; } - - padding-top: 0; - padding-left: 46px; - background-image: url(block_bg.png); - background-repeat: repeat-y; } } @@ -64,30 +73,17 @@ .dataTables_wrapper { border: none; } + + & > p { + text-align: center; + } } - - - .wt-block-content-user_messages { - - - button { - @extend .btn; - @extend .btn-primary; - - margin-left: 1rem; - } - - h2 { - font-size: 1rem; - - &:first-child { - font-weight: bold; - } - } - - table { - @extend .table-striped; + .wt-block-content-charts { + overflow-y: auto; + + .wt-chart-box { + width: 15rem; } } @@ -107,5 +103,42 @@ } } } + + .wt-block-content-html { + p { + text-align: unset; + } + } + + .wt-block-content-user_messages { + button[type=submit] { + @extend .btn; + @extend .btn-primary; + } + + label + select { + margin-left: 0.5rem; + margin-right: 0.5rem; + } + + h2 { + font-size: 1rem; + + &:first-child { + font-weight: bold; + } + } + + table { + @extend .table-striped; + + tr:nth-child(even) .list_value_wrap {background: $maj-c-theme-light} + tr:nth-child(odd) .list_value_wrap {background: $maj-c-theme-lighter} + + .list_value_wrap .btn-primary { + @extend .btn-primary; + } + } + } }