From 4449b9fb2233bfb7519ae00c99f7fa95621ae968 Mon Sep 17 00:00:00 2001
From: unknown <alberto@siles.pe>
Date: Mon, 23 Nov 2015 21:12:26 -0500
Subject: [PATCH] Correct fieldsets padding, improve checkbox and radios
rendering.
---
LICENSE.txt | 339 --------------------------
bootstrap_barrio.theme | 7 +
css/components/form.css | 152 +-----------
css/components/header.css | 195 ---------------
templates/form/form-element.html.twig | 96 +++++---
5 files changed, 70 insertions(+), 719 deletions(-)
delete mode 100644 LICENSE.txt
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index d159169..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/bootstrap_barrio.theme b/bootstrap_barrio.theme
index e6c6a81..5faae69 100644
--- a/bootstrap_barrio.theme
+++ b/bootstrap_barrio.theme
@@ -242,6 +242,13 @@ function bootstrap_barrio_preprocess_block(&$variables) {
}
}
+function bootstrap_barrio_preprocess_form_element(&$variables) {
+ if (is_object($variables['label']['#title'])) {
+ $variables['input_title'] = $variables['label']['#title']->render();
+ }
+ $variables['input_attributes'] = new Attribute($variables['element']['#attributes']);
+}
+
/**
* Implements hook_preprocess_HOOK() for menu.html.twig.
*/
diff --git a/css/components/form.css b/css/components/form.css
index dae3432..505a568 100644
--- a/css/components/form.css
+++ b/css/components/form.css
@@ -1,6 +1,6 @@
/**
* @file
- * Visual styles for Bartik's forms.
+ * Visual styles for Bootstrap Barrio's forms.
*/
/* Password field. */
@@ -15,160 +15,10 @@ form {
}
fieldset {
margin: 1em 0;
- padding-left: 1.25rem;
-}
-details,
-fieldset,
-.filter-wrapper {
- border-radius: 4px;
-}
-.filter-wrapper {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-.filter-help a {
- font-size: 0.857em;
-}
-.filter-wrapper .form-item label {
- margin-right: 10px; /* LTR */
-}
-[dir="rtl"] .filter-wrapper .form-item label {
- margin-left: 10px;
- margin-right: 0;
-}
-summary {
- background: #dbdbdb;
- color: #3b3b3b;
- text-shadow: 0 1px 0 #fff;
-}
-details summary a {
- color: #3b3b3b;
}
/* Node Form */
-#edit-body {
- margin-bottom: 2em;
-}
-.node-form label,
-.node-form .description {
-}
-.node-form .form-wrapper {
- margin-bottom: 2em;
-}
/* Contact Form */
-.contact-form #edit-name {
- width: 75%;
- border-radius: 4px;
-}
-.contact-form #edit-mail {
- width: 75%;
- border-radius: 4px;
-}
-.contact-form #edit-subject {
- width: 75%;
- border-radius: 4px;
-}
-.contact-form #edit-message {
- width: 76.3%;
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
-}
-
-/* Disabled form elements */
-.form-disabled input,
-.form-disabled select,
-.form-disabled textarea {
- background: #ededed;
- border-color: #bbb;
- color: #717171;
-}
-.form-disabled label {
- color: #717171;
-}
/* Comment form */
-.comment-form label {
- float: left; /* LTR */
- font-size: 0.929em;
- width: 120px;
-}
-[dir="rtl"] .comment-form label {
- float: right;
-}
-.comment-form input,
-.comment-form .form-select {
- margin: 0;
- border-radius: 4px;
-}
-.comment-form .form-type-textarea label {
- float: none;
-}
-.comment-form .form-item,
-.comment-form .form-radios,
-.comment-form .form-type-checkbox,
-.comment-form .form-select {
- margin-bottom: 10px;
- overflow: hidden;
-}
-.comment-form .form-type-checkbox,
-.comment-form .form-radios {
- margin-left: 120px; /* LTR */
-}
-[dir="rtl"] .comment-form .form-type-checkbox,
-[dir="rtl"] .comment-form .form-radios,
-[dir="rtl"] .comment-form .form-item .description {
- margin-left: 0;
- margin-right: 120px;
-}
-.comment-form .form-type-checkbox label,
-.comment-form .form-radios label {
- float: none;
- margin-top: 0;
-}
-.comment-form input.form-file {
- width: auto;
-}
-.layout-no-sidebars .comment-form .form-text {
- width: 800px;
-}
-.layout-one-sidebar .comment-form .form-text {
- width: 500px;
-}
-.layout-two-sidebars .comment-form .form-text {
- width: 320px;
-}
-.comment-form .form-item .description {
- font-size: 0.786em;
- line-height: 1.2;
- margin-left: 120px; /* LTR */
-}
-.comment-form .form-textarea {
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
-}
-.comment-form details.filter-wrapper .details-wrapper,
-.comment-form .text-format-wrapper .form-item {
- margin-top: 0;
- margin-bottom: 0;
-}
-.filter-wrapper label {
- width: auto;
- float: none;
-}
-.filter-wrapper .form-select {
- min-width: 120px;
-}
-.comment-form details.filter-wrapper .tips {
- font-size: 0.786em;
-}
-#comment-body-add-more-wrapper .form-type-textarea label {
- margin-bottom: 0.4em;
-}
-#edit-actions input {
- margin-right: 0.6em; /* LTR */
-}
-[dir="rtl"] #edit-actions input {
- margin-left: 0.6em;
- margin-right: 0;
-}
diff --git a/css/components/header.css b/css/components/header.css
index 793c53a..43897c1 100644
--- a/css/components/header.css
+++ b/css/components/header.css
@@ -1,196 +1 @@
/* ------------------ Header ------------------ */
-#header {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-.header .section {
- position: relative;
-}
-.region-header {
- padding: 0.357em 15px 0;
-}
-.region-header .site-branding {
- margin-top: 0.429em;
-}
-@media all and (min-width: 461px) {
- .region-header .block {
- float: right; /* LTR */
- margin-top: 0.357em;
- }
- [dir="rtl"] .region-header .block {
- float: left;
- }
- .region-header .site-branding {
- float: left; /* LTR */
- /* margin-bottom: 1.857em;*/
- }
- [dir="rtl"] .region-header .site-branding {
- float: right;
- }
-}
-
-/* Region header blocks. */
-.region-header .block:not(.site-branding) {
- font-size: 0.857em;
- margin: 0 0 1em;
- clear: right;
-}
-@media all and (min-width: 901px) {
- .region-header .block:not(.site-branding) {
- margin: 1.167em 0 1em;
- }
-}
-.region-header .block > h2 {
- /* @extend .visually-hidden */
- position: absolute !important;
- clip: rect(1px, 1px, 1px, 1px);
- overflow: hidden;
- height: 1px;
-}
-.header .block .content {
- margin: 0;
- padding: 0;
-}
-.region-header .block ul {
- padding: 0;
-}
-.region-header .block li {
- list-style: none;
- list-style-image: none;
- padding: 0;
-}
-.region-header .branding {
- font-size: 1em;
-}
-.region-header .form-text {
- background: #fefefe;
- background: rgba(255, 255, 255, 0.7);
- border-color: #ccc;
- border-color: rgba(255, 255, 255, 0.3);
- margin-right: 2px; /* LTR */
- width: 120px;
-}
-[dir="rtl"] .region-header .form-text {
- margin-left: 2px;
- margin-right: 0;
-}
-.region-header .form-text:hover,
-.region-header .form-text:focus,
-.region-header .form-text:active {
- background: #fff;
- background: rgba(255, 255, 255, 0.8);
-}
-.region-header .form-required:after {
- background-image: url(../../images/required.svg);
-}
-/* Region header block menus. */
-.region-header .block-menu {
- border: 1px solid;
- border-color: #eee;
- border-color: rgba(255, 255, 255, 0.2);
- padding: 0;
- width: 208px;
-}
-.region-header .block-menu li a {
- display: block;
- border-bottom: 1px solid;
- border-bottom-color: #eee;
- border-bottom-color: rgba(255, 255, 255, 0.2);
- padding: 3px 7px;
-}
-.region-header .block-menu li a:hover,
-.region-header .block-menu li a:focus,
-.region-header .block-menu li a:active {
- text-decoration: none;
- background: rgba(255, 255, 255, 0.15);
-}
-.region-header .block-menu li:last-child a {
- border-bottom: 0;
-}
-/* User Login block in the header region. */
-.region-header #block-user-login {
- width: auto;
-}
-.region-header #block-user-login .content {
- margin-top: 2px;
-}
-.region-header #block-user-login .form-item {
- float: left; /* LTR */
- margin: 0;
- padding: 0;
-}
-.region-header #block-user-login div.item-list,
-.region-header #block-user-login div.description {
- font-size: 0.916em;
- margin: 0;
-}
-.region-header #block-user-login div.item-list {
- clear: both;
-}
-.region-header #block-user-login div.description {
- display: inline;
-}
-.region-header #block-user-login .item-list ul {
- padding: 0;
- line-height: 1;
-}
-.region-header #block-user-login .item-list li {
- list-style: none;
- float: left; /* LTR */
- padding: 3px 0 1px;
-}
-.region-header #block-user-login .item-list li:last-child {
- padding-left: 0.5em; /* LTR */
-}
-[dir="rtl"] .region-header #block-user-login .item-list li:last-child {
- padding-left: 0;
- padding-right: 0.5em;
-}
-.region-header #block-user-login .form-actions {
- margin: 4px 0 0;
- padding: 0;
- clear: both;
-}
-.region-header #block-user-login input.form-submit {
- border: 1px solid;
- border-color: #ccc;
- border-color: rgba(255, 255, 255, 0.5);
- background: #eee;
- background: rgba(255, 255, 255, 0.7);
- margin: 4px 0;
- padding: 3px 8px;
-}
-.region-header #block-user-login input.form-submit:hover,
-.region-header #block-user-login input.form-submit:focus {
- background: #fff;
- background: rgba(255, 255, 255, 0.9);
-}
-/* Search block in header region. */
-.region-header #block-search-form {
- width: 208px;
-}
-.region-header #block-search-form .form-text {
- width: 154px;
-}
-.region-header .search-block-form {
- float: right; /* LTR */
-}
-[dir="rtl"] .region-header .search-block-form {
- float: left;
-}
-
-/* Language switcher block in header region. */
-.region-header .block-locale ul li {
- display: inline;
- padding: 0 0.5em;
-}
-[role*=banner] a {
- border-bottom: none;
-}
-
-[dir="rtl"] .branding,
-[dir="rtl"] .site-logo,
-[dir="rtl"] .site-branding-text,
-[dir="rtl"] .region-header #block-user-login .form-item,
-[dir="rtl"] .region-header #block-user-login .item-list li {
- float: right;
-}
diff --git a/templates/form/form-element.html.twig b/templates/form/form-element.html.twig
index b8990b7..75d79ba 100644
--- a/templates/form/form-element.html.twig
+++ b/templates/form/form-element.html.twig
@@ -44,6 +44,7 @@
* @see template_preprocess_form_element()
*/
#}
+
{%
set classes = [
'js-form-item',
@@ -65,39 +66,66 @@
%}
{% if type in ['checkbox', 'radio'] %}
<div{{ attributes.addClass(classes) }}>
-{% else %}
+ {% if prefix is not empty %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {% if description_display == 'before' and description.content %}
+ <div{{ description.attributes }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+ <label>
+ {% if label_display == 'before' %}
+ {{ input_title }}
+ {% endif %}
+ <input{{ input_attributes }}>
+ {% if label_display == 'after' %}
+ {{ input_title }}
+ {% endif %}
+ </label>
+ {% if suffix is not empty %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if errors %}
+ <div class="alert alert-danger" role="alert">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if description_display in ['after', 'invisible'] and description.content %}
+ <small{{ description.attributes.addClass(description_classes) }}>
+ {{ description.content }}
+ </small>
+ {% endif %}
+ </div>
+ {% else %}
<fieldset{{ attributes.addClass(classes, 'form-group') }}>
-{% endif %}
- {% if label_display in ['before', 'invisible'] %}
- {{ label }}
- {% endif %}
- {% if prefix is not empty %}
- <span class="field-prefix">{{ prefix }}</span>
- {% endif %}
- {% if description_display == 'before' and description.content %}
- <div{{ description.attributes }}>
- {{ description.content }}
- </div>
- {% endif %}
- {{ children }}
- {% if suffix is not empty %}
- <span class="field-suffix">{{ suffix }}</span>
- {% endif %}
- {% if label_display == 'after' %}
- {{ label }}
- {% endif %}
- {% if errors %}
- <div class="alert alert-danger" role="alert">
- <strong>{{ errors }}</strong>
- </div>
- {% endif %}
- {% if description_display in ['after', 'invisible'] and description.content %}
- <small{{ description.attributes.addClass(description_classes) }}>
- {{ description.content }}
- </small>
- {% endif %}
-{% if type in ['checkbox', 'radio'] %}
-</div>
-{% else %}
-</fieldset>
+ {% if label_display in ['before', 'invisible'] %}
+ {{ label }}
+ {% endif %}
+ {% if prefix is not empty %}
+ <span class="field-prefix">{{ prefix }}</span>
+ {% endif %}
+ {% if description_display == 'before' and description.content %}
+ <div{{ description.attributes }}>
+ {{ description.content }}
+ </div>
+ {% endif %}
+ {{ children }}
+ {% if suffix is not empty %}
+ <span class="field-suffix">{{ suffix }}</span>
+ {% endif %}
+ {% if label_display == 'after' %}
+ {{ label }}
+ {% endif %}
+ {% if errors %}
+ <div class="alert alert-danger" role="alert">
+ <strong>{{ errors }}</strong>
+ </div>
+ {% endif %}
+ {% if description_display in ['after', 'invisible'] and description.content %}
+ <small{{ description.attributes.addClass(description_classes) }}>
+ {{ description.content }}
+ </small>
+ {% endif %}
+ </fieldset>
{% endif %}
--
GitLab