projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 52c2410)
CRM-12578 - Cleanup references to unused stylesheets
authorColeman Watts <coleman@civicrm.org>
Tue, 17 Dec 2013 23:28:56 +0000 (15:28 -0800)
committerColeman Watts <coleman@civicrm.org>
Tue, 17 Dec 2013 23:28:56 +0000 (15:28 -0800)
templates/CRM/common/commonCSS.tpl patch | blob | blame | history
templates/CRM/common/fatal.tpl patch | blob | blame | history
templates/CRM/common/wordpress.tpl patch | blob | blame | history

diff --git a/templates/CRM/common/commonCSS.tpl b/templates/CRM/common/commonCSS.tpl
index 829514068147e4deeff71e502d8977d8aa9c5c49..697cc91ab6bfb0edbc53e296241299807184bf79 100644 (file)
--- a/templates/CRM/common/commonCSS.tpl
+++ b/templates/CRM/common/commonCSS.tpl
@@ -27,12 +27,9 @@
   {if $config->customCSSURL}
     <link rel="stylesheet" href="{$config->customCSSURL}" type="text/css" />
   {else}
-    <link rel="stylesheet" href="{$config->resourceBase}css/deprecate.css" type="text/css" />
     <link rel="stylesheet" href="{$config->resourceBase}css/civicrm.css" type="text/css" />
-    <link rel="stylesheet" href="{$config->resourceBase}css/extras.css" type="text/css" />
   {/if}
 {elseif $config->userFramework eq 'Joomla'}
-  <link rel="stylesheet" href="{$config->resourceBase}css/deprecate.css" type="text/css" />
   <link rel="stylesheet" href="{$config->resourceBase}css/civicrm.css" type="text/css" />
   {if !$config->userFrameworkFrontend}
     <link rel="stylesheet" href="{$config->resourceBase}css/joomla.css" type="text/css" />
@@ -42,5 +39,4 @@
   {if $config->customCSSURL}
     <link rel="stylesheet" href="{$config->customCSSURL}" type="text/css" />
   {/if}
-  <link rel="stylesheet" href="{$config->resourceBase}css/extras.css" type="text/css" />
 {/if}
diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl
index 60f343b45126ecc1ae91e478699a0cf07563c350..a555a88bd9064cd65da26342f5f55e9c40ab9546 100644 (file)
--- a/templates/CRM/common/fatal.tpl
+++ b/templates/CRM/common/fatal.tpl
@@ -33,14 +33,12 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <base href="{$config->resourceBase}" />
   <style type="text/css" media="screen">@import url({$config->resourceBase}css/civicrm.css);</style>
-  <style type="text/css" media="screen">@import url({$config->resourceBase}css/extras.css);</style>
 </head>
 <body>
 <div id="crm-container" class="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
 {else}
 <div id="crm-container" class="crm-container" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
   <style type="text/css" media="screen">@import url({$config->resourceBase}css/civicrm.css);</style>
-  <style type="text/css" media="screen">@import url({$config->resourceBase}css/extras.css);</style>
 {/if}
 <div class="messages status no-popup">  <div class="icon red-icon alert-icon"></div>
  <span class="status-fatal">{ts}Sorry but we are not able to provide this at the moment.{/ts}</span>
diff --git a/templates/CRM/common/wordpress.tpl b/templates/CRM/common/wordpress.tpl
index f78a8569acd8c4ac6a620cf8cedc6fa9fa7da527..091af8890a4fcdd6e1c1edf15a5c71f8741645a4 100644 (file)
--- a/templates/CRM/common/wordpress.tpl
+++ b/templates/CRM/common/wordpress.tpl
@@ -29,26 +29,6 @@
 
 <div id="crm-container" class="crm-container{if $urlIsPublic} crm-public{/if}" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
 
-{* we should uncomment below code only when we are experimenting with new css for specific pages and comment css inclusion in civicrm.module*}
-{*if $config->customCSSURL}
-    <link rel="stylesheet" href="{$config->customCSSURL}" type="text/css" />
-{else}
-    {assign var="revamp" value=0}
-    {foreach from=$config->revampPages item=page}
-        {if $page eq $tplFile}
-            {assign var="revamp" value=1}
-        {/if}
-    {/foreach}
-
-    {if $revamp eq 0}
-        <link rel="stylesheet" href="{$config->resourceBase}css/civicrm.css" type="text/css" />
-    {else}
-        <link rel="stylesheet" href="{$config->resourceBase}css/civicrm-new.css" type="text/css" />
-    {/if}
-    <link rel="stylesheet" href="{$config->resourceBase}css/extras.css" type="text/css" />
-{/if*}
-
-
 {crmNavigationMenu is_default=1}
 
 {if $breadcrumb}