bootstrap.info | 2 - bootstrap_subtheme/README.txt | 8 +- .../bootstrap_subtheme.info.starterkit | 2 +- bootstrap_subtheme/css/README.txt | 2 +- bootstrap_subtheme/css/style.css | 4 + bootstrap_subtheme/css/theme.css | 4 - bootstrap_subtheme/less/README.txt | 2 +- bootstrap_subtheme/less/content.less | 19 -- bootstrap_subtheme/less/fixes.less | 82 ----- bootstrap_subtheme/less/footer.less | 2 +- bootstrap_subtheme/less/header.less | 4 - bootstrap_subtheme/less/overrides.less | 331 +++++++++++++++++++++ bootstrap_subtheme/less/style.less | 17 ++ bootstrap_subtheme/less/theme.less | 11 - css/overrides.css | 1 + css/style.css | 255 ---------------- includes/form.inc | 1 - includes/theme.inc | 36 ++- templates/block.tpl.php | 2 +- 19 files changed, 388 insertions(+), 397 deletions(-) create mode 100644 bootstrap_subtheme/css/style.css delete mode 100644 bootstrap_subtheme/css/theme.css delete mode 100644 bootstrap_subtheme/less/fixes.less create mode 100644 bootstrap_subtheme/less/overrides.less create mode 100644 bootstrap_subtheme/less/style.less delete mode 100644 bootstrap_subtheme/less/theme.less create mode 100644 css/overrides.css delete mode 100644 css/style.css diff --git a/bootstrap.info b/bootstrap.info index 487f809..98957a1 100644 --- a/bootstrap.info +++ b/bootstrap.info @@ -10,8 +10,6 @@ regions[sidebar_first] = 'Primary' regions[sidebar_second] = 'Secondary' regions[footer] = 'Footer' -stylesheets[all][] = css/style.css - settings[toggle_name] = 0 settings[toggle_search] = 1 settings[cdn_bootstrap] = 1 diff --git a/bootstrap_subtheme/README.txt b/bootstrap_subtheme/README.txt index a8390b8..d221db9 100644 --- a/bootstrap_subtheme/README.txt +++ b/bootstrap_subtheme/README.txt @@ -57,12 +57,12 @@ to be updated in the future. **IF USING THE LESS MODULE** Change the stylesheets include of your sub-theme's .info file from -`css/theme.css` to `less/theme.less`. These will be generated once the theme is +`css/style.css` to `less/style.less`. These will be generated once the theme is enabled and viewed. **IF USING A LOCAL PREPROCESSOR** -Compile the `./less/theme.less` file. A new file should be generated as -`./css/theme.css`. +Compile the `./less/style.less` file. A new file should be generated as +`./css/style.css`. Lastly, you will need to uncomment the lines in your sub-theme's .info file (pertaining to this method) before anything will work. @@ -72,7 +72,7 @@ This method is rather simple, you don't have to do anything unless you wish to override the default Bootstrap base theme settings. If so, just uncomment the lines pertaining to Method 2. -Edit the provided `./css/theme.css` file to your liking. +Edit the provided `./css/style.css` file to your liking. ## Enable Navigate to `admin/appearance` and click "Enable and set default" for your diff --git a/bootstrap_subtheme/bootstrap_subtheme.info.starterkit b/bootstrap_subtheme/bootstrap_subtheme.info.starterkit index eb1cd10..7cb0042 100644 --- a/bootstrap_subtheme/bootstrap_subtheme.info.starterkit +++ b/bootstrap_subtheme/bootstrap_subtheme.info.starterkit @@ -14,7 +14,7 @@ regions[sidebar_second] = 'Secondary' regions[footer] = 'Footer' ; Stylesheets -stylesheets[all][] = css/theme.css +stylesheets[all][] = css/style.css ;********************************** ; METHOD 1: Bootstrap Source Files diff --git a/bootstrap_subtheme/css/README.txt b/bootstrap_subtheme/css/README.txt index 1a1270e..923569d 100644 --- a/bootstrap_subtheme/css/README.txt +++ b/bootstrap_subtheme/css/README.txt @@ -2,4 +2,4 @@ If using Method 1, this folder is where the output from the compiled LESS files should be generated. If using the LESS module, this folder can be ignored or removed. -If using Method 2, edit the theme.css file to your liking. \ No newline at end of file +If using Method 2, edit the style.css file to your liking. diff --git a/bootstrap_subtheme/css/style.css b/bootstrap_subtheme/css/style.css new file mode 100644 index 0000000..bfbbcfb --- /dev/null +++ b/bootstrap_subtheme/css/style.css @@ -0,0 +1,4 @@ +/** + * This file should get overwritten if Method 1 is used. If Method 2 is chosen, + * remove this comment and start adding your styles to this file. + */ diff --git a/bootstrap_subtheme/css/theme.css b/bootstrap_subtheme/css/theme.css deleted file mode 100644 index ec772b9..0000000 --- a/bootstrap_subtheme/css/theme.css +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This file should get overwritten if Method 1 is used. If Method 2 is chosen, - * remove this comment and start adding your styles to this file. - */ \ No newline at end of file diff --git a/bootstrap_subtheme/less/README.txt b/bootstrap_subtheme/less/README.txt index a23855d..85293ea 100644 --- a/bootstrap_subtheme/less/README.txt +++ b/bootstrap_subtheme/less/README.txt @@ -26,7 +26,7 @@ specifying specific styling for your sites configuration. ./less/footer.less ``` -And finally, the `./less/theme.less` file is the glue that holds it all +And finally, the `./less/style.less` file is the glue that holds it all together and compiles everything into one file. Generally, you will not need to modify this file unless you need to add or remove imported files. For example, if you do not want your site to have responsive capabilities, free to diff --git a/bootstrap_subtheme/less/content.less b/bootstrap_subtheme/less/content.less index 61b3c22..f83569b 100644 --- a/bootstrap_subtheme/less/content.less +++ b/bootstrap_subtheme/less/content.less @@ -1,20 +1 @@ // Insert your styling here. - -.ds-2col { - & > .group-left { - margin-right: 3%; - width: auto; - @media @mobile { - float: none; - margin: 0; - } - } - & > .group-right { - float: none; - overflow: hidden; - width: auto; - h2 { - margin-top: 0; - } - } -} diff --git a/bootstrap_subtheme/less/fixes.less b/bootstrap_subtheme/less/fixes.less deleted file mode 100644 index d6f54a1..0000000 --- a/bootstrap_subtheme/less/fixes.less +++ /dev/null @@ -1,82 +0,0 @@ -// Fix admin menu -html body.admin-menu { - margin-top: 27px !important; -} -body.admin-menu .navbar-fixed-top { - top: 28px; -} -#admin-menu { - .box-shadow(none); -} - -// Bootstrap likes to manually set line-heights to pixels, bad... -body, h1, h2, h3, h4, h5, h6 { - line-height: 1.25em; -} -// Input elements need to be controlled if container is smaller. -input, textarea, select, .uneditable-input { - max-width: 100%; -} -// Fix inputs -select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { - .box-sizing(border-box); - height: 31px; -} -// Fix appended inputs so they don't overflow the containers. -.input-append { - .box-sizing(border-box); - padding-right: 40px; - width: 100%; - input, textarea, select, .uneditable-input { - width: 100% !important; - } -} -// Remove floats from forms. -form.pull-left { - float: none; -} - -// Drupal Core Overrides -ul li.collapsed, -ul li.expanded, -ul li.leaf { - list-style: none; - list-style-image: none; -} -// Fix labels not clearing initially. -label { - clear: both; -} -// Remove the top header margin in blocks. -.block h2.block-title { - margin-top: 0; -} -// Remove background image from form-item errors. -div.error, -table tr.error { - background-color: @errorBackground; - color: @errorText; -} -.control-group.error { - background: none; - label, .control-label { - color: @errorText; - font-weight: 600; - } - input, textarea, select, .uneditable-input { - border: 1px solid @inputBorder; - } - &, .help-block, .help-inline { - color: @textColor; - } -} - -// Icon Overrides -[class^="icon-"]:before, [class*=" icon-"]:before { - margin: 0; -} - -// Text enhancement -#content { - text-shadow: 0 1px 0 @white; -} \ No newline at end of file diff --git a/bootstrap_subtheme/less/footer.less b/bootstrap_subtheme/less/footer.less index d1ec0dd..8d40dbf 100644 --- a/bootstrap_subtheme/less/footer.less +++ b/bootstrap_subtheme/less/footer.less @@ -1 +1 @@ -// Insert your styling here. \ No newline at end of file +// Insert your styling here. diff --git a/bootstrap_subtheme/less/header.less b/bootstrap_subtheme/less/header.less index 4d79149..f83569b 100644 --- a/bootstrap_subtheme/less/header.less +++ b/bootstrap_subtheme/less/header.less @@ -1,5 +1 @@ // Insert your styling here. - -#logo { - margin-top: -5px; -} \ No newline at end of file diff --git a/bootstrap_subtheme/less/overrides.less b/bootstrap_subtheme/less/overrides.less new file mode 100644 index 0000000..9ece17e --- /dev/null +++ b/bootstrap_subtheme/less/overrides.less @@ -0,0 +1,331 @@ +// Bootstrap variables. +@import 'variables.less'; + +// Media query variables. +@mobile: ~"(max-width: 767px)"; +@tablet: ~"(min-width: 768px) and (max-width: 979px)"; +@normal: ~"(min-width: 980px) and (max-width: 1199px)"; +@wide: ~"(min-width: 1200px)"; + +// Border Radius +.border-radius(@radius) { + -webkit-border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; +} +// Drop shadows. +.box-shadow(@shadow) { + -webkit-box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; +} +// Box sizing. +.box-sizing(@boxmodel) { + -webkit-box-sizing: @boxmodel; + -moz-box-sizing: @boxmodel; + box-sizing: @boxmodel; +} + +html { + &.overlay-open .navbar-fixed-top { + z-index: 400; + } + &.js { + // Collapsible fieldsets. + fieldset.collapsed { + height: auto; + } + // Throbbers. + input.form-autocomplete { + background-position: 100% 8px; /* LTR */ + background-repeat: no-repeat; + } + input.throbbing { + background-position: 100% -13px; /* LTR */ + } + } +} +body { + // Bootstrap manually sets line heights, this should be relative (em) to the + // font size, not manually set. + &, h1, h2, h3, h4, h5, h6 { + line-height: 1.25em; + } + @media @mobile { + // Fix horizontal scrolling on iOS devices. + // http://drupal.org/node/1870076 + position: relative; + } + @media @normal, @wide { + padding-top: 60px; + } + // Core admin toolbar. + &.toolbar .navbar-fixed-top { + top: 30px; + } + &.toolbar-drawer .navbar-fixed-top { + top: 65px; + } + &.admin-expanded.admin-vertical.admin-nw .navbar, + &.admin-expanded.admin-vertical.admin-sw .navbar { + margin-left: 260px; + } + div#admin-toolbar { + z-index: 500; + } + @media @normal, @wide { + &.toolbar { + padding-top: 94px !important; + } + &.toolbar-drawer { + padding-top: 129px !important; + } + } + // Admin_menu toolbar. + #admin-menu { + .box-shadow(none); + margin: 0; + padding: 0; + position: fixed; + z-index: 1100; + .dropdown li { + line-height: normal; + } + } + &.admin-menu { + html & { + margin-top: 28px !important; + } + .navbar-fixed-top { + top: 28px; + } + } +} +.footer { + margin-top: 45px; + padding: 35px 0 36px; + border-top: 1px solid #E5E5E5; +} + +// Branding. +.navbar .logo { + margin-top: 5px; + margin-right: 10px; +} +#site-name { + line-height: 1; + margin: 0; +} + +// Page header. +.page-header { + margin-top: 0; +} + +// Blocks +.block { + h2.block-title { + margin-top: 0; + } +} + +// Search form. +.region-navigation form#search-block-form { + margin-bottom: 5px; + margin-top: 5px; + @media @mobile, @tablet { + float: none; + } +} +.navbar #block-search-form { + float: left; +} +fieldset.search-advanced { + padding-bottom: 1.5em; + margin-top: 1em; +} +.navbar-search .control-group { + margin-bottom:0px; +} + +// Action Links +ul.action-links { + margin-bottom: 2em; + li { + display: inline; + padding-right: 1.5em; + } + [class^="icon-"], [class*=" icon-"] { + padding-right: 0.5em; + } +} + +// Form elements. +input, textarea, select, .uneditable-input { + max-width: 100%; + width: auto; +} +select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { + .box-sizing(border-box); + height: auto; +} +input.error { + color: @errorText; + border-color: @errorBorder; +} +.form-type-checkbox input, .form-type-radio input { + float: left; +} +.form-actions{ + clear: both; +} +.resizable-textarea textarea { + .border-radius(~"4px 4px 0 0"); +} +.help-block, .control-group .help-inline { + color: @placeholderText; + font-size: 12px; + margin: -8px 0 10px; + padding: 0 3px; + .description + &, + .checkbox + &, + .form-type-checkbox + &, + .form-type-radio + &, + .form-file + &, + .resizable-textarea + & { + margin-top: 0; + } +} + +.input-append { + .box-sizing(border-box); + padding-right: 40px; + width: 100%; + input, textarea, select, .uneditable-input { + width: 100% !important; + } +} + +// Inline containers. +.container-inline div, .container-inline label { + display: block; +} + +// Error containers. +div.error, +table tr.error { + background-color: @errorBackground; + color: @errorText; +} +.control-group.error { + background: none; + label, .control-label { + color: @errorText; + font-weight: 600; + } + input, textarea, select, .uneditable-input { + color: @errorText; + border: 1px solid @inputBorder; + } + .help-block, .help-inline { + color: @placeholderText; + } +} + +// Lists +ul li.collapsed, +ul li.expanded, +ul li.leaf { + list-style: none; + list-style-image: none; +} + +// Vertical tabs. +.vertical-tabs { + .form-type-textfield input { + .box-sizing(inherit); + width: auto; + } + .form-item{ + margin: 1em 0; + } +} + +// Submitted +.submitted { + margin-bottom: 1em; + font-style: italic; + font-weight: normal; + color: #777; +} + +// Password strength indicator. +.password-strength { + width: 17em; + float: right; /* LTR */ + margin-top: 1.4em; +} +.password-strength-title { + display: inline; +} +.password-strength-text { + float: right; /* LTR */ + font-weight: bold; +} +.password-indicator { + background-color: darken(@grayLighter, 2%); + height: 0.3em; + width: 100%; + div { + height: 100%; + width: 0%; + background-color: @green; + } +} +input.password-confirm, +input.password-field { + width: 16em; + margin-bottom: 0.4em; +} +div.password-confirm { + float: right; /* LTR */ + margin-top: 1.5em; + visibility: hidden; + width: 17em; +} +div.form-item div.password-suggestions { + padding: 0.2em 0.5em; + margin: 0.7em 0; + width: 38.5em; + border: 1px solid #B4B4B4; +} +div.password-suggestions ul { + margin-bottom: 0; +} +.confirm-parent, +.password-parent { + clear: left; /* LTR */ + margin: 0; + width: 36.3em; +} + +// Progress bar. +.progress-wrapper .progress { + margin-bottom: 10px; + .bar { + border: 0 none; + margin: 0; + } +} + +// Views AJAX pager. +.pagination ul > li > a { + &.progress-disabled { + float: left; + } + .throbber { + margin: 0 -0.25em 0 0.5em; + position: relative; + top: 1px; + } +} diff --git a/bootstrap_subtheme/less/style.less b/bootstrap_subtheme/less/style.less new file mode 100644 index 0000000..54df1ed --- /dev/null +++ b/bootstrap_subtheme/less/style.less @@ -0,0 +1,17 @@ +// Media query variables. +@mobile: ~"(max-width: 767px)"; +@tablet: ~"(min-width: 768px) and (max-width: 979px)"; +@normal: ~"(min-width: 980px) and (max-width: 1199px)"; +@wide: ~"(min-width: 1200px)"; + +// Bootstrap library. +@import 'bootstrap.less'; +@import 'responsive.less'; + +// Base-theme overrides. +@import 'overrides.less'; + +// Theme specific. +@import 'header.less'; +@import 'content.less'; +@import 'footer.less'; diff --git a/bootstrap_subtheme/less/theme.less b/bootstrap_subtheme/less/theme.less deleted file mode 100644 index 02df860..0000000 --- a/bootstrap_subtheme/less/theme.less +++ /dev/null @@ -1,11 +0,0 @@ -// @media Query Mixin Variables -@mobile: ~"(max-width: 767px)"; -@tablet: ~"(min-width: 768px) and (max-width: 979px)"; -@wide: ~"(min-width: 1200px)"; - -@import 'bootstrap.less'; -@import 'responsive.less'; -@import 'fixes.less'; -@import 'header.less'; -@import 'content.less'; -@import 'footer.less'; diff --git a/css/overrides.css b/css/overrides.css new file mode 100644 index 0000000..b141000 --- /dev/null +++ b/css/overrides.css @@ -0,0 +1 @@ +html.overlay-open .navbar-fixed-top{z-index:400}html.js fieldset.collapsed{height:auto}html.js input.form-autocomplete{background-position:100% 8px;background-repeat:no-repeat}html.js input.throbbing{background-position:100% -13px}body,body h1,body h2,body h3,body h4,body h5,body h6{line-height:1.25em}@media(max-width:767px){body{position:relative}}@media(min-width:980px) and (max-width:1199px),(min-width:1200px){body{padding-top:60px}}body.toolbar .navbar-fixed-top{top:30px}body.toolbar-drawer .navbar-fixed-top{top:65px}body.admin-expanded.admin-vertical.admin-nw .navbar,body.admin-expanded.admin-vertical.admin-sw .navbar{margin-left:260px}body div#admin-toolbar{z-index:500}@media(min-width:980px) and (max-width:1199px),(min-width:1200px){body.toolbar{padding-top:94px!important}body.toolbar-drawer{padding-top:129px!important}}body #admin-menu{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;margin:0;padding:0;position:fixed;z-index:1100}body #admin-menu .dropdown li{line-height:normal}html body.admin-menu{margin-top:28px!important}body.admin-menu .navbar-fixed-top{top:28px}.footer{margin-top:45px;padding:35px 0 36px;border-top:1px solid #e5e5e5}.navbar .logo{margin-top:5px;margin-right:10px}#site-name{line-height:1;margin:0}.page-header{margin-top:0}.block h2.block-title{margin-top:0}.region-navigation form#search-block-form{margin-bottom:5px;margin-top:5px}@media(max-width:767px),(min-width:768px) and (max-width:979px){.region-navigation form#search-block-form{float:none}}.navbar #block-search-form{float:left}fieldset.search-advanced{padding-bottom:1.5em;margin-top:1em}.navbar-search .control-group{margin-bottom:0}ul.action-links{margin-bottom:2em}ul.action-links li{display:inline;padding-right:1.5em}ul.action-links [class^="icon-"],ul.action-links [class*=" icon-"]{padding-right:.5em}input,textarea,select,.uneditable-input{max-width:100%;width:auto}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;height:auto}input.error{color:#b94a48;border-color:#eed3d7}.form-type-checkbox input,.form-type-radio input{float:left}.form-actions{clear:both}.resizable-textarea textarea{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.help-block,.control-group .help-inline{color:#999;font-size:12px;margin:-8px 0 10px;padding:0 3px}.description+.help-block,.description+.control-group .help-inline,.checkbox+.help-block,.checkbox+.control-group .help-inline,.form-type-checkbox+.help-block,.form-type-checkbox+.control-group .help-inline,.form-type-radio+.help-block,.form-type-radio+.control-group .help-inline,.form-file+.help-block,.form-file+.control-group .help-inline,.resizable-textarea+.help-block,.resizable-textarea+.control-group .help-inline{margin-top:0}.input-append{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding-right:40px;width:100%}.input-append input,.input-append textarea,.input-append select,.input-append .uneditable-input{width:100%!important}.container-inline div,.container-inline label{display:block}div.error,table tr.error{background-color:#f2dede;color:#b94a48}.control-group.error{background:0}.control-group.error label,.control-group.error .control-label{color:#b94a48;font-weight:600}.control-group.error input,.control-group.error textarea,.control-group.error select,.control-group.error .uneditable-input{color:#b94a48;border:1px solid #ccc}.control-group.error .help-block,.control-group.error .help-inline{color:#999}ul li.collapsed,ul li.expanded,ul li.leaf{list-style:none;list-style-image:none}.vertical-tabs .form-type-textfield input{-webkit-box-sizing:inherit;-moz-box-sizing:inherit;box-sizing:inherit;width:auto}.vertical-tabs .form-item{margin:1em 0}.submitted{margin-bottom:1em;font-style:italic;font-weight:normal;color:#777}.password-strength{width:17em;float:right;margin-top:1.4em}.password-strength-title{display:inline}.password-strength-text{float:right;font-weight:bold}.password-indicator{background-color:#e9e9e9;height:.3em;width:100%}.password-indicator div{height:100%;width:0;background-color:#46a546}input.password-confirm,input.password-field{width:16em;margin-bottom:.4em}div.password-confirm{float:right;margin-top:1.5em;visibility:hidden;width:17em}div.form-item div.password-suggestions{padding:.2em .5em;margin:.7em 0;width:38.5em;border:1px solid #b4b4b4}div.password-suggestions ul{margin-bottom:0}.confirm-parent,.password-parent{clear:left;margin:0;width:36.3em}.progress-wrapper .progress{margin-bottom:10px}.progress-wrapper .progress .bar{border:0 none;margin:0}.pagination ul>li>a.progress-disabled{float:left}.pagination ul>li>a .throbber{margin:0 -0.25em 0 .5em;position:relative;top:1px} diff --git a/css/style.css b/css/style.css deleted file mode 100644 index a13e664..0000000 --- a/css/style.css +++ /dev/null @@ -1,255 +0,0 @@ -/** - * Fixing horizontal scroll bar on iPhone - * http://drupal.org/node/1870076 - */ -@media(max-width: 767px) { - body { - position: relative; - } -} -@media(min-width: 980px) { - body { - padding-top: 60px; - } -} - -.navbar .logo { - margin-top: 5px; - margin-right: 10px; -} - -#site-name { - line-height: 1; - margin: 0; -} - -.submitted { - margin-bottom: 1em; - font-style: italic; - font-weight: normal; - color: #777; -} - -.footer { - margin-top: 45px; - padding: 35px 0 36px; - border-top: 1px solid #E5E5E5; -} - -ul.action-links { - margin-bottom: 2em; -} - -ul.action-links li { - display: inline; - padding-right: 1.5em; -} - -ul.action-links [class^="icon-"], -ul.action-links [class*=" icon-"] { - padding-right: .5em; -} - -/** - * Admin Styling - */ - -/* Fix Toolbar for .navbar-fixed-top */ -body.toolbar .navbar-fixed-top { - top: 30px; -} - -body.toolbar-drawer .navbar-fixed-top { - top: 65px; -} - -@media(min-width: 980px) { - body.toolbar { - padding-top: 94px !important; - } - - body.toolbar-drawer { - padding-top: 129px !important; - } -} - -html.overlay-open .navbar-fixed-top { - z-index: 400; -} - -/** - * Search form stylings. - */ - -.region-navigation form#search-block-form { - margin-bottom: 5px; - margin-top: 5px; -} - -@media(max-width: 979px) { - .region-navigation form#search-block-form { - float: none; - } -} - -fieldset.search-advanced { - padding-bottom: 1.5em; - margin-top: 1em; -} - -/* Admin toolbar fix */ -body.admin-expanded.admin-vertical.admin-nw .navbar, -body.admin-expanded.admin-vertical.admin-sw .navbar { - margin-left: 260px; -} - -div#admin-toolbar { - z-index: 500; -} - -/* Admin_menu fix */ -#admin-menu { - z-index: 1100; - position: fixed; -} - -body.admin-menu .navbar-fixed-top { - top: 30px; -} - -#admin-menu .dropdown li { - line-height: normal; -} - -/* System base fix */ -.container-inline div, .container-inline label { - display: block; -} - -/* Default form fields to auto */ -input, textarea, select, .uneditable-input { - width:auto; -} - -/* Default textfield styles inside vertical tabs */ -.vertical-tabs .form-type-textfield input { - -moz-box-sizing: inherit; - -webkit-box-sizing: inherit; - box-sizing: inherit; - width: auto; -} - -/* Vertical tabs form elements alighment */ -.vertical-tabs .form-item{ - margin: 1em 0; -} - -/* Collapsible field groups fix */ -html.js fieldset.collapsed { - height: auto; -} - -/* throbber fix */ -html.js input.form-autocomplete { - background-position: 100% 8px; /* LTR */ - background-repeat: no-repeat; -} - -html.js input.throbbing { - background-position: 100% -13px; /* LTR */ -} - -.navbar-search .control-group { - margin-bottom:0px; -} - -input.error { - color: #B94A48; - border-color: #B94A48; -} - -/** - * Password strength indicator. - */ -.password-strength { - width: 17em; - float: right; /* LTR */ - margin-top: 1.4em; -} - -.password-strength-title { - display: inline; -} - -.password-strength-text { - float: right; /* LTR */ - font-weight: bold; -} - -.password-indicator { - background-color: #C4C4C4; - height: 0.3em; - width: 100%; -} - -.password-indicator div { - height: 100%; - width: 0%; - background-color: #47C965; -} - -input.password-confirm, -input.password-field { - width: 16em; - margin-bottom: 0.4em; -} - -div.password-confirm { - float: right; /* LTR */ - margin-top: 1.5em; - visibility: hidden; - width: 17em; -} - -div.form-item div.password-suggestions { - padding: 0.2em 0.5em; - margin: 0.7em 0; - width: 38.5em; - border: 1px solid #B4B4B4; -} - -div.password-suggestions ul { - margin-bottom: 0; -} - -.confirm-parent, -.password-parent { - clear: left; /* LTR */ - margin: 0; - width: 36.3em; -} -/* added an extra clear both in the situation the form actions is preceded by an badly wrapped float element and they overlap -e.g. multipage*/ - -.form-actions{ - clear: both; -} - -/* Progress Bar Overrides */ -.progress-wrapper .progress { - margin-bottom: 10px; -} -.progress-wrapper .progress .bar { - border: 0 none; - margin: 0; -} - -/* Views AJAX pagination support */ -.pagination ul > li > a.progress-disabled { - float: left; -} -.pagination ul > li a .throbber { - margin: 0 -0.25em 0 0.5em; - position: relative; - top: 1px; -} diff --git a/includes/form.inc b/includes/form.inc index af0fd65..e87a826 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -46,7 +46,6 @@ function bootstrap_form_search_form_alter(&$form, &$form_state) { */ function bootstrap_form_search_block_form_alter(&$form, &$form_state) { $form['#attributes']['class'][] = 'form-search'; - $form['#attributes']['class'][] = 'pull-left'; $form['search_block_form']['#title'] = ''; $form['search_block_form']['#attributes']['class'][] = 'search-query'; diff --git a/includes/theme.inc b/includes/theme.inc index 842f7dc..d4d70f8 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -272,19 +272,35 @@ function bootstrap_status_messages($variables) { * Implements hook_css_alter(). */ function bootstrap_css_alter(&$css) { + $theme_path = drupal_get_path('theme', 'bootstrap'); // Load excluded CSS files from theme. $excludes = _bootstrap_alter(bootstrap_theme_get_info('exclude'), 'css'); - // Add the Bootstrap CDN CSS files. + // Add Bootstrap CDN file and overrides. if (theme_get_setting('cdn_bootstrap')){ - $cdn_url = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version') .'/css/bootstrap-combined.min.css'; - $css[$cdn_url]['data'] = $cdn_url; - $css[$cdn_url]['type'] = 'external'; - $css[$cdn_url]['every_page'] = TRUE; - $css[$cdn_url]['media'] = 'all'; - $css[$cdn_url]['preprocess'] = TRUE; - $css[$cdn_url]['group'] = CSS_THEME; - $css[$cdn_url]['weight'] = -1; - $css[$cdn_url]['browsers'] = array('IE' => TRUE, '!IE' => TRUE); + // Add CDN. + $cdn = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version') .'/css/bootstrap-combined.min.css'; + $css[$cdn] = array( + 'data' => $cdn, + 'type' => 'external', + 'every_page' => TRUE, + 'media' => 'all', + 'preprocess' => TRUE, + 'group' => CSS_THEME, + 'browsers' => array('IE' => TRUE, '!IE' => TRUE), + 'weight' => -2, + ); + // Add overrides. + $override = $theme_path . '/css/overrides.css'; + $css[$override] = array( + 'data' => $override, + 'type' => 'file', + 'every_page' => TRUE, + 'media' => 'all', + 'preprocess' => TRUE, + 'group' => CSS_THEME, + 'browsers' => array('IE' => TRUE, '!IE' => TRUE), + 'weight' => -1, + ); } $css = array_diff_key($css, $excludes); } diff --git a/templates/block.tpl.php b/templates/block.tpl.php index 33fc8b2..4420390 100644 --- a/templates/block.tpl.php +++ b/templates/block.tpl.php @@ -1,4 +1,4 @@ -
> +
>