Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
valencia
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
9
Issues
9
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gruppo Web
valencia
Commits
30f734c9
Commit
30f734c9
authored
May 03, 2014
by
Mattia Migliorini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use mixin for calculating logo font-size.
Add search form. Needs styling
parent
04e33a34
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
7 deletions
+24
-7
css/style.css
css/style.css
+1
-1
sass/style.scss
sass/style.scss
+14
-3
tpl/page.tpl.php
tpl/page.tpl.php
+9
-3
No files found.
css/style.css
View file @
30f734c9
@import
url(http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,400italic)
;
.logo
{
position
:
absolute
;
top
:
0
;
left
:
0
;
z-index
:
10
}
body
.toolbar
.logo
{
top
:
30px
}
header
.banner
{
margin-bottom
:
0
}
header
.banner.inverse
{
background
:
#f7f7f7
;
margin-bottom
:
20px
;
margin-top
:
-3px
}
header
.banner.inverse
.nav-primary
ul
{
border-color
:
#fff
}
header
.banner.inverse
.nav-primary
ul
li
,
header
.banner.inverse
.nav-primary
ul
li
:last-child
{
border-color
:
#eaeaea
}
header
.banner.inverse
.nav-primary
ul
li
a
:link
,
header
.banner.inverse
.nav-primary
ul
li
a
:visited
{
border-color
:
#fff
;
color
:
#978e83
}
header
.banner.inverse
.nav-primary
ul
li
a
:hover
{
background
:
#eaeaea
;
color
:
#454545
}
header
.banner.inverse
.nav-primary
a
.active
,
header
.banner.inverse
.nav-primary
a
:active
{
border-color
:
#eaeaea
;
background
:
#eaeaea
}
header
.banner
.site-name
{
float
:
right
}
header
.banner
.site-name
.logo-ubuntuit
{
font-size
:
36px
;
line-height
:
48px
;
margin-bottom
:
0
;
position
:
relative
;
text-transform
:
lowercase
;
margin
:
0
;
display
:
inline-block
;
margin-left
:
20px
}
@import
url(http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,400italic)
;
::selection
{
background
:
#ed6637
}
a
::selection
,
a
*
::selection
{
background
:
#77216f
}
.logo
{
position
:
absolute
;
top
:
0
;
left
:
0
;
z-index
:
10
}
body
.toolbar
.logo
{
top
:
30px
}
header
.banner
{
margin-bottom
:
0
}
header
.banner.inverted
{
background
:
#f7f7f7
;
margin-bottom
:
20px
;
margin-top
:
-3px
}
header
.banner.inverted
.nav-primary
ul
{
border-color
:
#fff
}
header
.banner.inverted
.nav-primary
ul
li
,
header
.banner.inverted
.nav-primary
ul
li
:last-child
{
border-color
:
#eaeaea
}
header
.banner.inverted
.nav-primary
ul
li
a
:link
,
header
.banner.inverted
.nav-primary
ul
li
a
:visited
{
border-color
:
#fff
;
color
:
#978e83
}
header
.banner.inverted
.nav-primary
ul
li
a
:hover
{
background
:
#eaeaea
;
color
:
#454545
}
header
.banner.inverted
.nav-primary
a
.active
,
header
.banner.inverted
.nav-primary
a
:active
{
border-color
:
#eaeaea
;
background
:
#eaeaea
}
header
.banner
.site-name
{
float
:
right
}
header
.banner
.site-name
.logo-ubuntuit
{
font-size
:
2.25em
;
margin-bottom
:
0.33333em
;
margin-bottom
:
0
;
position
:
relative
;
text-transform
:
lowercase
;
margin
:
0
;
display
:
inline-block
;
margin-left
:
20px
}
sass/style.scss
View file @
30f734c9
@import
'core/core-constants.scss'
;
@import
'core/core-constants.scss'
;
@import
'core/core-mixins.scss'
;
@import
url(http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,400italic)
;
@import
url(http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,400italic)
;
// Override default text selection color
::selection
{
background
:lighten
(
$
ubuntu_orange
,
10
%
)
;
}
a
{
&
:
:
selection
,
&
*::
selection
{
background
:
$light_aubergine
;
}
}
.logo
{
.logo
{
position
:absolute
;
position
:absolute
;
top
:
0
;
top
:
0
;
...
@@ -15,7 +27,7 @@
...
@@ -15,7 +27,7 @@
header
.banner
{
header
.banner
{
margin-bottom
:
0
;
margin-bottom
:
0
;
&
.inver
se
{
&
.inver
ted
{
background
:
$light_grey
;
background
:
$light_grey
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
margin-top
:
-3px
;
// Ugly fix for gap between navbar
margin-top
:
-3px
;
// Ugly fix for gap between navbar
...
@@ -54,8 +66,7 @@ header.banner {
...
@@ -54,8 +66,7 @@ header.banner {
.site-name
{
.site-name
{
float
:right
;
float
:right
;
.logo-ubuntuit
{
.logo-ubuntuit
{
font-size
:
36px
;
@include
font_size
(
36
);
line-height
:
48px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
position
:relative
;
position
:relative
;
text-transform
:lowercase
;
text-transform
:lowercase
;
...
...
tpl/page.tpl.php
View file @
30f734c9
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
*/
*/
?>
?>
<?php
if
(
!
$logo
)
:
?>
<?php
if
(
$logo
)
:
?>
<div
class=
"logo"
>
<div
class=
"logo"
>
<a
class=
"logo-ubuntu"
href=
"
<?php
print
$front_page
;
?>
"
title=
"
<?php
print
t
(
'Home'
);
?>
"
rel=
"home"
id=
"logo"
>
<a
class=
"logo-ubuntu"
href=
"
<?php
print
$front_page
;
?>
"
title=
"
<?php
print
t
(
'Home'
);
?>
"
rel=
"home"
id=
"logo"
>
<img
src=
"
<?php
print
$logo
;
?>
"
width=
"134"
height=
"96"
alt=
"
<?php
print
t
(
'Home'
);
?>
"
>
<img
src=
"
<?php
print
$logo
;
?>
"
width=
"134"
height=
"96"
alt=
"
<?php
print
t
(
'Home'
);
?>
"
>
...
@@ -97,11 +97,17 @@
...
@@ -97,11 +97,17 @@
<?php
endif
;
?>
<?php
endif
;
?>
</nav>
</nav>
</header>
</header>
<header
class=
"banner global inver
se
"
role=
"banner"
>
<header
class=
"banner global inver
ted
"
role=
"banner"
>
<nav
class=
"nav-primary"
role=
"navigation"
>
<nav
class=
"nav-primary
nav-left
"
role=
"navigation"
>
<ul>
<ul>
<li><a
href=
"#"
>
Somewhere
</a></li>
<li><a
href=
"#"
>
Somewhere
</a></li>
</ul>
</ul>
<form
action=
"/search"
id=
"google-appliance-search-form"
class=
"header-search"
>
<input
type=
"search"
maxlength=
"255"
name=
"s"
id=
"edit-keys"
class=
"form-text"
placeholder=
"Search…"
value=
""
/>
<button
type=
"submit"
>
<img
src=
"http://assets.ubuntu.com/sites/ubuntu/1044/u/img/search-white.svg"
alt=
"Search"
height=
"28"
/>
</button>
</form>
</nav>
</nav>
</header>
</header>
...
...
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