Skip to content

Instantly share code, notes, and snippets.

@sylus
Created April 1, 2021 03:03
Show Gist options
  • Save sylus/7b030307945ba096d1669055333f5efb to your computer and use it in GitHub Desktop.
Save sylus/7b030307945ba096d1669055333f5efb to your computer and use it in GitHub Desktop.
From 220d2da84b4b2bacff0dab6b8ee6f0883eedfcd9 Mon Sep 17 00:00:00 2001
From: William Hearn <[email protected]>
Date: Wed, 31 Mar 2021 22:30:20 -0400
Subject: [PATCH] feat(bootstrap): Bootstrap no longer ships with overrides
---
profiles/wetkit/modules/contrib/admin_menu/admin_menu.css | 1 -
profiles/wetkit/themes/wetkit_bootstrap/css/overrides.min.css | 1 +
.../themes/wetkit_bootstrap/templates/system/html.vars.php | 2 +-
profiles/wetkit/themes/wetkit_bootstrap/wetkit_bootstrap.info | 3 ++-
4 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 profiles/wetkit/themes/wetkit_bootstrap/css/overrides.min.css
diff --git a/profiles/wetkit/modules/contrib/admin_menu/admin_menu.css b/profiles/wetkit/modules/contrib/admin_menu/admin_menu.css
index 73f15e3..42cdbf0 100644
--- a/profiles/wetkit/modules/contrib/admin_menu/admin_menu.css
+++ b/profiles/wetkit/modules/contrib/admin_menu/admin_menu.css
@@ -15,7 +15,6 @@
position: absolute;
text-align: left;
top: 0;
- height: 30px;
width: 100%;
}
#admin-menu-wrapper {
diff --git a/profiles/wetkit/themes/wetkit_bootstrap/css/overrides.min.css b/profiles/wetkit/themes/wetkit_bootstrap/css/overrides.min.css
new file mode 100644
index 0000000..029c88c
--- /dev/null
+++ b/profiles/wetkit/themes/wetkit_bootstrap/css/overrides.min.css
@@ -0,0 +1 @@
+a .glyphicon-spin,fieldset .panel-heading a.panel-title:hover{text-decoration:none}.tabs-left>.nav-tabs>li:focus,.tabs-left>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li:focus,.tabs-right>.nav-tabs>li>a:focus{outline:0}html.overlay-open .navbar-fixed-top{z-index:400}html.js fieldset.collapsed{border-left-width:1px;border-right-width:1px;height:auto}html.js input.form-autocomplete{background-image:none}html.js .autocomplete-throbber{background-position:100% 2px;background-repeat:no-repeat;display:inline-block;height:15px;margin:2px 0 0 2px;width:15px}html.js .autocomplete-throbber.throbbing{background-position:100% -18px}body{position:relative}body.admin-expanded.admin-vertical.admin-nw .navbar,body.admin-expanded.admin-vertical.admin-sw .navbar{margin-left:260px}body.navbar-is-fixed-top{padding-top:64px}body.navbar-is-fixed-bottom{padding-bottom:64px!important}body.toolbar{padding-top:30px!important}body.toolbar .navbar-fixed-top{top:30px}body.toolbar.navbar-is-fixed-top{padding-top:94px!important}body.toolbar-drawer{padding-top:64px!important}body.toolbar-drawer .navbar-fixed-top{top:64px}body.toolbar-drawer.navbar-is-fixed-top{padding-top:128px!important}body.admin-menu .navbar-fixed-top{top:29px}body.admin-menu.navbar-is-fixed-top{padding-top:93px}body div#admin-toolbar{z-index:1600}body #admin-menu,body #admin-toolbar,body #toolbar{-webkit-box-shadow:none;box-shadow:none}body #admin-menu{margin:0;padding:0;position:fixed;z-index:1600}body #admin-menu .dropdown li{line-height:normal}@media screen and (min-width:768px){.navbar.container{max-width:720px}}@media screen and (min-width:992px){.navbar.container{max-width:940px}}@media screen and (min-width:1200px){.navbar.container{max-width:1140px}}.navbar.container,.navbar.container-fluid{margin-top:20px}.navbar.container-fluid>.container-fluid,.navbar.container>.container{margin:0;padding:0;width:auto}#overlay-container,.overlay-element,.overlay-modal-background{z-index:1500}#toolbar{z-index:1600}.modal{z-index:1620}.modal-dialog{z-index:1630}.ctools-modal-dialog .modal-body{width:100%!important;overflow:auto}.book-toc>.dropdown-menu,.region-help .block,div.image-widget-data{overflow:hidden}.modal-backdrop{z-index:1610}.footer{margin-top:45px;padding-top:35px;padding-bottom:36px;border-top:1px solid #E5E5E5}.element-invisible{margin:0;padding:0;width:1px}.navbar .logo{margin-right:-15px;padding-left:15px;padding-right:15px}ul.secondary{float:left}@media screen and (min-width:768px){.navbar .logo{margin-right:0;padding-left:0}ul.secondary{float:right}}.page-header,.region-sidebar-first .block:first-child h2.block-title,.region-sidebar-second .block:first-child h2.block-title{margin-top:0}p:last-child{margin-bottom:0}.region-help>.glyphicon{font-size:18px;float:left;margin:-.05em .5em 0 0}form#search-block-form{margin:0}.navbar #block-search-form{float:none;margin:5px 0 5px 5px}@media screen and (min-width:992px){.navbar #block-search-form{float:right}}.navbar #block-search-form .input-group-btn{width:auto}ul.action-links{margin:12px 0;padding:0}ul.action-links li{display:inline;margin:0;padding:0 6px 0 0}ul.action-links .glyphicon{padding-right:.5em}.uneditable-input,input,select,textarea{max-width:100%;width:auto}.filter-wrapper .form-type-select .filter-list,.managed-files.table td:first-child{width:100%}input.error{color:#a94442;border-color:#ebccd1}fieldset legend.panel-heading{float:left;line-height:1em;margin:0}fieldset .panel-body{clear:both}.form-type-password-confirm label,.panel-heading{display:block}fieldset .panel-heading a.panel-title{color:inherit;display:block;margin:-10px -15px;padding:10px 15px}.form-group:last-child,.panel:last-child{margin-bottom:0}.form-horizontal .form-group{margin-left:0;margin-right:0}.form-actions{clear:both}div.image-widget-data{float:none}table.sticky-header{z-index:1}.resizable-textarea textarea{border-radius:4px 4px 0 0}.ajax-progress-bar,.filter-wrapper{border-radius:0 0 4px 4px}.text-format-wrapper{margin-bottom:15px}.text-format-wrapper .filter-wrapper,.text-format-wrapper>.form-type-textarea{margin-bottom:0}.filter-wrapper .panel-body{padding:7px}.filter-wrapper .form-type-select{min-width:30%}.filter-help{margin-top:5px;text-align:center}@media screen and (min-width:768px){.filter-help{float:right}}.filter-help .glyphicon{margin:0 5px 0 0;vertical-align:text-top}.checkbox:first-child,.radio:first-child{margin-top:0}.checkbox:last-child,.radio:last-child{margin-bottom:0}.control-group .help-inline,.help-block{color:#777;font-size:12px;margin:5px 0 10px;padding:0}a.tabledrag-handle .handle{height:auto;width:auto}.error{color:#a94442}div.error,table tr.error{background-color:#f2dede;color:#a94442}.form-group.error,.form-group.has-error{background:0 0}.form-group.error .control-label,.form-group.error label,.form-group.has-error .control-label,.form-group.has-error label{color:#a94442;font-weight:600}.form-group.error .uneditable-input,.form-group.error input,.form-group.error select,.form-group.error textarea,.form-group.has-error .uneditable-input,.form-group.has-error input,.form-group.has-error select,.form-group.has-error textarea{color:#555}.form-group.error .help-block,.form-group.error .help-inline,.form-group.has-error .help-block,.form-group.has-error .help-inline,.submitted{color:#777}.nav-tabs{margin-bottom:10px}ul li.collapsed,ul li.expanded,ul li.leaf{list-style:none}.tabs--secondary{margin:0 0 10px}.submitted{margin-bottom:1em;font-style:italic;font-weight:400}.alert a,.book-toc>.dropdown-menu>li:nth-child(1)>a{font-weight:700}.form-type-password-confirm{position:relative}.form-type-password-confirm label .label{float:right}.form-type-password-confirm .password-help{padding-left:2em}@media (min-width:768px){.form-type-password-confirm .password-help{border-left:1px solid #ddd;left:50%;margin-left:15px;position:absolute}}@media (min-width:992px){.form-type-password-confirm .password-help{left:33.33333333%}}.form-type-password-confirm .progress{background:0 0;border-radius:0 0 5px 5px;-webkit-box-shadow:none;box-shadow:none;height:4px;margin:-5px 0 0}.form-type-password-confirm .form-type-password{clear:left}.form-type-password-confirm .form-control-feedback{right:15px}.form-type-password-confirm .help-block{clear:both}ul.pagination li>a.progress-disabled{float:left}.form-autocomplete .glyphicon{color:#777;font-size:120%}.form-autocomplete .glyphicon.glyphicon-spin{color:#337ab7}.form-autocomplete .input-group-addon{background-color:#fff}.form-autocomplete .dropdown a{white-space:normal}.ajax-progress-bar{border:1px solid #ccc;margin:-1px 0 0;padding:6px 12px;width:100%}.ajax-progress-bar .progress{height:8px;margin:0}.ajax-progress-bar .message,.ajax-progress-bar .percentage{color:#777;font-size:12px;line-height:1em;margin:5px 0 0;padding:0}.glyphicon-spin{display:inline-block;-o-animation:spin 1s infinite linear;-webkit-animation:spin 1s infinite linear;animation:spin 1s infinite linear}a .glyphicon-spin{display:inline-block}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0)}100%{-o-transform:rotate(359deg)}}@keyframes spin{0%{-webkit-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}.tabbable{margin-bottom:20px}.tabs-below>.nav-tabs,.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{border-bottom:0}.tabs-below>.nav-tabs .summary,.tabs-left>.nav-tabs .summary,.tabs-right>.nav-tabs .summary{color:#777;font-size:12px}.tab-pane>.panel-heading{display:none}.tab-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:focus,.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:focus,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd}.tabs-left>.nav-tabs,.tabs-right>.nav-tabs{padding-bottom:20px;width:220px}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{margin-right:0;margin-bottom:3px}.tabs-left>.tab-content,.tabs-right>.tab-content{border-radius:0 4px 4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05);border:1px solid #ddd;overflow:hidden;padding:10px 15px}.tabs-left>.nav-tabs{float:left;margin-right:-1px}.tabs-left>.nav-tabs>li>a{border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:focus,.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs>.active>a,.tabs-left>.nav-tabs>.active>a:focus,.tabs-left>.nav-tabs>.active>a:hover{border-color:#ddd transparent #ddd #ddd;-webkit-box-shadow:-1px 1px 1px rgba(0,0,0,.05);box-shadow:-1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs{float:right;margin-left:-1px}.tabs-right>.nav-tabs>li>a{border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:focus,.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd;-webkit-box-shadow:1px 1px 1px rgba(0,0,0,.05);box-shadow:1px 1px 1px rgba(0,0,0,.05)}.tabs-right>.nav-tabs>.active>a,.tabs-right>.nav-tabs>.active>a:focus,.tabs-right>.nav-tabs>.active>a:hover{border-color:#ddd #ddd #ddd transparent}td.checkbox,td.radio,th.checkbox,th.radio{display:table-cell}.views-display-settings .label{font-size:100%;color:#666}.views-display-settings .footer{padding:0;margin:4px 0 0}.views-exposed-form .views-exposed-widget .btn{margin-top:1.8em}table .checkbox input[type=checkbox],table .radio input[type=radio]{max-width:inherit}.form-horizontal .form-group label{position:relative;min-height:1px;margin-top:0;margin-bottom:0;padding-top:7px;padding-left:15px;padding-right:15px;text-align:right}@media (min-width:768px){.form-horizontal .form-group label{float:left;width:16.66666667%}body.navbar-is-fixed-top.navbar-administration.navbar-vertical.navbar-tray-open .navbar-fixed-top{left:240px;left:24rem}}.alert-success a,.alert-success a:focus,.alert-success a:hover{color:#2b542c}.alert-info a,.alert-info a:focus,.alert-info a:hover{color:#245269}.alert-warning a,.alert-warning a:focus,.alert-warning a:hover{color:#66512c}.alert-danger a,.alert-danger a:focus,.alert-danger a:hover{color:#843534}div.image-style-new,div.image-style-new div{display:block}div.image-style-new div.input-group{display:table}.table-striped>tbody>tr:nth-child(odd)>td.module,.table>tbody>tr>td.module,td.module{background:#ddd;font-weight:700}.book-toc>.dropdown-menu>.dropdown-header{white-space:nowrap}.book-toc>.dropdown-menu .dropdown-menu{-webkit-box-shadow:none;box-shadow:none;border:0;display:block;font-size:12px;margin:0;padding:0;position:static;width:100%}.book-toc>.dropdown-menu .dropdown-menu>li{padding-left:20px}.book-toc>.dropdown-menu .dropdown-menu>li>a{margin-left:-40px;padding-left:60px}#features-filter .form-item.form-type-checkbox{padding-left:20px}fieldset.features-export-component{font-size:12px}fieldset.features-export-component,html.js #features-export-form fieldset.features-export-component{margin:0 0 10px}fieldset.features-export-component .panel-heading{padding:5px 10px}fieldset.features-export-component .panel-heading a.panel-title{font-size:12px;font-weight:500;margin:-5px -10px;padding:5px 10px}fieldset.features-export-component .panel-body{padding:0 10px}div.features-export-list{margin:-11px 0 10px;padding:0 10px}div.features-export-list .form-type-checkbox,fieldset.features-export-component .component-select .form-type-checkbox{line-height:1em;margin:5px 5px 5px 0!important;min-height:0;padding:3px 3px 3px 25px!important}div.features-export-list .form-type-checkbox input[type=checkbox],fieldset.features-export-component .component-select .form-type-checkbox input[type=checkbox]{margin-top:0}body.navbar-is-fixed-top.navbar-administration.navbar-horizontal.navbar-tray-open .navbar-fixed-top{top:79px}body.navbar-is-fixed-top.navbar-administration .navbar-fixed-top{top:39px}.navbar-administration #navbar-administration.navbar-oriented .navbar-bar{z-index:1032}.navbar-administration #navbar-administration .navbar-tray{z-index:1031}body.navbar-is-fixed-top.navbar-administration{padding-top:103px!important}body.navbar-is-fixed-top.navbar-administration.navbar-horizontal.navbar-tray-open{padding-top:143px!important}body.navbar-tray-open.navbar-vertical.navbar-fixed{margin-left:24rem}#navbar-administration.navbar-oriented .navbar-tray-vertical{width:24rem}a.icon-before .glyphicon{margin-right:.25em}a.icon-after .glyphicon{margin-left:.25em}.btn.icon-before .glyphicon{margin-left:-.25em;margin-right:.25em}.btn.icon-after .glyphicon{margin-left:.25em;margin-right:-.25em}
diff --git a/profiles/wetkit/themes/wetkit_bootstrap/templates/system/html.vars.php b/profiles/wetkit/themes/wetkit_bootstrap/templates/system/html.vars.php
index d5e6352..41ae567 100644
--- a/profiles/wetkit/themes/wetkit_bootstrap/templates/system/html.vars.php
+++ b/profiles/wetkit/themes/wetkit_bootstrap/templates/system/html.vars.php
@@ -93,7 +93,7 @@ function wetkit_bootstrap_preprocess_html(&$variables, $hook) {
$variables['body_attributes_array']['class'][] = drupal_html_class($theme_key);
// Add legacy WxT class for v5 or v6 spec.
- if ($wxt_active == "gcweb") {
+ if ($wxt_active == 'gcweb' || $wxt_active == 'gcweb_legacy') {
$variables['body_attributes_array']['class'][] = 'theme-gcweb';
}
diff --git a/profiles/wetkit/themes/wetkit_bootstrap/wetkit_bootstrap.info b/profiles/wetkit/themes/wetkit_bootstrap/wetkit_bootstrap.info
index 9862039..30e7e42 100644
--- a/profiles/wetkit/themes/wetkit_bootstrap/wetkit_bootstrap.info
+++ b/profiles/wetkit/themes/wetkit_bootstrap/wetkit_bootstrap.info
@@ -21,6 +21,7 @@ regions[page_bottom] = Page bottom
; ========================================
; Stylesheets
; ========================================
+stylesheets[all][] = css/overrides.min.css
stylesheets[all][] = css/wetkit_bootstrap.styles.css
; ========================================
@@ -43,7 +44,7 @@ scripts[] = js/wetkit-bootstrap.modules.js
; ========================================
; Settings
; ========================================
-settings[bootstrap_cdn] = ""
+;settings[bootstrap_cdn] = ""
; Information added by drush on 2021-01-29
version = "7.x-4.32+1-dev"
--
2.21.0 (Apple Git-122)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment