From 4ef8abc29f3711cbeb0bcc6b59142a0fa0f06cb4 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Sat, 17 Oct 2015 14:59:07 -0400 Subject: [PATCH] Cleanup css files and remove unused styles --- CRM/Admin/Form.php | 2 + CRM/Admin/Page/Admin.php | 2 + CRM/Admin/Page/ConfigTaskList.php | 1 + CRM/Admin/Page/Extensions.php | 2 + CRM/Upgrade/Page/Upgrade.php | 2 + css/admin.css | 45 +++++++ css/civicrm.css | 188 +----------------------------- css/contactSummary.css | 12 ++ css/searchForm.css | 39 ++++++- templates/CRM/common/success.tpl | 2 +- 10 files changed, 106 insertions(+), 189 deletions(-) create mode 100644 css/admin.css diff --git a/CRM/Admin/Form.php b/CRM/Admin/Form.php index 897274d55e..ea32fd3169 100644 --- a/CRM/Admin/Form.php +++ b/CRM/Admin/Form.php @@ -68,6 +68,8 @@ class CRM_Admin_Form extends CRM_Core_Form { * Basic setup. */ public function preProcess() { + Civi::resources()->addStyleFile('civicrm', 'css/admin.css'); + $this->_id = $this->get('id'); $this->_BAOName = $this->get('BAOName'); $this->_values = array(); diff --git a/CRM/Admin/Page/Admin.php b/CRM/Admin/Page/Admin.php index d9985c9c08..05cd744f70 100644 --- a/CRM/Admin/Page/Admin.php +++ b/CRM/Admin/Page/Admin.php @@ -41,6 +41,8 @@ class CRM_Admin_Page_Admin extends CRM_Core_Page { * @return string */ public function run() { + Civi::resources()->addStyleFile('civicrm', 'css/admin.css'); + $groups = array( 'Customize Data and Screens' => ts('Customize Data and Screens'), 'Communications' => ts('Communications'), diff --git a/CRM/Admin/Page/ConfigTaskList.php b/CRM/Admin/Page/ConfigTaskList.php index 016fc2dd01..efe9a5bcfc 100644 --- a/CRM/Admin/Page/ConfigTaskList.php +++ b/CRM/Admin/Page/ConfigTaskList.php @@ -41,6 +41,7 @@ class CRM_Admin_Page_ConfigTaskList extends CRM_Core_Page { * @return string */ public function run() { + Civi::resources()->addStyleFile('civicrm', 'css/admin.css'); CRM_Utils_System::setTitle(ts("Configuration Checklist")); $this->assign('recentlyViewed', FALSE); diff --git a/CRM/Admin/Page/Extensions.php b/CRM/Admin/Page/Extensions.php index 74644323dc..2e3b29aaa4 100644 --- a/CRM/Admin/Page/Extensions.php +++ b/CRM/Admin/Page/Extensions.php @@ -48,6 +48,8 @@ class CRM_Admin_Page_Extensions extends CRM_Core_Page_Basic { * Obtains the group name from url and sets the title. */ public function preProcess() { + Civi::resources()->addStyleFile('civicrm', 'css/admin.css'); + CRM_Utils_System::setTitle(ts('CiviCRM Extensions')); $destination = CRM_Utils_System::url('civicrm/admin/extensions', 'reset=1'); diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php index 64de3415d9..e2626b5e71 100644 --- a/CRM/Upgrade/Page/Upgrade.php +++ b/CRM/Upgrade/Page/Upgrade.php @@ -43,6 +43,8 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page { set_time_limit(0); } + Civi::resources()->addStyleFile('civicrm', 'css/admin.css'); + $upgrade = new CRM_Upgrade_Form(); list($currentVer, $latestVer) = $upgrade->getUpgradeVersions(); diff --git a/css/admin.css b/css/admin.css new file mode 100644 index 0000000000..faa614cd4f --- /dev/null +++ b/css/admin.css @@ -0,0 +1,45 @@ +/* Styles specific to admin pages/forms */ + +/* Config Task List */ +#crm-container td.tasklist a { + font-weight: bold; +} + +#crm-container table.selector td.tasklist { + border-right: 1px solid #DDDDDD; + width: 20%; +} + +#crm-container td.tasklist a:link { + color: #FF0105; +} + +#crm-container td.tasklist a:visited { + color: green; +} + +/* Class for successful upgrade */ +.crm-container .upgrade-success { + background-color: #00CC00; + color: white; +} + +/* Extension management */ + +.crm-container .extension-upgradable { + background-color: #FFFFCC !important; +} + +.crm-container .extension-installed { + background-color: #DDFFDD !important; +} + +.crm-container .extension-missing { + color: #E43D2B !important; +} + +#crm-container .crm-extensions-upgrade { + background: #ffb; + border: 1px solid #000; + text-align: center; +} diff --git a/css/civicrm.css b/css/civicrm.css index 7d9dc2ab5d..71e9c1a91c 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -454,7 +454,6 @@ input.crm-form-entityref { } .crm-container table.form-layout, -.crm-container table.control-panel, .crm-container table.no-border { margin: 0; border-collapse: collapse; @@ -512,14 +511,6 @@ input.crm-form-entityref { border: none; } -.crm-container .control-panel td { - padding: 3px; - width: 25%; - white-space: nowrap; - border: 0 none; - text-align: center; -} - .crm-container .form-layout td.label, .crm-container .form-layout-compressed td.label, .crm-container .selector td.label, @@ -764,7 +755,7 @@ input.crm-form-entityref { } /* But allow them for the help at the top of forms */ -.crm-container #help ul li { +.crm-container .help ul li { background-image: url(menu-leaf.png); } @@ -1138,50 +1129,6 @@ input.crm-form-entityref { color: #494949; } -/* alpha filter styles */ -#crm-recently-viewed ul, -#crm-container #alpha-filter ul { - border-collapse: collapse; - padding: 0; - list-style-type: none; - margin: 3px; - height: auto; - width: auto; -} - -.crm-container div#alpha-filter { - background-color: #CDE8FE; - margin: 4px 0 5px; - padding: 2px; - text-align: left; -} - -.crm-container #alpha-filter li { - background-color: transparent; - background-image: none; - border: none; - color: #AAAAAA; - display: inline; - font-size: 15px; - font-weight: normal; - height: auto; - margin: 0 1px; - padding: 2px 5px; - font-family: Arial, Helvetica, sans-serif; -} - -.crm-container #alpha-filter a { - border-bottom: 1px dotted #2A71B4; - color: #2A71B4; - font-weight: normal; -} - -.crm-container #lang-switch { - float: right; - z-index: 2; - margin: -24px 30px 0 0; -} - /* Boxes of checkbox elements (e.g. Advanced Search page) */ .crm-container .listing-box, .crm-container .listing-box-tall { @@ -1231,15 +1178,6 @@ input.crm-form-entityref { content: "\00BB"; } -/* editor specific classes */ -#crm-container dd.editor { - margin-top: 0.7em; - margin-left: 0; - float: left; - vertical-align: top; - width: 58em; -} - #crm-container.clear, .crm-container .crm-group-summary .clear { /* generic container (i.e. div) for floating buttons */ @@ -1247,21 +1185,6 @@ input.crm-form-entityref { width: 100%; } -/* class for tinymce buttons display */ -#crm-container table.mceLayout td, -#crm-container table.mceLayout table { - padding: 0; - background: #EDEDED; - border: 2px solid #EDEDED; - font-size: 0; - vertical-align: top; - width: auto; -} - -#crm-container tr.mceLast { - border: 1px solid #EDEDED; -} - #location .form-layout table, #location .form-layout td, #crm-container div#location table.form-layout table.inner-table td { @@ -1469,24 +1392,6 @@ input.crm-form-entityref { background: transparent; } -/* Styles for Config Task List */ -#crm-container td.tasklist a { - font-weight: bold; -} - -#crm-container table.selector td.tasklist { - border-right: 1px solid #DDDDDD; - width: 20%; -} - -#crm-container td.tasklist a:link { - color: #FF0105; -} - -#crm-container td.tasklist a:visited { - color: green; -} - /* Styles for Actions Ribbon */ #crm-container .crm-actions-ribbon { margin: 0 0 8px 0; @@ -1886,22 +1791,12 @@ input.crm-form-entityref { margin-top: -4px; } -/* This is the style for the trigger icon. The margin-bottom value causes the icon to shift down to center it. */ -.crm-container .ui-datepicker-trigger { - margin-top: 4px; - margin-bottom: -6px; -} - .crm-container .ui-datepicker { width: 17em; padding: .2em .2em 0; z-index: 9999 !important; } -#crm-container .cke_editor { - border: 0 none; -} - /* Set/alter ICONS */ #crm-container div#printer-friendly { @@ -1960,9 +1855,6 @@ input.crm-form-entityref { } .crm-container a.button, -.crm-container a.crm-invoiceButton, -.crm-container a.crm-invoiceButton:link, -.crm-container a.crm-invoiceButton:visited, .crm-container a.button:link, .crm-container a.button:visited, .crm-container input.crm-form-submit, @@ -2012,9 +1904,6 @@ input.crm-form-entityref { } .crm-container a.button, -.crm-container a.crm-invoiceButton, -.crm-container a.crm-invoiceButton:link, -.crm-container a.crm-invoiceButton:visited, .crm-container a.button:link, .crm-container a.button:visited { display: block; @@ -2022,22 +1911,6 @@ input.crm-form-entityref { line-height: 135%; } -.crm-container a.button .crm-container a.crm-invoiceButton span { - display: block; - line-height: 14px; - padding: 2px 0; -} - -.crm-container .button .red .crm-invoiceButton{ - background-image: url(../i/icons/jquery-ui-FFFFFF.png); -} - -.crm-container a.button:active .crm-container a.crm-invoiceButton:active,{ - color: #000; - outline: none; - /* hide dotted outline in Firefox */ -} - .crm-container .crm-button:hover, .crm-container .crm-button:focus, .crm-container input[type=submit]:hover, @@ -2045,8 +1918,6 @@ input.crm-form-entityref { .crm-container .ui-dialog-buttonset .ui-button:hover, .crm-container .ui-dialog-buttonset .ui-button:focus, .crm-container a.button:hover, -.crm-container a.crm-invoiceButton:hover, -.crm-container a.crm-invoiceButton:focus, .crm-container a.button:focus { background-position: 0 -25px; } @@ -2204,9 +2075,6 @@ input.crm-form-entityref { pointer-events: none; } -.crm-container .dark-icon { - background-image: url("../bower_components/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png") -} .crm-container .delete-icon { background-position: -176px -96px; } @@ -2945,8 +2813,6 @@ tbody.scrollContent tr.alternateRow { border-bottom: 1px solid #FFF; } -#crm-container div.contactCardLeft .label, -#crm-container div.contactCardRight .label, .crm-container table.crm-info-panel .label { color: #2f2f2f; font-weight: normal; @@ -3001,18 +2867,6 @@ tbody.scrollContent tr.alternateRow { color: #3e3e3e; } -.crm-container div.contact_panel td.grouplabel { - border-bottom: 2px solid #D7D7D0 !important; -} - -#tagGroup table .label { - color: #FFF; -} -#tagGroup table { - color: #000; -} - - /* search results */ .crm-container .crm-search-tasks, .crm-container .crm-tasks { @@ -3046,8 +2900,6 @@ tbody.scrollContent tr.alternateRow { /* rounded corners */ .crm-container .crm-button, .crm-container a.button, -.crm-container a.crm-invoiceButton, -.crm-container a.crm-invoiceButton:link, .crm-container a.button:link, .crm-container input.crm-form-submit, .crm-container input[type=button] { @@ -3301,11 +3153,6 @@ div.m ul#civicrm-menu, color: #555; } -/*Needed for jstree contextmenu */ -#vakata-contextmenu.jstree-default-context li { - background: none repeat scroll 0 0 transparent; -} - /* unset the styling for the li in jstree */ #tagtree ul { list-style: none; @@ -3313,24 +3160,6 @@ div.m ul#civicrm-menu, padding: 0px; } -/* Class for successful upgrade */ -.crm-container .upgrade-success { - background-color: #00CC00; - color: white; -} - -.crm-container .extension-upgradable { - background-color: #FFFFCC !important; -} - -.crm-container .extension-installed { - background-color: #DDFFDD !important; -} - -.crm-container .extension-missing { - color: #E43D2B !important; -} - /* table row highlightng */ .crm-container table.row-highlight tr:hover, .crm-container .crm-row-selected { @@ -3343,16 +3172,6 @@ div.m ul#civicrm-menu, background-color: #fffdb2; } -#crm-container .civicrm-drupal-wysiwyg .collapsed { - background: transparent; - padding-left: 0; -} - -#manageTags { - position: static; - z-index: -100; -} - #crm-container .crm-socialnetwork { margin-top: 1em; } @@ -3905,11 +3724,6 @@ span.crm-status-icon { font-size: 15px; color: #666 !important; } -#crm-container .crm-extensions-upgrade { - background: #ffb; - border: 1px solid #000; - text-align: center; -} /* Styles for credit card payment logos */ .crm-container .credit_card_type-section .crm-credit_card_type-icons a { diff --git a/css/contactSummary.css b/css/contactSummary.css index 311fb1b4d5..bcd8a7e854 100644 --- a/css/contactSummary.css +++ b/css/contactSummary.css @@ -115,6 +115,8 @@ div#crm-contact-thumbnail { #crm-container div.contactCardLeft .label, #crm-container div.contactCardRight .label { + color: #2f2f2f; + font-weight: normal; font-size: 11px; vertical-align: top; margin-right: 10px; @@ -161,6 +163,9 @@ div#crm-contact-thumbnail { padding: 4px; width: 100%; } +.crm-container div.contact_panel td.grouplabel { + border-bottom: 2px solid #D7D7D0 !important; +} #crm-container div.contact_panel .crm-address-block { margin-bottom: 6px; @@ -338,4 +343,11 @@ div#crm-contact-thumbnail { -moz-box-sizing: border-box; float: none; width: 100%; +} + +#tagGroup table .label { + color: #FFF; +} +#tagGroup table { + color: #000; } \ No newline at end of file diff --git a/css/searchForm.css b/css/searchForm.css index abdcfcba48..9fa0195089 100644 --- a/css/searchForm.css +++ b/css/searchForm.css @@ -17,4 +17,41 @@ /* top submit button on advanced search */ .adv-search-top-submit span.crm-button { float: right !important; -} \ No newline at end of file +} + +/* alpha filter styles */ +#crm-container #alpha-filter ul { + border-collapse: collapse; + padding: 0; + list-style-type: none; + margin: 3px; + height: auto; + width: auto; +} + +.crm-container div#alpha-filter { + background-color: #CDE8FE; + margin: 4px 0 5px; + padding: 2px; + text-align: left; +} + +.crm-container #alpha-filter li { + background-color: transparent; + background-image: none; + border: none; + color: #AAAAAA; + display: inline; + font-size: 15px; + font-weight: normal; + height: auto; + margin: 0 1px; + padding: 2px 5px; + font-family: Arial, Helvetica, sans-serif; +} + +.crm-container #alpha-filter a { + border-bottom: 1px dotted #2A71B4; + color: #2A71B4; + font-weight: normal; +} diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl index 06a51b1940..d86b563100 100644 --- a/templates/CRM/common/success.tpl +++ b/templates/CRM/common/success.tpl @@ -23,7 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{* success.tpl: Display page for Upgrades. Provides complete HTML doc.*} +{* Display page for Upgrades. *} {if $config->userSystem->is_drupal neq '1'}

{$pageTitle}

{/if} -- 2.25.1