Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F785355
default
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Wed, Feb 12, 9:18 AM
Size
9 KB
Mime Type
text/x-diff
Expires
Fri, Feb 14, 9:18 AM (1 d, 4 h)
Engine
blob
Format
Raw Data
Handle
564390
Attached To
rTDEF Themes.Default
default
View Options
Index: branches/5.1.x/inc/styles.css
===================================================================
--- branches/5.1.x/inc/styles.css (revision 13554)
+++ branches/5.1.x/inc/styles.css (revision 13555)
@@ -1,272 +1,272 @@
/* Basic Blocks
*******************************************************************************/
body {
background: #fff url('@templates_base@/img/bg_header_new.jpg') no-repeat 50% 0;
color: #000;
font: 0.75em/1.333em Sans-Serif,Arial,Tahoma,Verdana;
min-width: 800px;
}
img { border: 0; }
table { border-collapse: collapse; border-spacing: 0; }
td { padding: 0; vertical-align: top; }
a, a:hover { color: #0066CC; outline: none; text-decoration: none; }
a:hover { text-decoration: underline; }
.clear { clear: both !important; }
.fix { border: 1px solid #f00; }
/* Layout
*******************************************************************************/
#wrapper.inner {
background: url('@templates_base@/img/bg_inner_lines.gif') repeat-x 0 100%;
}
#wrapper .title_system {
color: #fff;
font-size: 0.833em;
line-height: 17px;
padding: 0 30px 0 0;
text-align: right;
}
/* Header
*******************************************************************************/
#header {
margin: 0 auto;
height: 162px;
/* height: 207px;*/
width: 763px;
}
#header h1.logo {
float: left;
height: 77px;
margin-top: 31px;
padding: 0 0 0 17px;
width: 480px;
}
#header h1.logo a {
background: url('@templates_base@/img/logo_xyz.gif') no-repeat 0 0;
color: #CF0;
display: block;
font-family: sans-serif;
font-size: 3.2em;
height: 47px;
padding: 30px 0 0 83px;
width: 450px;
}
#header h1.logo a:hover { text-decoration: none; }
#header .slogan {
color: #FFF;
float: right;
font-family: Georgia,serif;
font-size: 1.25em;
font-style: italic;
font-weight: bold;
padding: 54px 0 0 0;
text-align: right;
width: 245px;
}
/*** Menu ***/
#menu {
- background: url('@templates_base@/img/menu/top_sup_menju.gif') repeat-x 0 100%;
+ background: url('@templates_base@/img/menu/top_sup_menu.gif') repeat-x 0 100%;
height: 76px;
}
#menu ul {
margin: 0 auto;
padding: 3px 0 0 0;
width: 770px;
}
#menu li {
background: url('@templates_base@/img/menu/nav_rcorn.jpg') no-repeat 100% 0;
display: inline-block;
float: left;
padding: 0 26px 0 0;
_width: 1%;
}
#menu li a {
background: url('@templates_base@/img/menu/arr_nav.gif') no-repeat 0 0;
color: #fff;
font-family: sans-serif;
font-size: 1.25em;
line-height: 39px;
padding: 0 8px 0 24px;
_background: none;
_white-space: nowrap;
}
#menu li a:hover {
color: #000;
text-decoration: none;
}
#menu li .first {
background: url('@templates_base@/img/menu/nav_1lcorn.jpg') no-repeat 0 0;
display: block;
height: 39px;
padding: 0 0 0 26px;
}
#menu li.last { background: url('@templates_base@/img/menu/nav_last_rcorn.gif') no-repeat 100% 0; }
#menu li.last.active { background: url('@templates_base@/img/menu/nav_last_rcorn_a.gif') no-repeat 100% 0; }
#menu li.active { background: url('@templates_base@/img/menu/nav_1rcorn_a.jpg') no-repeat 100% 0; }
#menu li.active .first { background: url('@templates_base@/img/menu/nav_1lcorn_a.jpg') no-repeat 0 0; }
#menu li.beforeactive { background: url('@templates_base@/img/menu/nav_lcorn_a.jpg') no-repeat 100% 0; }
#menu li.active a {
background: url('@templates_base@/img/menu/arr_nav_a.gif') no-repeat 0 0;
color: #000;
_background: none;
}
/* Content
*******************************************************************************/
#content {
margin: 0 auto;
width: 763px;
}
#content h2 {
color: #BFBFBF;
font-family: 'Arial Narrow', Arial,sans-serif;
font-size: 2.833em;
font-weight: normal;
padding: 15px 0 18px 40px;
}
#content h4 {
color: #88AA00;
font-family: arial,sans-serif;
font-size: 1.167em;
font-weight: bold;
}
#content .column-text {
float: left;
padding: 0 40px;
width: 410px;
}
#content .column-text p,
#content .text p { padding: 0 0 10px 0; }
#content .column-right {
float: right;
width: 270px;
}
#content .text { padding: 0 40px 130px 40px; }
#content .text.about { background: url('@templates_base@/img/sections/about_pic.jpg') no-repeat 50% 100%; }
#content .text.services { background: url('@templates_base@/img/sections/services_pic.jpg') no-repeat 50% 100%; }
#content .text.products { background: url('@templates_base@/img/sections/products_pic.jpg') no-repeat 50% 100%; }
#content .text.contacts { background: url('@templates_base@/img/sections/contacts_pic.jpg') no-repeat 50% 100%; }
/*** News ***/
.block-news h3 {
background: #4F739F url('@templates_base@/img/bg_news_shade.gif') repeat-x 0 0;
padding: 13px 6px 0;
}
.block-news h3 img { margin-bottom: -3px; }
.block-news dl { background: #DCE4F1 url('@templates_base@/img/bg_right_colmn.gif') repeat-y 0 0; }
.block-news dl dt {
background: url('@templates_base@/img/pix_news.gif') no-repeat 0 15px;
color: #0066CC;
font-weight: bold;
margin: 0 0 0 6px;
padding: 10px 10px 0 34px;
}
.block-news dl dd {
font-size: 0.833em;
line-height: auto;
margin: 0 0 0 6px;
padding: 0 10px 5px 34px;
}
.block-promo { background: #fff url('@templates_base@/img/bg_promo.jpg') repeat-x 0 27px; }
.block-promo h3 {
background: #DDF47F url('@templates_base@/img/bg_promo_shade.gif') repeat-x 0 0;
padding: 7px 6px 0;
}
.block-promo h3 img { margin-bottom: -4px; }
.block-promo dl { background: url('@templates_base@/img/bg_promo_fade.jpg') no-repeat 0 0; }
.block-promo dl dt {
background: url('@templates_base@/img/pix_promo.gif') no-repeat 0 15px;
color: #006600;
font-weight: bold;
margin: 0 0 0 6px;
padding: 10px 10px 0 34px;
}
.block-promo dl dd {
font-size: 0.833em;
line-height: auto;
margin: 0 0 0 6px;
padding: 0 10px 5px 34px;
}
/*** Contacts ***/
.contacts-block .address {
float: left;
padding: 0 20px 0 0;
width: 200px;
}
.contacts-block .contacts-form {
float: left;
width: 410px;
}
.contacts-block .contacts-form .note { color: #777; font-size: 0.917em; }
.contacts-block .contacts-form .red { color: red; }
.contacts-block .contacts-form .bg-contacts { background: url('@templates_base@/img/bg-contacts.png') repeat-y 0 0; margin: 0 0 30px 0; }
.contacts-block .contacts-form .bg-contacts-up { background: url('@templates_base@/img/bg-contacts-up.png') no-repeat 0 0; }
.contacts-block .contacts-form .bg-contacts-down { background: url('@templates_base@/img/bg-contacts-down.png') no-repeat 0 100%; padding: 15px 10px; }
.contacts-block .contacts-form .bg-contacts p { clear: both; float: left; width: 100%; }
.contacts-block .contacts-form .bg-contacts label { float: left; width: 120px; padding: 0 5px 0 0; }
.contacts-block .contacts-form .bg-contacts em { float: left; width: 215px; }
.contacts-block .contacts-form .bg-contacts em .field,
.contacts-block .contacts-form .bg-contacts em .fieldselect,
.contacts-block .contacts-form .bg-contacts em .fieldtextarea {
border-color: #000000 #B2B2B2 #B2B2B2 #000000;
border-width: 1px;
font-family: arial,sans-serif;
font-size: 1em;
width: 220px;
}
.contacts-block .contacts-form .bg-contacts em .fieldtextarea { height: 100px; }
#content .contacts-block .contacts-form .bg-contacts p.button {
padding: 0 0 10px 125px;
width: 220px;
}
#content .contacts-block .contacts-form .bg-contacts p.button input {
background-color: #CCFF00;
border-color: #8EB200 #000000 #000000 #8EB200;
border-width: 1px;
color: #000;
font-family: arial,sans-serif;
font-size: 1em;
height: 19px;
}
#content .contacts-block .contacts-form .bg-contacts p.button input.submit {
float: right;
}
/* Footer
*******************************************************************************/
#footer {
background: url('@templates_base@/img/bg_footer_left.jpg') repeat-x 0 0;
margin-top: 20px;
overflow: hidden;
}
#footer .footer-bg { background: url('@templates_base@/img/bg_footer.jpg') no-repeat 0 0; }
#footer .footer-center {
font-size: 0.833em;
height: 54px;
line-height: 54px;
margin: 0 auto;
width: 763px;
}
#footer .copy { color: #fff; float: left; }
#footer .powered a {
color: #fff;
float: right;
margin-right: 10px;
}
#footer .powered img { margin: 6px 0; }
/* CMS Related styles - used to clean up the look for Admin
*******************************************************************************/
div.cms-btn-content { padding: 0 !important; }
div.cms-section-properties-btn-container { margin: 0 !important; border: 0 !important; }
\ No newline at end of file
Index: branches/5.1.x/elements/tracking.elm.tpl
===================================================================
--- branches/5.1.x/elements/tracking.elm.tpl (revision 13554)
+++ branches/5.1.x/elements/tracking.elm.tpl (revision 13555)
@@ -1,7 +1,3 @@
<!-- Tracking Code Starts-->
-<inp2:m_if check="c.current_Field" name="IndexTools">
- <inp2:c.current_Field name="IndexTools"/>
-<inp2:m_else/>
- <inp2:m_GetConfig name="TrackingCode"/>
-</inp2:m_if>
-<!-- Tracking Code Ends -->
+<inp2:st_PageInfo type="tracking"/>
+<!-- Tracking Code Ends -->
\ No newline at end of file
Index: branches/5.1.x
===================================================================
--- branches/5.1.x (revision 13554)
+++ branches/5.1.x (revision 13555)
Property changes on: branches/5.1.x
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+(?:[Bb]ugs?|[Ii]ssues?|[Rr]eports?|[Ff]ixe?s?|[Rr]esolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://tracker.in-portal.org/view.php?id=%BUGID%
\ No newline at end of property
Added: bugtraq:warnifnoissue
## -0,0 +1 ##
+false
\ No newline at end of property
Modified: svn:mergeinfo
## -0,0 +0,2 ##
Merged /themes/default/branches/5.0.x:r13046-13501
Merged /themes/default/releases/5.0.1:r13502-13554
Event Timeline
Log In to Comment