Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
310
Merge Requests
310
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
e9b40575
Commit
e9b40575
authored
May 07, 2008
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#200685
by boombatower, dvessel, et al: convert bluemarine theme to tableless layout.
parent
a3059e8c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
125 additions
and
85 deletions
+125
-85
CHANGELOG.txt
CHANGELOG.txt
+2
-0
includes/registry.test
includes/registry.test
+2
-2
themes/bluemarine/bluemarine.info
themes/bluemarine/bluemarine.info
+1
-1
themes/bluemarine/page.tpl.php
themes/bluemarine/page.tpl.php
+31
-39
themes/bluemarine/style-rtl.css
themes/bluemarine/style-rtl.css
+15
-1
themes/bluemarine/style.css
themes/bluemarine/style.css
+74
-42
No files found.
CHANGELOG.txt
View file @
e9b40575
...
...
@@ -30,6 +30,8 @@ Drupal 7.0, xxxx-xx-xx (development version)
* Modules now declare their includable files via their .info file. That
allows Drupal to scan files when a module is enabled and then lazy-load
code as needed, resulting in significant performance and memory improvements.
- Theme system:
* Converted the 'bluemarine' theme to a tableless layout.
Drupal 6.0, 2008-02-13
----------------------
...
...
includes/registry.test
View file @
e9b40575
...
...
@@ -25,7 +25,7 @@ class RegistryParseFileTestCase extends DrupalWebTestCase {
}
/**
* testRegistryParseFile
* testRegistryParseFile
*/
function
testRegistryParseFile
()
{
_registry_parse_file
(
$this
->
fileName
,
$this
->
getFileContents
());
...
...
@@ -36,7 +36,7 @@ class RegistryParseFileTestCase extends DrupalWebTestCase {
}
/**
* getFileContents
* getFileContents
*/
function
getFileContents
()
{
$file_contents
=
<<<CONTENTS
...
...
themes/bluemarine/bluemarine.info
View file @
e9b40575
; $Id$
name = Bluemarine
description = Table
-based multi-column
theme with a marine and ash color scheme.
description = Table
less
theme with a marine and ash color scheme.
version = VERSION
core = 7.x
engine = phptemplate
themes/bluemarine/page.tpl.php
View file @
e9b40575
...
...
@@ -11,53 +11,45 @@
<script
type=
"text/javascript"
>
<?php
/* Needed to avoid Flash of Unstyle Content in IE */
?>
</script>
</head>
<body>
<table
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
id=
"header"
>
<tr>
<td
id=
"logo"
>
<?php
if
(
$logo
)
{
?>
<a
href=
"
<?php
print
$front_page
?>
"
title=
"
<?php
print
t
(
'Home'
)
?>
"
><img
src=
"
<?php
print
$logo
?>
"
alt=
"
<?php
print
t
(
'Home'
)
?>
"
/></a>
<?php
}
?>
<?php
if
(
$site_name
)
{
?>
<h1
class=
'site-name'
><a
href=
"
<?php
print
$front_page
?>
"
title=
"
<?php
print
t
(
'Home'
)
?>
"
>
<?php
print
$site_name
?>
</a></h1>
<?php
}
?>
<?php
if
(
$site_slogan
)
{
?>
<div
class=
'site-slogan'
>
<?php
print
$site_slogan
?>
</div>
<?php
}
?>
</td>
<td
id=
"menu"
>
<?php
if
(
isset
(
$secondary_links
))
{
?><?php
print
theme
(
'links'
,
$secondary_links
,
array
(
'class'
=>
'links'
,
'id'
=>
'subnavlist'
))
?><?php
}
?>
<body
class=
"
<?php
print
$body_classes
;
?>
"
>
<div
id=
"header"
class=
"clear-block"
>
<?php
if
(
$search_box
)
{
?>
<div
class=
"search-box"
>
<?php
print
$search_box
?>
</div>
<?php
};
?>
<?php
if
(
$logo
)
{
?>
<a
class=
"logo"
href=
"
<?php
print
$front_page
?>
"
title=
"
<?php
print
t
(
'Home'
)
?>
"
><img
src=
"
<?php
print
$logo
?>
"
alt=
"
<?php
print
t
(
'Home'
)
?>
"
/></a>
<?php
}
?>
<?php
if
(
$site_name
)
{
?>
<h1
class=
'site-name'
><a
href=
"
<?php
print
$front_page
?>
"
title=
"
<?php
print
t
(
'Home'
)
?>
"
>
<?php
print
$site_name
?>
</a></h1>
<?php
};
?>
<?php
if
(
$site_slogan
)
{
?>
<div
class=
'site-slogan'
>
<?php
print
$site_slogan
?>
</div>
<?php
}
?>
<div
id=
"menu"
>
<?php
if
(
isset
(
$secondary_links
))
{
?><?php
print
theme
(
'links'
,
$secondary_links
,
array
(
'class'
=>
'links'
,
'id'
=>
'subnavlist'
));
?><?php
}
?>
<?php
if
(
isset
(
$primary_links
))
{
?><?php
print
theme
(
'links'
,
$primary_links
,
array
(
'class'
=>
'links'
,
'id'
=>
'navlist'
))
?><?php
}
?>
<?php
print
$search_box
?>
</td>
</tr>
<tr>
<td
colspan=
"2"
><div>
<?php
print
$header
?>
</div></td>
</tr>
</table>
<table
border=
"0"
cellpadding=
"0"
cellspacing=
"0"
id=
"content"
>
<tr>
<?php
if
(
$left
)
{
?>
<td
id=
"sidebar-left"
>
<?php
print
$left
?>
</td>
<?php
}
?>
<td
valign=
"top"
>
</div>
<div
id=
"header-region"
>
<?php
print
$header
?>
</div>
</div>
<div
class=
"layout-columns"
>
<?php
if
(
$left
)
{
?>
<div
id=
"sidebar-left"
class=
"column"
>
<?php
print
$left
?>
</div>
<?php
}
?>
<div
id=
"main"
class=
"column"
>
<?php
if
(
$mission
)
{
?>
<div
id=
"mission"
>
<?php
print
$mission
?>
</div>
<?php
}
?>
<div
id=
"main
"
>
<div
class=
"inner
"
>
<?php
print
$breadcrumb
?>
<h1
class=
"title"
>
<?php
print
$title
?>
</h1>
<div
class=
"tabs"
>
<?php
print
$tabs
?>
</div>
<?php
if
(
$show_messages
)
{
print
$messages
;
}
?>
<?php
if
(
$tabs
)
{
?>
<div
class=
"tabs"
>
<?php
print
$tabs
?>
</div>
<?php
}
?>
<?php
print
$help
?>
<?php
if
(
$show_messages
)
{
print
$messages
;
}
?>
<?php
print
$content
;
?>
<?php
print
$feed_icons
;
?>
</div>
</td>
<?php
if
(
$right
)
{
?>
<td
id=
"sidebar-right"
>
<?php
print
$right
?>
</td>
<?php
}
?>
</tr>
</table>
<div
id=
"footer"
>
<?php
print
$footer_message
?>
<?php
print
$footer
?>
</div>
</div>
<?php
if
(
$right
)
{
?>
<div
id=
"sidebar-right"
class=
"column"
>
<?php
print
$right
?>
</div>
<?php
}
?>
</div>
<div
id=
"footer"
>
<?php
print
$footer_message
?>
<?php
print
$footer
?>
</div>
<?php
print
$closure
?>
</body>
</html>
themes/bluemarine/style-rtl.css
View file @
e9b40575
...
...
@@ -2,9 +2,22 @@
body
{
direction
:
rtl
;
}
#logo
img
{
.layout-columns
.column
{
float
:
right
;
}
#sidebar-left
,
#sidebar-right
{
margin-right
:
0
;
margin-left
:
-18em
;
}
#sidebar-left
{
right
:
-18em
;
}
.logo
{
float
:
right
;
}
.search-box
{
float
:
left
;
/* LTR */
}
#menu
{
padding
:
0.5em
0.5em
0
0.5em
;
text-align
:
left
;
...
...
@@ -15,6 +28,7 @@ body {
#subnavlist
{
padding
:
0.5em
0
0.4em
1.2em
;
}
ul
.links
li
{
border-right
:
1px
solid
#9cf
;
border-left
:
none
;
...
...
themes/bluemarine/style.css
View file @
e9b40575
...
...
@@ -52,10 +52,6 @@ pre {
font-size
:
12px
;
border
:
1px
solid
#ddd
;
}
table
{
/* make <td> sizes relative to body size! */
font-size
:
1em
;
}
.form-item
label
{
font-size
:
1em
;
color
:
#222
;
...
...
@@ -74,29 +70,94 @@ table {
/*
** Page layout blocks / IDs
*/
#header
,
#content
{
body
{
min-width
:
56em
;
/* Background color needed to fill the sidebars for the length of the page. */
background-color
:
#ddd
;
}
.layout-columns
{
padding
:
0
18em
;
}
.sidebar-left
.layout-columns
{
padding-right
:
0
;
}
.sidebar-right
.layout-columns
{
padding-left
:
0
;
}
.layout-columns
.column
{
position
:
relative
;
float
:
left
;
/* LTR */
}
#main
{
width
:
100%
;
background-color
:
#fff
;
}
#main
.inner
{
padding
:
1em
1.5em
3em
1.5em
;
}
#sidebar-left
,
#sidebar-right
{
width
:
16em
;
padding
:
1em
;
margin-right
:
-18em
;
/* LTR */
background-color
:
#ddd
;
}
#sidebar-left
{
right
:
18em
;
/* LTR */
}
#header
{
padding
:
.2em
;
background-color
:
#69c
;
}
#logo
{
vertical-align
:
middle
;
border
:
0
;
}
#logo
img
{
.logo
{
float
:
left
;
/* LTR */
padding
:
0
1em
;
border
:
0
;
}
.site-name
{
margin
:
0.6em
0
0
;
font-size
:
2em
;
white-space
:
nowrap
;
}
.site-name
a
:link
,
.site-name
a
:visited
{
color
:
#fff
;
}
.site-name
a
:hover
{
color
:
#369
;
text-decoration
:
none
;
}
.site-slogan
{
font-size
:
1em
;
color
:
#eee
;
display
:
block
;
margin
:
0
;
font-style
:
italic
;
font-weight
:
bold
;
}
.search-box
{
float
:
right
;
/* LTR */
margin
:
1em
;
}
#menu
{
padding
:
0.5em
0.5em
0
0.5em
;
/* LTR */
text-align
:
right
;
/* LTR */
vertical-align
:
middle
;
}
#header-region
{
clear
:
both
;
}
#navlist
{
font-size
:
1.0em
;
padding
:
0
0.8em
1.2
em
0
;
/* LTR */
padding
:
0
0.8em
0.5
em
0
;
/* LTR */
color
:
#9cf
;
}
#navlist
a
{
...
...
@@ -137,30 +198,6 @@ ul.links li.first {
color
:
#9cf
;
font-weight
:
bold
;
}
.site-name
{
margin
:
0.6em
0
0
;
padding
:
0
;
font-size
:
2em
;
}
.site-name
a
:link
,
.site-name
a
:visited
{
color
:
#fff
;
}
.site-name
a
:hover
{
color
:
#369
;
text-decoration
:
none
;
}
.site-slogan
{
font-size
:
1em
;
color
:
#eee
;
display
:
block
;
margin
:
0
;
font-style
:
italic
;
font-weight
:
bold
;
}
#main
{
/* padding in px not ex because IE messes up 100% width tables otherwise */
padding
:
10px
;
}
#mission
,
.node
.content
,
.comment
.content
{
line-height
:
1.4em
;
}
...
...
@@ -180,17 +217,12 @@ ul.links li.first {
.error
{
border-color
:
red
;
}
#sidebar-left
,
#sidebar-right
{
background-color
:
#ddd
;
width
:
16em
;
/* padding in px not ex because IE messes up 100% width tables otherwise */
padding
:
10px
;
vertical-align
:
top
;
}
#footer
{
background-color
:
#eee
;
padding
:
1em
;
font-size
:
0.8em
;
clear
:
both
;
}
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment