diff --git a/css/contrib.css b/css/contrib.css index 5affc386689ea0e7e3191744b88ee314e0839a3b..b66c6bd5101032b9c409a440552e5b2b0055ca9a 100644 --- a/css/contrib.css +++ b/css/contrib.css @@ -853,19 +853,6 @@ td.views-field-operations-dropbutton .ctools-dropbutton-processed { margin-top: 23px; } -/* Help Overrides */ -#-commerce-kickstart-help-store .search .form-item { - width: 85%; -} - -#-commerce-kickstart-help-store a.search-submit { - margin-top: 0; -} - -html.js #-commerce-kickstart-help-store fieldset.collapsible { - min-height: 55px; -} - /* Manage Products */ .views-exposed-form .views-exposed-widgets { margin-bottom: .5em; @@ -1300,14 +1287,6 @@ html.js .vbo-views-form #edit-select fieldset .fieldset-wrapper { padding-top: 0; } -/** - * @TODO Need to get Help fixed in CK - */ -#commerce-kickstart-inline-help-button #edit-commerce-kickstart-inline-help-button { - margin-top: 10px; - margin-bottom: -50px; -} - /* Admin module link fix */ div#admin-toolbar * { -moz-box-sizing: content-box; diff --git a/css/shiny-rtl.css b/css/shiny-rtl.css index f8e6af4fa9e89f2e1e7d6ab5a1d6c56a4969dfe7..aae9ed22241bba9feff428e081616f710557aace 100644 --- a/css/shiny-rtl.css +++ b/css/shiny-rtl.css @@ -115,11 +115,6 @@ input.form-radio + label::before { background: transparent url("../images/breadcrumb-rtl.png") no-repeat 0 0; } -#commerce-kickstart-inline-help #edit-commerce-kickstart-inline-help-close-button { - left: 0; - right: auto; -} - .form-managed-file input.form-file { margin-left: 20px; margin-right: 0; @@ -151,15 +146,6 @@ table td.views-field-edit-node a { margin-right: 0; } -#commerce-kickstart-inline-close-help-form-ajax .ajax-progress { - left: 100px; - right: auto; -} - -#commerce-kickstart-inline-help-form-ajax #edit-commerce-kickstart-inline-help-button { - float: left; -} - .item-list ul.pager li { border-left: 1px solid #737373; border-right: 0; diff --git a/css/shiny.css b/css/shiny.css index 1bd44762da6aceba2f6880f5d1cb91855c2c7194..889a354e800d917b4925b53ede80be1117391f27 100644 --- a/css/shiny.css +++ b/css/shiny.css @@ -435,28 +435,6 @@ body.in-maintenance #install-settings-form fieldset .fieldset-wrapper { padding-top: 25px; } -#edit-account-commerce-kickstart-name, -#edit-account-commerce-kickstart-password { - font-weight: 700; -} - -#edit-account-commerce-kickstart-name label, -#edit-account-commerce-kickstart-password label { - color: #333; - float: left; - /* LTR */ - margin-right: 8px; - /* LTR */ - font-weight: 500; -} - -/* Make the Username & Password stand out from the label */ -#edit-account-commerce-kickstart-name, -#edit-account-commerce-kickstart-password { - color: black; - font-weight: bold; -} - /* Overlay Styles */ a.tabledrag-handle .handle { height: 25px; @@ -653,56 +631,6 @@ body.in-maintenance #footer { width: 100%; } -#credit { - float: right; - /* LTR */ - padding: 20px 0 40px; -} - -#powered_by_drupal_commerce { - float: left; - /* LTR */ - padding-top: 20px; -} - -body.in-maintenance #credit { - color: #fff; - margin: 0 auto; - width: 960px; -} - -#credit .message { - clear: right; - /* LTR */ - float: right; - /* LTR */ - margin-bottom: 20px; - width: 180px; -} - -/* CG Logo on White */ -#credit .logo a { - background: transparent url("../images/logo-cg2.png") no-repeat 0 0; - clear: right; - /* LTR */ - float: right; - /* LTR */ - height: 0; - overflow: hidden; - padding: 50px 0 0; - width: 180px; -} - -/* CG Logo on Blue */ -body.in-maintenance #credit .logo a { - background: transparent url("../images/logo-cg3.png") no-repeat 0 0; -} - -/* CG Logo on Black */ -#overlay #overlay-content #credit .logo a { - background: transparent url("../images/logo-cg.png") no-repeat 0 0; -} - #block-system-main { position: relative; } @@ -736,80 +664,12 @@ body.in-maintenance #credit .logo a { width: 10px; } -#commerce-kickstart-inline-help { - position: relative; -} - -#edit-commerce-kickstart-inline-help-button { - padding: 5px 15px; -} - -#commerce-kickstart-inline-help #edit-commerce-kickstart-inline-help-close-button { - padding: 5px 15px; - position: absolute; - right: 0; - /* LTR */ - top: 10px; -} - -#commerce-kickstart-inline-help .advanced-help-topic { - background: #fef2c4; - border: 1px solid #efb120; - -moz-box-shadow: inset 0 0 10px white; - -webkit-box-shadow: inset 0 0 10px white; - box-shadow: inset 0 0 10px white; - margin-bottom: 30px; - padding: 15px; -} - -.page-admin-getting-started .advanced-help-topic { - background: transparent; - border: 0; - padding: 0; -} - -.page-admin-getting-started .advanced-help-topic a { - color: #36A2F6; -} - -.page-admin-help-getting-started #commerce-kickstart-help { - font-size: 28px; - font-weight: 400; - width: 100%; -} - -.page-admin-help-getting-started #commerce-kickstart-help-button { - position: absolute; - right: 30px; - /* LTR */ - top: -55px; -} - .help-section h3, .help-section h3 a { font-size: 16px; font-weight: 400; } -#block-commerce-kickstart-help-commerce-kickstart-ressources, -#block-commerce-kickstart-help-commerce-kickstart-community { - background: #fefefe; - border: 1px solid #efb120; - -moz-border-radius: 15px 15px 15px 15px; - -webkit-border-radius: 15px 15px 15px 15px; - border-radius: 15px 15px 15px 15px; - margin: 0; - min-height: 250px; - padding: 10px 30px; - width: 48.27586%; - /* 420px/870px */ -} - -.block-commerce-kickstart-help h2 { - color: #acacac; - font: normal 600 26px/26px "Open Sans", Arial, sans-serif; -} - /* Default Buttons */ input.form-submit, a.button { @@ -1059,22 +919,6 @@ table td.views-field-edit-node a { /* LTR */ } -#commerce-kickstart-inline-help-form-ajax .ajax-progress { - padding-top: 10px; -} - -#commerce-kickstart-inline-close-help-form-ajax .ajax-progress { - position: absolute; - right: 100px; - /* LTR */ - top: 10px; -} - -#commerce-kickstart-inline-help-form-ajax #edit-commerce-kickstart-inline-help-button { - float: right; - /* LTR */ -} - .item-list ul.pager li { border-right: 1px solid #737373; /* LTR */ diff --git a/images/logo-cg.png b/images/logo-cg.png deleted file mode 100644 index 979e8e8e4aa04a9cef45e7825d42c5e3e1453c7f..0000000000000000000000000000000000000000 Binary files a/images/logo-cg.png and /dev/null differ diff --git a/images/logo-cg2.png b/images/logo-cg2.png deleted file mode 100644 index 8d4399e3bb8790688e755cdb9ed1f1f6f7828776..0000000000000000000000000000000000000000 Binary files a/images/logo-cg2.png and /dev/null differ diff --git a/images/logo-cg3.png b/images/logo-cg3.png deleted file mode 100644 index 75cfe78f2d0209979a00115c5b6ce8a5e07065ec..0000000000000000000000000000000000000000 Binary files a/images/logo-cg3.png and /dev/null differ diff --git a/logo.png b/logo.png index bcd422af9687695ced0757fafdd2317cee5be199..3b49a4ce78dc8b1ce754706f400b3b61a99857d1 100644 Binary files a/logo.png and b/logo.png differ diff --git a/scss/contrib.scss b/scss/contrib.scss index edb90ee62fa5fd71e130570ebe6f8a5696ac5e75..b26a82186f710dd677238853ad470a6d1147ab01 100644 --- a/scss/contrib.scss +++ b/scss/contrib.scss @@ -646,17 +646,6 @@ td.views-field-operations-dropbutton { margin-top: 23px; } -/* Help Overrides */ -#-commerce-kickstart-help-store .search .form-item { - width: 85%; -} -#-commerce-kickstart-help-store a.search-submit { - margin-top: 0; -} -html.js #-commerce-kickstart-help-store fieldset.collapsible { - min-height: 55px; -} - /* Manage Products */ .views-exposed-form { @@ -1085,13 +1074,6 @@ html.js .vbo-views-form #edit-select fieldset .fieldset-wrapper{ .vertical-tabs-pane .fieldset-wrapper > div.form-type-checkbox:first-child { padding-top: 0; } -/** - * @TODO Need to get Help fixed in CK - */ -#commerce-kickstart-inline-help-button #edit-commerce-kickstart-inline-help-button { - margin-top: 10px; - margin-bottom: -50px; -} /* Admin module link fix */ div#admin-toolbar * { diff --git a/scss/shiny-rtl.scss b/scss/shiny-rtl.scss index aa0653e9dfd2d9c79a108d4fe78ebd4e5499bae5..16c2eb26eb26f05d2e26fe6015181968d0332fa0 100644 --- a/scss/shiny-rtl.scss +++ b/scss/shiny-rtl.scss @@ -123,11 +123,6 @@ input.form-radio + label::before { } } -#commerce-kickstart-inline-help #edit-commerce-kickstart-inline-help-close-button { - left: 0; - right: auto; -} - .form-managed-file input.form-file { margin-left: 20px; margin-right: 0; @@ -155,13 +150,6 @@ table td.views-field-edit-node a { margin-left: 10px; margin-right: 0; } -#commerce-kickstart-inline-close-help-form-ajax .ajax-progress { - left: 100px; - right: auto; -} -#commerce-kickstart-inline-help-form-ajax #edit-commerce-kickstart-inline-help-button { - float: left; -} .item-list ul.pager li { border-left: 1px solid #737373; border-right: 0; diff --git a/scss/shiny.scss b/scss/shiny.scss index e5239d347161e022a90e4e2b53340bf8e68d0cea..b5eac27a744953eb8e4fb64d7637124e6f60c55c 100644 --- a/scss/shiny.scss +++ b/scss/shiny.scss @@ -387,24 +387,6 @@ body.in-maintenance #install-settings-form fieldset .fieldset-legend { body.in-maintenance #install-settings-form fieldset .fieldset-wrapper { padding-top: 25px; } -#edit-account-commerce-kickstart-name, -#edit-account-commerce-kickstart-password { - font-weight: 700; -} -#edit-account-commerce-kickstart-name label, -#edit-account-commerce-kickstart-password label { - color:#333; - float: left; /* LTR */ - margin-right: 8px; /* LTR */ - font-weight: 500; -} -/* Make the Username & Password stand out from the label */ -#edit-account-commerce-kickstart-name, -#edit-account-commerce-kickstart-password { - color: black; - font-weight: bold; -} - /* Overlay Styles */ a.tabledrag-handle .handle { @@ -552,43 +534,6 @@ body.in-maintenance #footer { top: 100%; width: 100%; } -#credit { - float: right; /* LTR */ - padding: 20px 0 40px; -} -#powered_by_drupal_commerce { - float: left; /* LTR */ - padding-top: 20px; -} -body.in-maintenance #credit { - color: #fff; - margin: 0 auto; - width: 960px; -} -#credit .message { - clear: right; /* LTR */ - float: right; /* LTR */ - margin-bottom: 20px; - width: 180px; -} -/* CG Logo on White */ -#credit .logo a { - background: transparent url("../images/logo-cg2.png") no-repeat 0 0; - clear: right; /* LTR */ - float: right; /* LTR */ - height: 0; - overflow: hidden; - padding: 50px 0 0; - width: 180px; -} -/* CG Logo on Blue */ -body.in-maintenance #credit .logo a { - background: transparent url("../images/logo-cg3.png") no-repeat 0 0; -} -/* CG Logo on Black */ -#overlay #overlay-content #credit .logo a { - background: transparent url("../images/logo-cg.png") no-repeat 0 0; -} #block-system-main { position: relative; } @@ -621,65 +566,11 @@ body.in-maintenance #credit .logo a { width: 10px; } } -#commerce-kickstart-inline-help { - position: relative; -} -#edit-commerce-kickstart-inline-help-button { - padding: 5px 15px; -} -#commerce-kickstart-inline-help #edit-commerce-kickstart-inline-help-close-button { - padding: 5px 15px; - position: absolute; - right: 0; /* LTR */ - top: 10px; -} -#commerce-kickstart-inline-help .advanced-help-topic { - background: #fef2c4; - border: 1px solid #efb120; - -moz-box-shadow: inset 0 0 10px #fff; - -webkit-box-shadow: inset 0 0 10px #fff; - box-shadow: inset 0 0 10px #fff; - margin-bottom: 30px; - padding: 15px; -} -.page-admin-getting-started .advanced-help-topic { - background: transparent; - border: 0; - padding: 0; -} -.page-admin-getting-started .advanced-help-topic a { - color: #36A2F6; -} -.page-admin-help-getting-started #commerce-kickstart-help { - font-size: 28px; - font-weight: 400; - width: 100%; -} -.page-admin-help-getting-started #commerce-kickstart-help-button { - position: absolute; - right: 30px; /* LTR */ - top: -55px; -} - .help-section h3, .help-section h3 a { font-size: 16px; font-weight: 400; } -#block-commerce-kickstart-help-commerce-kickstart-ressources, -#block-commerce-kickstart-help-commerce-kickstart-community { - background: #fefefe; - border: 1px solid #efb120; - @include round-corners(15px,15px,15px,15px); - margin: 0; - min-height: 250px; - padding: 10px 30px; - width: 48.27586%; /* 420px/870px */ -} -.block-commerce-kickstart-help h2 { - color: #acacac; - font: normal 600 26px/26px "Open Sans", Arial, sans-serif; -} /* Default Buttons */ input.form-submit, a.button { @@ -812,17 +703,6 @@ table td.views-field-edit-node a { float: left; /* LTR */ margin-right: 10px; /* LTR */ } -#commerce-kickstart-inline-help-form-ajax .ajax-progress { - padding-top: 10px; -} -#commerce-kickstart-inline-close-help-form-ajax .ajax-progress { - position: absolute; - right: 100px; /* LTR */ - top: 10px; -} -#commerce-kickstart-inline-help-form-ajax #edit-commerce-kickstart-inline-help-button { - float: right; /* LTR */ -} .item-list ul.pager li { border-right: 1px solid #737373; /* LTR */ font-size: 14px; diff --git a/template.php b/template.php index 95da622cd541c8cc952c378d7974b1dbe4fe422c..1b28459c91b034be3b1a58f72d19ad1587b99b40 100644 --- a/template.php +++ b/template.php @@ -15,27 +15,6 @@ function shiny_views_bulk_operations_form_alter(&$form, &$form_state, $vbo) { } } -/** - * Override or insert variables into the maintenance page template. - */ -function shiny_preprocess_maintenance_page(&$vars) { - // While markup for normal pages is split into page.tpl.php and html.tpl.php, - // the markup for the maintenance page is all in the single - // maintenance-page.tpl.php template. So, to have what's done in - // shiny_preprocess_html() also happen on the maintenance page, it has to be - // called here. - shiny_preprocess_html($vars); - if (variable_get('install_task') != 'done') { - $footer_markup = '
' . t('Proudly built by') . '
'; - $footer_markup .= ''; - $vars['footer'] = array( - '#prefix' => '
', - '#markup' => $footer_markup, - '#suffix' => '
', - ); - } -} - /** * Override or insert variables into the html template. */