diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index d159169d1050894d3ea3b98e1c965c4058208fe1..0000000000000000000000000000000000000000
--- 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.info.yml b/bootstrap_barrio.info.yml
index ffb3e696c201a83a4a5ccb28d5e7e078a3036df6..008594ba4b54b8849d268fcd30a04241a8031447 100644
--- a/bootstrap_barrio.info.yml
+++ b/bootstrap_barrio.info.yml
@@ -2,7 +2,7 @@ name: Bootstrap Barrio
type: theme
description: 'A flexible Booststrap based theme, with many regions and a responsive, mobile-first layout.'
# version: VERSION
-core: 8.x
+# core: 8.x
base theme: false
libraries:
@@ -46,3 +46,9 @@ regions:
footer_third: 'Footer third'
footer_fourth: 'Footer fourth'
footer_fifth: 'Footer fifth'
+
+# Information added by Drupal.org packaging script on 2015-11-29
+version: '8.x-4.0-beta1'
+core: '8.x'
+project: 'bootstrap_barrio'
+datestamp: 1448759945
diff --git a/bootstrap_barrio.libraries.yml b/bootstrap_barrio.libraries.yml
index 1ce3d3aeaa71d117c3faf6230fc666d9659c86a7..02f7f2e45867d10ac1ad8f166dec9398739f19a8 100644
--- a/bootstrap_barrio.libraries.yml
+++ b/bootstrap_barrio.libraries.yml
@@ -4,53 +4,34 @@ global-styling:
js/global.js: {}
css:
component:
- css/components/block.css: {}
css/components/book.css: {}
- css/components/breadcrumb.css: {}
- css/components/captions.css: {}
css/components/comments.css: {}
css/components/contextual.css: {}
- css/components/demo-block.css: {}
# @see https://www.drupal.org/node/2389735
- css/components/dropbutton.component.css: {}
- css/components/featured-top.css: {}
css/components/feed-icon.css: {}
css/components/field.css: {}
- css/components/form.css: {}
- css/components/forum.css: {}
css/components/header.css: {}
css/components/help.css: {}
+ css/components/icons.css: {}
+ css/components/image-button.css: {}
css/components/item-list.css: {}
css/components/list-group.css: {}
- css/components/list.css: {}
- css/components/main-content.css: {}
- css/components/menu.css: {}
- css/components/messages.css: {}
- css/components/node.css: {}
css/components/node-preview.css: {}
css/components/page.css: {}
- css/components/page-title.css: {}
- css/components/panel.css: {}
- css/components/primary-menu.css: {}
css/components/search-form.css: {}
- css/components/search-results.css: {}
- css/components/secondary-menu.css: {}
css/components/shortcut.css: {}
- css/components/skip-link.css: {}
css/components/sidebar.css: {}
- css/components/site-branding.css: {}
css/components/site-footer.css: {}
+ css/components/skip-link.css: {}
css/components/table.css: {}
+ css/components/tabledrag.css: {}
+ css/components/tableselect.css: {}
css/components/tablesort-indicator.css: {}
- css/components/tabs.css: {}
- css/components/toolbar.css: {}
- css/components/featured-bottom.css: {}
- css/components/password-suggestions.css: {}
css/components/ui.widget.css: {}
+ css/components/user.css: { weight: -10 }
# @see https://www.drupal.org/node/2389735
css/components/vertical-tabs.css: {}
css/components/views.css: {}
- css/components/image-button.css: {}
css/components/ui-dialog.css: {}
theme:
css/print.css: { media: print }
@@ -61,16 +42,17 @@ book-navigation:
component:
css/components/book-navigation.css: {}
-dialog:
+breadcrumb:
version: VERSION
css:
component:
- css/components/dialog.css: { weight: -10 }
+ css/components/breadcrumb.css: {}
dropbutton:
version: VERSION
css:
component:
+ css/components/dropbutton.component.css: {}
css/components/dropbutton.css: { weight: -10 }
file:
@@ -79,24 +61,12 @@ file:
component:
css/components/file.css: { weight: -10 }
-forum:
- version: VERSION
- css:
- component:
- css/components/forum.css: { weight: -10 }
-
indented:
version: VERSION
css:
component:
css/components/indented.css: {}
-links:
- version: VERSION
- css:
- component:
- css/components/links.css: {}
-
maintenance_page:
version: VERSION
css:
@@ -106,38 +76,114 @@ maintenance_page:
- system/maintenance
- bootstrap_barrio/global-styling
-messages:
+node:
version: VERSION
css:
component:
- css/components/messages.css: { preprocess: false }
+ css/components/node.css: { weight: -10 }
-node:
+search-results:
version: VERSION
css:
component:
- css/components/node.css: { weight: -10 }
+ css/components/search-results.css: {}
-progress:
+verticaltabs:
version: VERSION
css:
component:
- css/components/progress.css: { weight: -10 }
+ css/components/vertical-tabs.css: {}
-search-results:
+# Fonts
+
+alegreya_roboto:
version: VERSION
css:
component:
- css/components/search-results.css: {}
+ fonts/alegreya_roboto.css: {}
+ //fonts.googleapis.com/css?family=Roboto|Roboto+Condensed|Alegreya:700: {}
-user:
+dancing_garamond:
version: VERSION
css:
component:
- css/components/user.css: { weight: -10 }
+ fonts/dancing_garamond.css: {}
+ //fonts.googleapis.com/css?family=Dancing+Script:700|EB+Garamond: {}
-verticaltabs:
+amatic_josefin:
version: VERSION
css:
component:
- css/components/vertical-tabs.css: {}
+ fonts/amatic_josefin.css: {}
+ //fonts.googleapis.com/css?family=Josefin+Sans:700|Amatic+SC:700: {}
+
+oswald_droid:
+ version: VERSION
+ css:
+ component:
+ fonts/oswald_droid.css: {}
+ //fonts.googleapis.com/css?family=Oswald:700|Droid+Serif:400,700italic: {}
+
+playfair_alice:
+ version: VERSION
+ css:
+ component:
+ fonts/playfair_alice.css: {}
+ //fonts.googleapis.com/css?family=Alice|Playfair+Display:900: {}
+
+dosis_opensans:
+ version: VERSION
+ css:
+ component:
+ fonts/dosis_opensans.css: {}
+ //fonts.googleapis.com/css?family=Open+Sans|Dosis:400,800: {}
+
+lato_hotel:
+ version: VERSION
+ css:
+ component:
+ fonts/lato_hotel.css: {}
+ //fonts.googleapis.com/css?family=Lato:300|Grand+Hotel: {}
+
+medula_abel:
+ version: VERSION
+ css:
+ component:
+ fonts/medula_abel.css: {}
+ //fonts.googleapis.com/css?family=Abel|Medula+One: {}
+
+fjalla_cantarell:
+ version: VERSION
+ css:
+ component:
+ fonts/fjalla_cantarell.css: {}
+ //fonts.googleapis.com/css?family=Fjalla+One|Cantarell:400,400italic,700italic,700: {}
+
+coustard_leckerli:
+ version: VERSION
+ css:
+ component:
+ fonts/coustard_leckerli.css: {}
+ //fonts.googleapis.com/css?family=Leckerli+One|Coustard:900: {}
+
+philosopher_muli:
+ version: VERSION
+ css:
+ component:
+ fonts/philosopher_muli.css: {}
+ //fonts.googleapis.com/css?family=Philosopher|Muli:300: {}
+
+vollkorn_exo:
+ version: VERSION
+ css:
+ component:
+ fonts/vollkorn_exo.css: {}
+ //fonts.googleapis.com/css?family=Vollkorn:700italic,700|Exo:400,400italic: {}
+
+monserrat_lato:
+ version: VERSION
+ css:
+ component:
+ fonts/monserrat_lato.css: {}
+ //fonts.googleapis.com/css?family=Lato:300,400,300italic,400italic: {}
+ //fonts.googleapis.com/css?family=Montserrat:400,700: {}
diff --git a/bootstrap_barrio.theme b/bootstrap_barrio.theme
index 8ef6cbb74b2dc4515cb39dec1eba2b78a538fba4..c3c22893f84ada4dc778e67faeef14f7c4c540c9 100644
--- a/bootstrap_barrio.theme
+++ b/bootstrap_barrio.theme
@@ -63,6 +63,11 @@ function bootstrap_barrio_preprocess_page(&$variables) {
}
}
+ $fonts = theme_get_setting('bootstrap_barrio_google_fonts');
+ if ($fonts) {
+ $variables['#attached']['library'][] = 'bootstrap_barrio/' . $fonts;
+ }
+
$width = _bootstrap_barrio_content_width(!empty($variables['page']['sidebar_first']), !empty($variables['page']['sidebar_second']));
$content_width = 'col-md-' . $width;
$sidebar_first_width = 'col-md-' . theme_get_setting('bootstrap_barrio_sidebar_first_width');
@@ -202,6 +207,7 @@ function bootstrap_barrio_preprocess_page(&$variables) {
* Implements hook_preprocess_HOOK() for page templates.
*/
function bootstrap_barrio_preprocess_page_title(&$variables) {
+ if( !strlen($variables['title']) ) unset($variables['title']);
// Since the title and the shortcut link are both block level elements,
// positioning them next to each other is much simpler with a wrapper div.
if (!empty($variables['title_suffix']['add_or_remove_shortcut']) && $variables['title']) {
diff --git a/css/components/action-links.css b/css/components/action-links.css
deleted file mode 100644
index 8ba7e607bcaf6c72a74c02104db5143c94114eb3..0000000000000000000000000000000000000000
--- a/css/components/action-links.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file
- * Styles for link buttons and action links.
- */
-
-.action-links {
- list-style: none;
- padding: 0;
- margin: 1em 0;
-}
-[dir="rtl"] .action-links {
- /* This is required to win over specificity of [dir="rtl"] ul */
- margin-right: 0;
-}
-.action-links li {
- display: inline-block;
- margin: 0 0.3em;
-}
-.action-links li:first-child {
- margin-left: 0; /* LTR */
-}
-[dir="rtl"] .action-links li:first-child {
- margin-left: 0.3em;
- margin-right: 0;
-}
-.button-action {
- display: inline-block;
- line-height: 160%;
- padding: 0.2em 0.5em 0.3em;
- text-decoration: none;
-}
-.button-action:before {
- content: '+';
- font-weight: 900;
- margin-left: -0.1em; /* LTR */
- padding-right: 0.2em; /* LTR */
-}
-[dir="rtl"] .button-action:before {
- margin-left: 0;
- margin-right: -0.1em;
- padding-left: 0.2em;
- padding-right: 0;
-}
diff --git a/css/components/block.css b/css/components/block.css
deleted file mode 100644
index 48e9f3f81b0108f1949ad0738b46dc712110ef96..0000000000000000000000000000000000000000
--- a/css/components/block.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's blocks.
- */
-
-/* Block has it's own content wrapper. */
-.block .content {
- margin-top: 10px;
-}
diff --git a/css/components/book.css b/css/components/book.css
index 82e22eee8899d512e82eaae760e7229a9d2446f8..6045b5a095590cf2fa5287b5e77dcfd063810b94 100644
--- a/css/components/book.css
+++ b/css/components/book.css
@@ -1,6 +1,6 @@
/**
* @file
- * Bartik specific styling for the Book module.
+ * Bootstrap Barrio specific styling for the Book module.
*/
.book-navigation .menu {
diff --git a/css/components/breadcrumb.css b/css/components/breadcrumb.css
index cd07b154e8634a902465a71a2fed764e35fe4bdd..345b75fcf85b5403bf5eed502e9652a7adb5bd33 100644
--- a/css/components/breadcrumb.css
+++ b/css/components/breadcrumb.css
@@ -1,6 +1,6 @@
/**
* @file
- * Styles for Bartik's breadcrumbs.
+ * Styles for Bootstrap Barrio's breadcrumbs.
*/
.breadcrumb {
diff --git a/css/components/button.css b/css/components/button.css
deleted file mode 100644
index af6a7532252d8537d71f426107c1d851269f48ae..0000000000000000000000000000000000000000
--- a/css/components/button.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @file
- * Visual styles for buttons.
- */
-
-.button,
-.image-button {
- margin-left: 1em;
- margin-right: 1em;
-}
-.button:first-child,
-.image-button:first-child {
- margin-left: 0;
- margin-right: 0;
-}
diff --git a/css/components/captions.css b/css/components/captions.css
deleted file mode 100644
index cd248094f72cd49b93db90e6f03118b1a7cef36d..0000000000000000000000000000000000000000
--- a/css/components/captions.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -------------- Captions -------------- */
-.caption {
- margin-bottom: 1.2em;
-}
-.caption > * {
- background: #F3F3F3;
- padding: 0.5ex;
- border: 1px solid #CCC;
-}
-.caption > figcaption {
- border: 1px solid #CCC;
- border-top: none;
- padding-top: 0.5ex;
- font-size: small;
- text-align: center;
-}
-
-/* Override Bartik's default blockquote and pre styles when captioned. */
-.caption-pre > pre,
-.caption-blockquote > blockquote {
- margin: 0;
-}
-.caption-blockquote > figcaption::before {
- content: "— ";
-}
-.caption-blockquote > figcaption {
- text-align: left; /* LTR */
-}
-[dir="rtl"] .caption-blockquote > figcaption {
- text-align: right;
-}
diff --git a/css/components/collapse-processed.css b/css/components/collapse-processed.css
deleted file mode 100644
index 3ed2e3571394e2dfbb5e561bacdba7b3f82fbdc9..0000000000000000000000000000000000000000
--- a/css/components/collapse-processed.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file
- * Visual styles for collapsible fieldsets.
- */
-
-.collapse-processed > summary {
- padding-left: 0.5em;
- padding-right: 0.5em;
-}
-.collapse-processed > summary:before {
- background: url(../../../../misc/menu-expanded.png) 0px 100% no-repeat; /* LTR */
- content: "";
- float: left; /* LTR */
- height: 1em;
- width: 1em;
-}
-[dir="rtl"] .collapse-processed > summary:before {
- background-position: 100% 100%;
- float: right;
-}
-.collapse-processed:not([open]) > summary:before {
- background-position: 25% 35%; /* LTR */
- -ms-transform: rotate(-90deg);
- -webkit-transform: rotate(-90deg);
- transform: rotate(-90deg);
-}
-[dir="rtl"] .collapse-processed:not([open]) > summary:before {
- background-position: 75% 35%;
- -ms-transform: rotate(90deg);
- -webkit-transform: rotate(90deg);
- transform: rotate(90deg);
-}
diff --git a/css/components/container-inline.css b/css/components/container-inline.css
deleted file mode 100644
index 785e4de9d0519c8febb079f5760ee528457ce387..0000000000000000000000000000000000000000
--- a/css/components/container-inline.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @file
- * Inline items.
- */
-
-.container-inline label:after,
-.container-inline .label:after {
- content: ':';
-}
-.form-type-radios .container-inline label:after {
- content: '';
-}
-.form-type-radios .container-inline .form-type-radio {
- margin: 0 1em;
-}
-.container-inline .form-actions,
-.container-inline.form-actions {
- margin-top: 0;
- margin-bottom: 0;
-}
diff --git a/css/components/contextual.css b/css/components/contextual.css
index f823d81a0969b471e93b1de76fb42ebb99c0bea6..10bab2c0162b7652a819d0c88dee223d08994258 100644
--- a/css/components/contextual.css
+++ b/css/components/contextual.css
@@ -1,6 +1,6 @@
/**
* @file
- * Contextual links styles for Bartik.
+ * Contextual links styles for Bootstrap Barrio.
*/
.contextual-links a {
diff --git a/css/components/demo-block.css b/css/components/demo-block.css
deleted file mode 100644
index 03575bec4497518f84b4f85c474ed7b200563732..0000000000000000000000000000000000000000
--- a/css/components/demo-block.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's block demonstration.
- */
-
-.demo-block {
- background: #ffff66;
- border: 1px dotted #9f9e00;
- color: #000;
- font: 90% "Lucida Grande", "Lucida Sans Unicode", sans-serif;
- margin: 5px;
- padding: 5px;
- text-align: center;
- text-shadow: none;
-}
-.featured-top .demo-block {
- font-size: 0.55em;
-}
-.header .demo-block {
- width: 500px;
-}
diff --git a/css/components/dialog.css b/css/components/dialog.css
deleted file mode 100644
index d45d34b1cb3d806b3041e37ee1d41b3090f5dacc..0000000000000000000000000000000000000000
--- a/css/components/dialog.css
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file
- * Presentational styles for Drupal dialogs.
- */
-
-.ui-dialog {
- position: absolute;
- z-index: 1260;
- overflow: visible;
- color: #000;
- background: #fff;
- border: solid 1px #ccc;
- padding: 0;
-}
-@media all and (max-width: 48em) { /* 768px */
- .ui-dialog {
- width: 92% !important;
- }
-}
-.ui-dialog .ui-dialog-titlebar {
- font-weight: bold;
- background: #f3f4ee;
- border-style: solid;
- border-radius: 0;
- border-width: 0 0 1px 0;
- border-color: #ccc;
-}
-.ui-dialog .ui-dialog-titlebar-close {
- border: 0;
- background: none;
-}
-.ui-dialog .ui-dialog-buttonpane {
- margin-top: 0;
- background: #f3f4ee;
- padding: .3em 1em;
- border-width: 1px 0 0 0;
- border-color: #ccc;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
- margin: 0;
- padding: 0;
-}
-.ui-dialog .ui-dialog-buttonpane .ui-button-text-only .ui-button-text {
- padding: 0;
-}
-
-/* Form action buttons are moved in dialogs. Remove empty space. */
-.ui-dialog .ui-dialog-content .form-actions {
- padding: 0;
- margin: 0;
-}
-.ui-dialog .ajax-progress-throbber {
- /* Can't do center:50% middle: 50%, so approximate it for a typical window size. */
- left: 49%;
- position: fixed;
- top: 48.5%;
- z-index: 1000;
- background-color: #232323;
- background-image: url(loading-small.gif);
- background-position: center center;
- background-repeat: no-repeat;
- border-radius: 7px;
- height: 24px;
- opacity: 0.9;
- padding: 4px;
- width: 24px;
-}
-.ui-dialog .ajax-progress-throbber .throbber,
-.ui-dialog .ajax-progress-throbber .message {
- display: none;
-}
-
diff --git a/css/components/exposed-filters.css b/css/components/exposed-filters.css
deleted file mode 100644
index 99db9303ea836cfb764197b93106e3db28da5fd4..0000000000000000000000000000000000000000
--- a/css/components/exposed-filters.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file
- * Visual styles for exposed filters.
- */
-
-.exposed-filters .filters {
- float: left; /* LTR */
- margin-right: 1em; /* LTR */
-}
-[dir="rtl"] .exposed-filters .filters {
- float: right;
- margin-left: 1em;
- margin-right: 0;
-}
-.exposed-filters .form-item {
- margin: 0 0 0.1em 0;
- padding: 0;
-}
-.exposed-filters .form-item label {
- float: left; /* LTR */
- font-weight: normal;
- width: 10em;
-}
-[dir="rtl"] .exposed-filters .form-item label {
- float: right;
-}
-.exposed-filters .form-select {
- width: 14em;
-}
-/* Current filters */
-.exposed-filters .current-filters {
- margin-bottom: 1em;
-}
-.exposed-filters .current-filters .placeholder {
- font-style: normal;
- font-weight: bold;
-}
-.exposed-filters .additional-filters {
- float: left; /* LTR */
- margin-right: 1em; /* LTR */
-}
-[dir="rtl"] .exposed-filters .additional-filters {
- float: right;
- margin-left: 1em;
- margin-right: 0;
-}
diff --git a/css/components/featured-bottom.css b/css/components/featured-bottom.css
deleted file mode 100644
index b9bb6b40e0b69e11a9f6c91f7e76121d1d51de11..0000000000000000000000000000000000000000
--- a/css/components/featured-bottom.css
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
-* @file
-* Visual styles for Bartik's featured bottom component.
-*/
-
-.featured-bottom {
- background: rgba(30, 50, 10, 0.08);
- border-top: 1px solid #e7e7e7;
-}
-.featured-bottom .region {
- padding: 0 20px;
-}
-@media all and (min-width: 560px) {
- .featured-bottom .region {
- float: left; /* LTR */
- position: relative;
- box-sizing: border-box;
- padding: 20px 15px 30px;
- width: 33%;
- }
- [dir="rtl"] .featured-bottom .region {
- float: right;
- }
-}
-@media all and (min-width: 851px) {
- .featured-bottom .region {
- padding: 0 20px;
- }
-}
-.featured-bottom h2 {
- color: #000;
- font-size: 1.4em;
- margin-bottom: 0.6em;
- text-shadow: 0 1px 0 #fff;
- text-align: center;
- line-height: 1em;
-}
-.featured-bottom .block {
- margin-bottom: 1em;
- padding-bottom: 1em;
- border-bottom: 1px solid #dfdfdf;
- line-height: 1.3em;
-}
-.featured-bottom .block:last-child {
- border-bottom: none;
-}
-.featured-bottom ul,
-.featured-bottom ol {
- padding-left: 0;
-}
-.featured-bottom ul li,
-.featured-bottom ol li {
- list-style: none;
-}
-.featured-bottom input:not(.form-submit) {
- width: 185px;
-}
-.region-featured-bottom-third .feed-icon {
- float: right;
-}
-.region-featured-bottom-second .block-system-powered-by-block {
- text-align: center;
-}
diff --git a/css/components/featured-top.css b/css/components/featured-top.css
deleted file mode 100644
index 80724cfdb6c4f6e738f097459933904f3f4b6d43..0000000000000000000000000000000000000000
--- a/css/components/featured-top.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's featured top.
- */
-
-.featured-top {
- text-align: center;
- font-size: 1.2em;
- font-weight: normal;
- line-height: 1.4;
- padding: 20px 10px 45px;
- margin: 0;
- background: #f0f0f0;
- background: rgba(30, 50, 10, 0.08);
- border-bottom: 1px solid #e7e7e7;
- text-shadow: 1px 1px #fff;
-}
-.featured-top h2 {
- font-size: 1.2em;
- line-height: 1;
-}
-.featured-top p {
- margin: 0;
- padding: 0;
-}
diff --git a/css/components/feed-icon.css b/css/components/feed-icon.css
index 0189eeb08ce497b51649d73445de989fdec732ee..ed52c6e6a8abf36739dc50a7a81ef70b4ec9f57c 100644
--- a/css/components/feed-icon.css
+++ b/css/components/feed-icon.css
@@ -1,6 +1,6 @@
/**
* @file
- * Feed icon styles for Bartik.
+ * Feed icon styles for Bootstrap Barrio.
*/
.feed-icon {
diff --git a/css/components/field.css b/css/components/field.css
index 213d804b0f1ea63930ee2b512301553676ce8508..297abe4dd8b03036e7a38ae9a3d0073d9f3adc67 100644
--- a/css/components/field.css
+++ b/css/components/field.css
@@ -1,6 +1,6 @@
/**
* @file
- * Visual styles for Bartik's field components.
+ * Visual styles for Bootstrap Barrio's field components.
*/
.field--type-entity-reference {
@@ -60,7 +60,6 @@
}
.field--name-field-tags {
margin: 0 0 1.2em;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.field--name-field-tags .field__label {
font-weight: normal;
diff --git a/css/components/form.css b/css/components/form.css
deleted file mode 100644
index 505a568873ee9c85be97408a1eace2605c9cfdb9..0000000000000000000000000000000000000000
--- a/css/components/form.css
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file
- * Visual styles for Bootstrap Barrio's forms.
- */
-
-/* Password field. */
-.password-field {
- margin: 0;
-}
-
-/* Form elements. */
-form {
- margin: 0;
- padding: 0;
-}
-fieldset {
- margin: 1em 0;
-}
-
-/* Node Form */
-
-/* Contact Form */
-
-/* Comment form */
diff --git a/css/components/forum.css b/css/components/forum.css
deleted file mode 100644
index 1a05488336a36c4e5f81ef6dd610642eb50dc6fb..0000000000000000000000000000000000000000
--- a/css/components/forum.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @file
- * Visual styles for forums in Bartik.
- */
-
-.forum__name {
- font-size: 1.083em;
-}
-.forum__description {
- font-size: 1em;
-}
diff --git a/css/components/image-button.css b/css/components/image-button.css
index fc6cadbad483c2399540eba1be8f28d66b870065..5caa61554c438c87611eb57b3f64795fd9566da1 100644
--- a/css/components/image-button.css
+++ b/css/components/image-button.css
@@ -1,6 +1,6 @@
/**
* @file
- * Styles for Bartik's image buttons.
+ * Styles for Bootstrap Barrio's image buttons.
*/
.image-button.is-disabled:hover,
diff --git a/css/components/image-widget.css b/css/components/image-widget.css
deleted file mode 100644
index 3da51ef8579a0ebf0bda34ce82e942e4f6c47395..0000000000000000000000000000000000000000
--- a/css/components/image-widget.css
+++ /dev/null
@@ -1,21 +0,0 @@
-
-/**
- * Image upload widget.
- */
-.image-preview {
- float: left; /* LTR */
- padding: 0 10px 10px 0; /* LTR */
-}
-[dir="rtl"] .image-preview {
- float: right;
- padding: 0 0 10px 10px;
-}
-.image-widget-data {
- float: left; /* LTR */
-}
-[dir="rtl"] .image-widget-data {
- float: right;
-}
-.image-widget-data .text-field {
- width: auto;
-}
diff --git a/css/components/inline-form.css b/css/components/inline-form.css
deleted file mode 100644
index b5201a78c9db0c2a8f09c700f3374badbca79d31..0000000000000000000000000000000000000000
--- a/css/components/inline-form.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file
- * Visual styles for inline forms.
- */
-
-.form--inline .form-item {
- float: left; /* LTR */
- margin-right: 0.5em; /* LTR */
-}
-[dir="rtl"] .form--inline .form-item {
- float: right;
- margin-right: 0;
- margin-left: 0.5em;
-}
-/* This is required to win over specificity of [dir="rtl"] .form--inline .form-item */
-[dir="rtl"] .views-filterable-options-controls .form-item {
- margin-right: 2%;
-}
-.form--inline .form-item-separator {
- margin-top: 2.3em;
- margin-right: 1em; /* LTR */
- margin-left: 0.5em; /* LTR */
-}
-[dir="rtl"] .form--inline .form-item-separator {
- margin-right: 0.5em;
- margin-left: 1em;
-}
-.form--inline .form-actions {
- clear: left; /* LTR */
-}
-[dir="rtl"] .form--inline .form-actions {
- clear: right;
-}
diff --git a/css/components/item-list.css b/css/components/item-list.css
index 51a69c8c4c09dab19a2d55e0192f6f8188224897..b6383fb345e3d84099a9976a8ea618ab93e5cf4c 100644
--- a/css/components/item-list.css
+++ b/css/components/item-list.css
@@ -1,6 +1,6 @@
/**
* @file
- * Visual styles for Bartik's item list.
+ * Visual styles for Bootstrap Barrio's item list.
*/
.item-list ul {
diff --git a/css/components/link.css b/css/components/link.css
deleted file mode 100644
index 8d47081409cd365d7a47955bfc2f77f3d3baae24..0000000000000000000000000000000000000000
--- a/css/components/link.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file
- * Style another element as a link.
- */
-
-button.link {
- background: transparent;
- border: 0;
- cursor: pointer;
- margin: 0;
- padding: 0;
- font-size: 1em;
-}
-label button.link {
- font-weight: bold;
-}
diff --git a/css/components/links.css b/css/components/links.css
deleted file mode 100644
index b4e18d31265f42c62f9b8b38a20df0063e5dee6b..0000000000000000000000000000000000000000
--- a/css/components/links.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file
- * Visual styles for links.
- */
-
-ul.inline,
-ul.links.inline {
- display: inline;
- padding-left: 0; /* LTR */
-}
-[dir="rtl"] ul.inline,
-[dir="rtl"] ul.links.inline {
- padding-right: 0;
- padding-left: 15px;
-}
-ul.inline li {
- display: inline;
- list-style-type: none;
- padding: 0 0.5em;
-}
-ul.links a.is-active {
- color: #000;
-}
-.links-inline span {
- padding: 0 0.5em 0 0; /* LTR */
- font-size: 1.08em;
-}
-[dir="rtl"] .links-inline span {
- padding: 0 0 0 0.5em;
-}
diff --git a/css/components/list.css b/css/components/list.css
deleted file mode 100644
index d795121b0c1912c013e95afe3525f8a2c8eee287..0000000000000000000000000000000000000000
--- a/css/components/list.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's lists.
- */
-
-ul.links {
- color: #68696b;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 0.821em;
- padding: 0;
- margin: 0;
- list-style: none;
-}
diff --git a/css/components/main-content.css b/css/components/main-content.css
deleted file mode 100644
index b179bbe8e96724faac50adfef10c924b08d18ff6..0000000000000000000000000000000000000000
--- a/css/components/main-content.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's main-content component.
- */
-
-.main-content .section {
- padding: 0 15px;
-}
-.main-content h2 {
- margin-bottom: 2px;
- font-size: 1.429em;
- line-height: 1.4;
-}
diff --git a/css/components/menu.css b/css/components/menu.css
deleted file mode 100644
index efde5d20ab6b9a24c8d7e480b91359704656a3f2..0000000000000000000000000000000000000000
--- a/css/components/menu.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @file
- * Styles for menus in Bartik.
- */
-
-/* This is needed to override ul.menu styles in menu.theme.css */
-ul.menu {
- margin: 0;
- padding: 0 0 0.25em 0;
-}
-
-/* This is needed to override [dir="rtl"] ul.menu styles in menu.theme.css */
-[dir="rtl"] ul.menu {
- margin: 0;
-}
diff --git a/css/components/messages.css b/css/components/messages.css
deleted file mode 100644
index 15a550d0b96484fc69a96b5f7aa740b67e94b405..0000000000000000000000000000000000000000
--- a/css/components/messages.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file
- * Styles for Bartik's messages.
- */
-
-.messages__wrapper {
- padding: 20px 0 5px 8px;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- margin: 8px 0;
-}
-[dir="rtl"] .messages__wrapper {
- padding: 20px 8px 5px 0;
-}
diff --git a/css/components/more-link.css b/css/components/more-link.css
deleted file mode 100644
index c604061317d013d634660816cca3fd606091ed40..0000000000000000000000000000000000000000
--- a/css/components/more-link.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @file
- * Markup generated by #type 'more_link'.
- */
-
-.more-link {
- display: block;
- text-align: right; /* LTR */
-}
-[dir="rtl"] .more-link {
- text-align: left;
-}
diff --git a/css/components/node.css b/css/components/node.css
index 78caa342bae4523d0a91f1e19ffd50a34615d7a2..6d83cc4b45e471c587d1547a30cb89085024ee41 100644
--- a/css/components/node.css
+++ b/css/components/node.css
@@ -1,6 +1,6 @@
/**
* @file
- * Visual styles for Bartik's node component.
+ * Visual styles for Bootstrap Barrio's node component.
*/
.node__content {
@@ -35,7 +35,6 @@
/* Node metadata styles. */
.node__meta {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 0.857em;
color: #68696b;
margin-bottom: -5px;
diff --git a/css/components/page-title.css b/css/components/page-title.css
deleted file mode 100644
index 01de2fc48137f487927ae3fd8b841f2ac6c787d0..0000000000000000000000000000000000000000
--- a/css/components/page-title.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @file
- * Visual styles for Bartik's page-title component.
- */
-
-.page-title {
- font-size: 2em;
- line-height: 1em;
-}
diff --git a/css/components/pager.css b/css/components/pager.css
deleted file mode 100644
index 3e92e4ff318b9a209cdff624dacdcfb8c0e38a4a..0000000000000000000000000000000000000000
--- a/css/components/pager.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @file
- * Styles for Bartik's pagination.
- */
-
-/* Using .pager selector on the first one to override .region-content ul. */
diff --git a/css/components/panel.css b/css/components/panel.css
deleted file mode 100644
index 51ea941d7a6eda733c2d086becc4e7cc61a01fce..0000000000000000000000000000000000000000
--- a/css/components/panel.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file
- * Panel styling. Panels are used to visually group items together.
- */
-
-.panel {
- background: #fbfbfb;
- border: 1px solid #ccc;
- margin: 10px 0;
- padding: 0 5px 5px;
-}
-.panel__title {
- margin: 16px 7px;
-}
-.panel__content {
- padding: 0 4px 2px 8px; /* LTR */
-}
-[dir="rtl"] .panel__content {
- padding-right: 8px;
- padding-left: 4px;
-}
diff --git a/css/components/password-suggestions.css b/css/components/password-suggestions.css
deleted file mode 100644
index cf2c2bae116e7b9c15788998b27bec014df63462..0000000000000000000000000000000000000000
--- a/css/components/password-suggestions.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file
- * Styles for password suggestions in Bartik.
- */
-
-.password-suggestions {
- border: 0;
-}
diff --git a/css/components/primary-menu.css b/css/components/primary-menu.css
deleted file mode 100644
index c20110e58a6e3901b138ffa8b7c4c871a9be1883..0000000000000000000000000000000000000000
--- a/css/components/primary-menu.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/* --------------- Primary Menu ------------ */
-
diff --git a/css/components/progress.css b/css/components/progress.css
deleted file mode 100644
index 60086d01dbfdab39487e06473e00066ac4fcd8cb..0000000000000000000000000000000000000000
--- a/css/components/progress.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @file
- * Visual styles for progress bar.
- *
- * @see progress.js
- */
-
diff --git a/css/components/search-form.css b/css/components/search-form.css
index 9218d4936e0032593d6d1e5b809e5703fc454d7d..13ebc1e712ab81eddc0a68e9756b2c97aabd0117 100644
--- a/css/components/search-form.css
+++ b/css/components/search-form.css
@@ -1,6 +1,6 @@
/**
* @file
- * The visual styles for Bartik's search form(s).
+ * The visual styles for Bootstrap Barrio's search form(s).
*/
input[type="search"] {
diff --git a/css/components/secondary-menu.css b/css/components/secondary-menu.css
deleted file mode 100644
index 34c0ec644aa8d1fcbd61face82b939e4763624d9..0000000000000000000000000000000000000000
--- a/css/components/secondary-menu.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/* --------------- Secondary Menu ------------ */
-
diff --git a/css/components/shortcut.css b/css/components/shortcut.css
index 8142ba5ab418bad4d5efe5cad32c9698f657bef5..841afd47e45e0abd3fee0d04e188ca1cf622a027 100644
--- a/css/components/shortcut.css
+++ b/css/components/shortcut.css
@@ -1,6 +1,6 @@
/**
* @file
- * Visual styles for the Shortcut action link in Bartik.
+ * Visual styles for the Shortcut action link in Bootstrap Barrio.
*/
.shortcut-wrapper {
diff --git a/css/components/site-branding.css b/css/components/site-branding.css
deleted file mode 100644
index fda5d9e6ed069808dc050a7b093a3c6ec5e62b5a..0000000000000000000000000000000000000000
--- a/css/components/site-branding.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @file
- * Visual styles for the site branding block in Bartik.
- */
-
-.site-branding__logo {
- display: inline-block;
- margin-right: 1em; /* LTR */
- margin-bottom: 0.286em;
-}
-[dir="rtl"] .site-branding__logo {
- margin-right: 0;
- margin-left: 1em;
-}
-.site-branding__text {
- display: inline-block;
- vertical-align: top;
-}
-@media all and (min-width: 461px) {
- .site-branding__text {
- margin-bottom: 1.857em;
- }
-}
-@media all and (min-width: 901px) {
- .site-branding__text {
- padding: 1.286em 0 0;
- }
-}
-.site-branding__name {
- font-size: 1.6em;
- color: #686868;
- line-height: 1;
-}
-@media all and (min-width: 901px) {
- .site-branding__name {
- font-size: 1.821em;
- }
-}
-.site-branding__slogan {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 0.929em;
- margin-top: 7px;
- word-spacing: 0.1em;
- font-style: italic;
-}
diff --git a/css/components/skip-link.css b/css/components/skip-link.css
index c51edd9a11cd72db2b93d83f9aa89dbe5c7df22a..317815b683f03ada13b3d0407e4cc80fd2a6061c 100644
--- a/css/components/skip-link.css
+++ b/css/components/skip-link.css
@@ -11,7 +11,6 @@
z-index: 50;
background: #444;
background: rgba(0, 0, 0, 0.6);
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 0.94em;
line-height: 1.7em;
padding: 1px 10px 2px;
diff --git a/css/components/table.css b/css/components/table.css
index 561c74acce04ac1019f4c29e97f5920b2db8a3da..ede479bde9e3020667f1c953f094a5af99e20d94 100644
--- a/css/components/table.css
+++ b/css/components/table.css
@@ -1,12 +1,11 @@
/**
* @file
- * Styles for Bartik's tables.
+ * Styles for Bootstrap Barrio's tables.
*/
table {
border: 0;
border-spacing: 0;
- font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;
font-size: 0.857em;
margin: 10px 0;
width: 100%;
diff --git a/css/components/tabs.css b/css/components/tabs.css
deleted file mode 100644
index 007ac087884cf8f416fadef65b3b2cd14e850a36..0000000000000000000000000000000000000000
--- a/css/components/tabs.css
+++ /dev/null
@@ -1,2 +0,0 @@
-/* --------------- System Tabs --------------- */
-
diff --git a/css/components/toolbar.css b/css/components/toolbar.css
deleted file mode 100644
index 35a5762cb8613ad5ccc700a718691309844ef03f..0000000000000000000000000000000000000000
--- a/css/components/toolbar.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file
- * Toolbar module overrides for Bartik.
- */
-
-.toolbar a {
- border-bottom: none;
-}
diff --git a/fonts/alegreya_roboto.css b/fonts/alegreya_roboto.css
new file mode 100644
index 0000000000000000000000000000000000000000..045dd5364a4785d7d0087f5d08d04212bd430ce1
--- /dev/null
+++ b/fonts/alegreya_roboto.css
@@ -0,0 +1,23 @@
+
+/* ---------- Alegreya, Roboto Condensed, Roboto ---------- */
+
+h1, h2 {
+ font-family: 'Alegreya', serif;
+}
+h1 {
+ font-weight: 700;
+ }
+h2 {
+ font-weight: 700;
+ }
+h3, h4, h5, h6 {
+ font-family: 'Roboto Condensed', sans-serif;
+}
+h3 {
+ font-weight: normal;
+ text-transform: uppercase;
+ letter-spacing: 2px;
+ }
+body, p, a, li {
+ font-family: 'Roboto', sans-serif;
+ }
\ No newline at end of file
diff --git a/fonts/amatic_josefin.css b/fonts/amatic_josefin.css
new file mode 100644
index 0000000000000000000000000000000000000000..501a3b381fbbd625858ab33da2f42e8a93ab81ee
--- /dev/null
+++ b/fonts/amatic_josefin.css
@@ -0,0 +1,13 @@
+
+/* ---------- Amatic SC, Josefin Sans ---------- */
+
+h1 {
+ font-family: 'Amatic SC', cursive;
+ font-weight: 700;
+ }
+h2, h3, h4, h5, h6 {
+ font-family: 'Amatic SC', cursive;
+}
+body, p, li, a {
+ font-family: 'Josefin Sans', sans-serif;
+ }
diff --git a/fonts/coustard_leckerli.css b/fonts/coustard_leckerli.css
new file mode 100644
index 0000000000000000000000000000000000000000..c5686afb53b8445f8b15869d93d075260559f2f5
--- /dev/null
+++ b/fonts/coustard_leckerli.css
@@ -0,0 +1,14 @@
+
+/* ---------- Coustard Ultra, Leckerli One ---------- */
+
+h1, h2 {
+ font-family: 'Coustard', serif;
+ font-weight: 900;
+ }
+h3, h4, h5, h6 {
+ font-family: 'Coustard', serif;
+ }
+body, p, a, li {
+ font-family: 'Leckerli One', cursive;
+ font-weight: 400;
+ }
diff --git a/fonts/dancing_garamond.css b/fonts/dancing_garamond.css
new file mode 100644
index 0000000000000000000000000000000000000000..315face6c31132857eafd472d89fc2412bd83a4f
--- /dev/null
+++ b/fonts/dancing_garamond.css
@@ -0,0 +1,15 @@
+
+/* ---------- Dancing Script, EB Garamond ---------- */
+
+h1 {
+ font-family: 'Dancing Script', cursive;
+ font-weight: 700;
+ }
+h2, h3, h4, h5, h6 {
+ font-family: 'EB Garamond', serif;
+ font-weight: normal;
+ text-transform: uppercase;
+ }
+body, p, a, li {
+ font-family: 'EB Garamond', serif;
+ }
\ No newline at end of file
diff --git a/fonts/dosis_opensans.css b/fonts/dosis_opensans.css
new file mode 100644
index 0000000000000000000000000000000000000000..c903a778a23a6110b3a167ec0bfd957c213224aa
--- /dev/null
+++ b/fonts/dosis_opensans.css
@@ -0,0 +1,13 @@
+
+/* ---------- Dosis, Open Sans ---------- */
+
+h1 {
+ font-family: 'Playfair Display', serif;
+ font-weight: 900;
+ }
+h2, h3, h4, h5, h6 {
+ font-family: 'Playfair Display', serif;
+ }
+body, p, a, li {
+ font-family: 'Alice', serif;
+ }
\ No newline at end of file
diff --git a/fonts/fjalla_cantarell.css b/fonts/fjalla_cantarell.css
new file mode 100644
index 0000000000000000000000000000000000000000..5e6819b7320498db7639e333ba4ee721fe0d8288
--- /dev/null
+++ b/fonts/fjalla_cantarell.css
@@ -0,0 +1,17 @@
+
+/* ---------- Fjalla One, Cantarell ---------- */
+
+h1, h2 {
+ font-family: 'Fjalla One', sans-serif;
+ font-weight: normal;
+ text-transform: uppercase;
+ }
+h3, h4, h5, h6 {
+ font-family: 'Cantarell', sans-serif;
+ font-weight: 700;
+ text-transform: uppercase;
+ letter-spacing: -1px;
+ }
+body, p, a, li {
+ font-family: 'Cantarell', sans-serif;
+ }
diff --git a/fonts/lato_hotel.css b/fonts/lato_hotel.css
new file mode 100644
index 0000000000000000000000000000000000000000..3b6ae8124cac0012abefa4255587193b303f9a5e
--- /dev/null
+++ b/fonts/lato_hotel.css
@@ -0,0 +1,14 @@
+
+/* ---------- Lato, Grand Hotel ---------- */
+
+h1, h2 {
+ font-family: 'Lato', sans-serif;
+ font-weight: 300;
+ }
+h3, h4, h5, h6 {
+ font-family: 'Grand Hotel', cursive;
+ font-weight: normal;
+ }
+body, p, a, li {
+ font-family: 'Lato', sans-serif;
+ }
diff --git a/fonts/medula_abel.css b/fonts/medula_abel.css
new file mode 100644
index 0000000000000000000000000000000000000000..c7fad333fd1362acd3a8df6b36dd2271c3e4702e
--- /dev/null
+++ b/fonts/medula_abel.css
@@ -0,0 +1,9 @@
+
+/* ---------- Medula One, Abel ---------- */
+
+h1, h2, h3, h4, h5, h6 {
+ font-family: 'Medula One', cursive;
+ }
+body, p, a, li {
+ font-family: 'Abel', sans-serif;
+ }
\ No newline at end of file
diff --git a/fonts/monserrat_lato.css b/fonts/monserrat_lato.css
new file mode 100644
index 0000000000000000000000000000000000000000..16efc2fcc040fa13d2fde1beb940b738393d5ddf
--- /dev/null
+++ b/fonts/monserrat_lato.css
@@ -0,0 +1,17 @@
+
+/* ---------- Monserrat, Lato ---------- */
+
+body, p, a, li {
+ font-family: 'Lato', arial, sans-serif;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-family: 'Montserrat', sans-serif;
+ font-weight: 700;
+}
\ No newline at end of file
diff --git a/fonts/oswald_droid.css b/fonts/oswald_droid.css
new file mode 100644
index 0000000000000000000000000000000000000000..63dabd95fd6089b155d48754efdda05f54705795
--- /dev/null
+++ b/fonts/oswald_droid.css
@@ -0,0 +1,20 @@
+
+/* ---------- Oswald, Droid Serif ---------- */
+
+h1 {
+ font-family: 'Oswald', sans-serif;
+ font-weight: 700;
+ text-transform: uppercase;
+ }
+h2 {
+ font-family: 'Oswald', sans-serif;
+ text-transform: uppercase;
+}
+h3 {
+ font-family: 'Droid Serif', serif;
+ font-weight: 400;
+ font-style: italic;
+ }
+body, p, h4, h5, h6, a, li {
+ font-family: 'Droid Serif', serif;
+ }
diff --git a/fonts/philosopher_muli.css b/fonts/philosopher_muli.css
new file mode 100644
index 0000000000000000000000000000000000000000..6dc8e230e95bba8d17968c9939d6a9f09491cb18
--- /dev/null
+++ b/fonts/philosopher_muli.css
@@ -0,0 +1,13 @@
+
+/* ---------- Philosopher, Muli ---------- */
+
+h1, h2 {
+ font-family: "Philosopher",sans-serif;
+ }
+h3, h4, h5, h6 {
+ font-family: "Muli",sans-serif;
+ }
+body, p, a, li {
+ font-family: "Muli",sans-serif;
+ font-weight: 300;
+ }
diff --git a/fonts/playfair_alice.css b/fonts/playfair_alice.css
new file mode 100644
index 0000000000000000000000000000000000000000..11dda75008ec30da1ff864632000cd7365a52131
--- /dev/null
+++ b/fonts/playfair_alice.css
@@ -0,0 +1,13 @@
+
+/* ---------- Playfair Display, Alice ---------- */
+
+h1 {
+ font-family: 'Playfair Display', serif;
+ font-weight: 900;
+ }
+h2, h3, h4, h5, h6 {
+ font-family: 'Playfair Display', serif;
+ }
+body, p, a, li {
+ font-family: 'Alice', serif;
+ }
\ No newline at end of file
diff --git a/fonts/vollkorn_exo.css b/fonts/vollkorn_exo.css
new file mode 100644
index 0000000000000000000000000000000000000000..b58160416b25f3dcc1e4393289cdae7f36e0d008
--- /dev/null
+++ b/fonts/vollkorn_exo.css
@@ -0,0 +1,14 @@
+
+/* ---------- Vollkorn, Exo ---------- */
+
+h1, h2 {
+ font-family: "Vollkorn",serif;
+ font-weight: 700;
+ }
+h3, h4, h5, h6 {
+ font-family: "Vollkorn",serif;
+ }
+body, p, a, li {
+ font-family: "Exo",sans-serif;
+ font-weight: 400;
+ }
diff --git a/screenshot.png b/screenshot.png
index 0a62690e3dd4ddc5f320c472451b6bf9944c860b..d34f9b22f42dba8598380220b9cfef1de7c8e432 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/subtheme/bootstrap_barrio_subtheme.info.yml b/subtheme/bootstrap_barrio_subtheme.info.yml
index 3d686fde05e164b4b111e4dd8613dcaab952edb3..47960382dd2665f6a98452bb5471aff665fa850a 100644
--- a/subtheme/bootstrap_barrio_subtheme.info.yml
+++ b/subtheme/bootstrap_barrio_subtheme.info.yml
@@ -1,8 +1,8 @@
name: Bootstrap Barrio Subtheme
type: theme
description: 'Basic structure for a Bootstrap Barrio SubTheme.'
-version: VERSION
-core: 8.x
+# version: VERSION
+# core: 8.x
base theme: bootstrap_barrio
libraries:
@@ -31,3 +31,9 @@ regions:
footer_third: 'Footer third'
footer_fourth: 'Footer fourth'
footer_fifth: 'Footer fifth'
+
+# Information added by Drupal.org packaging script on 2015-11-29
+version: '8.x-4.0-beta1'
+core: '8.x'
+project: 'bootstrap_barrio'
+datestamp: 1448759945
diff --git a/subtheme/config/install/bootstrap_barrio_subtheme.settings.yml b/subtheme/config/install/bootstrap_barrio_subtheme.settings.yml
index 3283a561cea3518b31f4a29b6e6d233bbc2c7cd0..1eb3b7cc57ca01b2e380fa3e5c714da76276efe2 100644
--- a/subtheme/config/install/bootstrap_barrio_subtheme.settings.yml
+++ b/subtheme/config/install/bootstrap_barrio_subtheme.settings.yml
@@ -6,7 +6,6 @@ bootstrap_barrio_sidebar_first_width: 3
bootstrap_barrio_sidebar_first_offset: 0
bootstrap_barrio_sidebar_second_width: 3
bootstrap_barrio_sidebar_second_offset: 0
-bootstrap_barrio_footer_layout: '1-1-1-1-1'
# Container
# --------------
@@ -25,54 +24,3 @@ bootstrap_barrio_navbar_top_background: 'faded'
bootstrap_barrio_navbar_position: ''
bootstrap_barrio_navbar_color: 'dark'
bootstrap_barrio_navbar_background: 'inverse'
-
-# Anchors
-# --------------
-bootstrap_barrio_anchors_fix: 1
-bootstrap_barrio_anchors_smooth_scrolling: 1
-
-# Forms
-# --------------
-bootstrap_barrio_forms_required_has_error: 0
-bootstrap_barrio_forms_has_error_value_toggle: 1
-bootstrap_barrio_forms_smart_descriptions: 1
-bootstrap_barrio_forms_smart_descriptions_limit: 250
-bootstrap_barrio_forms_smart_descriptions_allowed_tags: 'b, code, em, i, kbd, span, strong'
-
-
-# Popovers
-# --------------
-bootstrap_barrio_popover_enabled: 1
-bootstrap_barrio_popover_animation: 1
-bootstrap_barrio_popover_html: 0
-bootstrap_barrio_popover_placement: 'right'
-bootstrap_barrio_popover_selector: ''
-bootstrap_barrio_popover_trigger:
- hover: 0
-bootstrap_barrio_popover_trigger:
- focus: 0
-bootstrap_barrio_popover_trigger:
- click: 'click'
-bootstrap_barrio_popover_trigger_autoclose: 1
-bootstrap_barrio_popover_title: ''
-bootstrap_barrio_popover_content: ''
-bootstrap_barrio_popover_delay: 0
-bootstrap_barrio_popover_container: 'body'
-
-# Tooltips
-# --------------
-bootstrap_barrio_tooltip_enabled: 1
-bootstrap_barrio_tooltip_descriptions: 1
-bootstrap_barrio_tooltip_descriptions_length: 200
-bootstrap_barrio_tooltip_animation: 1
-bootstrap_barrio_tooltip_html: 0
-bootstrap_barrio_tooltip_placement: 'auto left'
-bootstrap_barrio_tooltip_selector: ''
-bootstrap_barrio_tooltip_trigger:
- hover: 'hover'
-bootstrap_barrio_tooltip_trigger:
- focus: 'focus'
-bootstrap_barrio_tooltip_trigger:
- click: 0
-bootstrap_barrio_tooltip_delay: 0
-bootstrap_barrio_tooltip_container: 'body'
diff --git a/subtheme/screenshot.png b/subtheme/screenshot.png
index 0a62690e3dd4ddc5f320c472451b6bf9944c860b..d34f9b22f42dba8598380220b9cfef1de7c8e432 100644
Binary files a/subtheme/screenshot.png and b/subtheme/screenshot.png differ
diff --git a/templates/block/block--local-actions-block.html.twig b/templates/block/block--local-actions-block.html.twig
index 2a0f5c4ae87b1182a0407359198b67ec0619a852..2f88a95d18d8ddb4221f6fc5489eda5e6ee98239 100644
--- a/templates/block/block--local-actions-block.html.twig
+++ b/templates/block/block--local-actions-block.html.twig
@@ -1,4 +1,4 @@
-{% extends "@block/block.html.twig" %}
+{% extends themes/bootstrap_barrio/templates/layout/block.html.twig" %}
{#
/**
* @file
diff --git a/templates/block/block--search-form-block.html.twig b/templates/block/block--search-form-block.html.twig
index b2af1edf2b43df9a54a3540a8e7b3164da299d60..1180eecbb1ab3954948d79b45cf201c9637daa97 100644
--- a/templates/block/block--search-form-block.html.twig
+++ b/templates/block/block--search-form-block.html.twig
@@ -1,4 +1,4 @@
-{% extends "@classy/block/block--search-form-block.html.twig" %}
+{% extends "themes/bootstrap_barrio/templates/layout/block--search-form-block.html.twig" %}
{#
/**
* @file
diff --git a/templates/content/node.html.twig b/templates/content/node.html.twig
index d33f46f3b611c982b7b395f9fec76e2613247e61..d2429ae0be9723ac3e687c3321e4c5652472303d 100644
--- a/templates/content/node.html.twig
+++ b/templates/content/node.html.twig
@@ -59,6 +59,8 @@
* @see template_preprocess_node()
*/
#}
+{{ attach_library('bootstrap_barrio/node') }}
+
{%
set classes = [
'node',
diff --git a/templates/form/dropbutton-wrapper.html.twig b/templates/form/dropbutton-wrapper.html.twig
index 5dccc8548709d0358a8da19ce533f74ecc23a1d9..e72176da3ab77816422eaf6c728fb7d4c5de4002 100644
--- a/templates/form/dropbutton-wrapper.html.twig
+++ b/templates/form/dropbutton-wrapper.html.twig
@@ -10,6 +10,8 @@
* @see template_preprocess_dropbutton_wrapper()
*/
#}
+{{ attach_library('bootstrap_barrio/dropbutton') }}
+
{% if children %}
{% spaceless %}
<div class="dropbutton-wrapper">
diff --git a/templates/navigation/book-navigation.html.twig b/templates/navigation/book-navigation.html.twig
index 8a34c91edb01a68be4f93dcd7200f16c2af98e2c..e696ade32a5887a952c6c77d4e5fffec15c12095 100644
--- a/templates/navigation/book-navigation.html.twig
+++ b/templates/navigation/book-navigation.html.twig
@@ -28,7 +28,7 @@
* @see template_preprocess_book_navigation()
*/
#}
-{{ attach_library('classy/book-navigation') }}
+{{ attach_library('bootstrap_barrio/book-navigation') }}
{% if tree or has_links %}
<nav id="book-navigation-{{ book_id }}" class="book-navigation" role="navigation" aria-labelledby="book-label-{{ book_id }}">
{{ tree }}
diff --git a/templates/navigation/breadcrumb.html.twig b/templates/navigation/breadcrumb.html.twig
index 94ed9ef409f05fcdc6aa56ccf5d26695c2444a5a..aae61c22b9ba45b384c3c5be3c8f54be3aeff991 100644
--- a/templates/navigation/breadcrumb.html.twig
+++ b/templates/navigation/breadcrumb.html.twig
@@ -7,6 +7,8 @@
* - breadcrumb: Breadcrumb trail items.
*/
#}
+{{ attach_library('bootstrap_barrio/breadcrumb') }}
+
{% if breadcrumb %}
<nav role="navigation" aria-labelledby="system-breadcrumb">
<h2 id="system-breadcrumb" class="visually-hidden">{{ 'Breadcrumb'|t }}</h2>
diff --git a/theme-settings.php b/theme-settings.php
index 9d38079fcb921f61e245f60ae3173a80f26e22a2..1f1b92bf4f09700d2ea13d3ba78b5d5903f8d3ff 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -270,5 +270,33 @@ function bootstrap_barrio_form_system_theme_settings_alter(&$form, FormStateInte
),
'#empty_option' => t('Default'),
);
+ // Fonts.
+ $form['components']['fonts'] = array(
+ '#type' => 'details',
+ '#title' => t('Fonts'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['components']['fonts']['bootstrap_barrio_google_fonts'] = array(
+ '#type' => 'select',
+ '#title' => t('Google Fonts Combination'),
+ '#default_value' => theme_get_setting('bootstrap_barrio_google_fonts'),
+ '#empty_option' => t('None'),
+ '#options' => array(
+ 'monserrat_lato' => 'Monserrat, Lato',
+ 'alegreya_roboto' => 'Alegreya, Roboto Condensed, Roboto',
+ 'dancing_garamond' => 'Dancing Script, EB Garamond',
+ 'amatic_josefin' => 'Amatic SC, Josefin Sans',
+ 'oswald_droid' => 'Oswald, Droid Serif',
+ 'playfair_alice' => 'Playfair Display, Alice',
+ 'dosis_opensans' => 'Dosis, Open Sans',
+ 'lato_hotel' => 'Lato, Grand Hotel',
+ 'medula_abel' => 'Medula One, Abel',
+ 'fjalla_cantarell' => 'Fjalla One, Cantarell',
+ 'coustard_leckerli' => 'Coustard Ultra, Leckerli One',
+ 'philosopher_muli' => ' Philosopher, Muli ',
+ 'vollkorn_exo' => 'Vollkorn, Exo',
+ ),
+ );
}