summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Dudenhofer2013-02-28 18:54:56 (GMT)
committer Aaron Dudenhofer2013-02-28 18:54:56 (GMT)
commitb4f97111e39948687b688d5ff0d6b4df384466de (patch)
tree149524a1412daeedaae2908bfe093d744245c189
parentd18599257046d7c677867e0162c9949a9d9126fa (diff)
Removing Kickstart-specific elements from the Shiny. These are being moved to an admin subtheme for Kickstart.
-rw-r--r--css/contrib.css21
-rw-r--r--css/shiny-rtl.css14
-rw-r--r--css/shiny.css156
-rw-r--r--images/logo-cg.pngbin3891 -> 0 bytes
-rw-r--r--images/logo-cg2.pngbin3865 -> 0 bytes
-rw-r--r--images/logo-cg3.pngbin3862 -> 0 bytes
-rw-r--r--logo.pngbin5337 -> 3905 bytes
-rw-r--r--scss/contrib.scss18
-rw-r--r--scss/shiny-rtl.scss12
-rw-r--r--scss/shiny.scss120
-rw-r--r--template.php21
11 files changed, 0 insertions, 362 deletions
diff --git a/css/contrib.css b/css/contrib.css
index 5affc38..b66c6bd 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 f8e6af4..aae9ed2 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 1bd4476..889a354 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 979e8e8..0000000
--- a/images/logo-cg.png
+++ /dev/null
Binary files differ
diff --git a/images/logo-cg2.png b/images/logo-cg2.png
deleted file mode 100644
index 8d4399e..0000000
--- a/images/logo-cg2.png
+++ /dev/null
Binary files differ
diff --git a/images/logo-cg3.png b/images/logo-cg3.png
deleted file mode 100644
index 75cfe78..0000000
--- a/images/logo-cg3.png
+++ /dev/null
Binary files differ
diff --git a/logo.png b/logo.png
index bcd422a..3b49a4c 100644
--- a/logo.png
+++ b/logo.png
Binary files differ
diff --git a/scss/contrib.scss b/scss/contrib.scss
index edb90ee..b26a821 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 aa0653e..16c2eb2 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 e5239d3..b5eac27 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 95da622..1b28459 100644
--- a/template.php
+++ b/template.php
@@ -16,27 +16,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 = '<div class="message">' . t('Proudly built by') . '</div>';
- $footer_markup .= '<div class="logo">' . t('<a href="@url">Commerce Guys</a>', array('@url' => 'http://www.commerceguys.com')) . '</div>';
- $vars['footer'] = array(
- '#prefix' => '<div id="credit" class="clearfix">',
- '#markup' => $footer_markup,
- '#suffix' => '</div>',
- );
- }
-}
-
-/**
* Override or insert variables into the html template.
*/
function shiny_preprocess_html(&$vars) {