Skip to content

valencia
valencia
Commit 99080ceb authored by Pietro Albini's avatar Pietro Albini
Browse files
Options

A consistent indentation isn't such a bad thing...

parent dd5f9e65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 448 additions and 439 deletions
sass/_classes.scss
View file @ 99080ceb
......@@ -3,23 +3,23 @@
//--------------------------------------------------
.page-description {
background: none repeat scroll 0 0 $light-grey;
border: 1px solid $warm-grey;
padding: em-calc(10 10 12);
@include rounded-corners;
@include font-size;
line-height: em-calc(22);
background: none repeat scroll 0 0 $light-grey;
border: 1px solid $warm-grey;
padding: em-calc(10 10 12);
@include rounded-corners;
@include font-size;
line-height: em-calc(22);
}
.middleinfo {
padding: em-calc(8);
margin-bottom: em-calc(6);
@include rounded-corners;
padding: em-calc(8);
margin-bottom: em-calc(6);
@include rounded-corners;
&.gray {
background: $warm-grey;
border: 1px solid $light-grey;
}
&.gray {
background: $warm-grey;
border: 1px solid $light-grey;
}
}
//--------------------------------------------------
......
sass/_functions.scss
View file @ 99080ceb
......@@ -4,16 +4,16 @@
// Strip unit.
@function strip-unit( $num ) {
@return $num / ($num * 0 + 1);
@return $num / ($num * 0 + 1);
}
// Convert to em.
@function convert-to-em( $value ) {
$value: strip-unit( $value ) / strip-unit( $em-base ) * 1em;
@if ( $value == 0em ) {
$value: 0; // Turn 0em to 0
}
@return $value;
$value: strip-unit( $value ) / strip-unit( $em-base ) * 1em;
@if ( $value == 0em ) {
$value: 0; // Turn 0em to 0
}
@return $value;
}
//--------------------------------------------------
......@@ -32,15 +32,15 @@
//--------------------------------------------------
@function em-calc($values) {
$max: length($values);
$max: length($values);
@if $max == 1 {
@return convert-to-em( nth( $values, 1 ) );
}
@if $max == 1 {
@return convert-to-em( nth( $values, 1 ) );
}
$em-values: ();
@for $i from 1 through $max {
$em-values: append( $em-values, convert-to-em( nth( $values, $i ) ) );
}
@return $em-values;
$em-values: ();
@for $i from 1 through $max {
$em-values: append( $em-values, convert-to-em( nth( $values, $i ) ) );
}
@return $em-values;
}
\ No newline at end of file
sass/_mixins.scss
View file @ 99080ceb
......@@ -5,24 +5,24 @@
*/
@mixin transition($transition: all .5s) {
-webkit-transition:$transition;
-moz-transition:$transition;
transition:$transition;
-webkit-transition:$transition;
-moz-transition:$transition;
transition:$transition;
}
@mixin placeholder($color) {
&::-webkit-input-placeholder {
color: $color;
}
&:-moz-placeholder { // Firefox 18-
color: $color;
}
&::-moz-placeholder { // Firefox 19+
color: $color;
}
&:-ms-input-placeholder {
color: $color;
}
&::-webkit-input-placeholder {
color: $color;
}
&:-moz-placeholder { // Firefox 18-
color: $color;
}
&::-moz-placeholder { // Firefox 19+
color: $color;
}
&:-ms-input-placeholder {
color: $color;
}
}
@mixin box-shadow($shadow) {
......
sass/style.scss
View file @ 99080ceb
......@@ -8,13 +8,13 @@
// Override default text selection color
::selection {
background:lighten($ubuntu-orange, 10%);
background:lighten($ubuntu-orange, 10%);
}
a {
&::selection,
& *::selection {
background:$warm-grey;
}
&::selection,
& *::selection {
background:$warm-grey;
}
}
// Remove unwanted "x"es from search box (webkit and ie)
......@@ -26,14 +26,14 @@ input[type="search"]::-webkit-search-results-button,
input[type="search"]::-webkit-search-results-decoration { display: none; }
.logo {
position:absolute;
top:0;
left:0;
z-index:10;
position:absolute;
top:0;
left:0;
z-index:10;
body.toolbar & {
top:30px;
}
body.toolbar & {
top:30px;
}
}
// Custom background for community pages
......@@ -42,7 +42,7 @@ body.node-type-community-page {
}
header.banner {
margin-bottom:0;
margin-bottom:0;
.nav-primary {
ul {
li {
......@@ -52,94 +52,94 @@ header.banner {
}
}
&.inverted {
background: $light-grey;
margin-bottom:20px;
margin-top:-4px; // Ugly fix for gap between navbar
&.inverted {
background: $light-grey;
margin-bottom:20px;
margin-top:-4px; // Ugly fix for gap between navbar
.nav-primary {
ul {
border-color:lighten($light-grey, 10%);
margin-top:1px;
.nav-primary {
ul {
border-color:lighten($light-grey, 10%);
margin-top:1px;
li {
&, &:last-child {
border-color:darken($light-grey, 5%);
}
a {
&:link,
&:visited {
border-color:lighten($light-grey, 7%);
color:darken($warm-grey, 10%);
}
&:hover {
background:darken($light-grey, 5%);
color:lighten($cool-grey, 7%);
}
}
}
}
a {
&.active,
&:active {
border-color:darken($light-grey, 5%);
background:darken($light-grey, 5%);
}
}
}
li {
&, &:last-child {
border-color:darken($light-grey, 5%);
}
a {
&:link,
&:visited {
border-color:lighten($light-grey, 7%);
color:darken($warm-grey, 10%);
}
&:hover {
background:darken($light-grey, 5%);
color:lighten($cool-grey, 7%);
}
}
}
}
a {
&.active,
&:active {
border-color:darken($light-grey, 5%);
background:darken($light-grey, 5%);
}
}
}
.header-search {
overflow:hidden;
// padding:7px 0 7px 14px;
max-width:240px;
float:right;
.header-search {
overflow:hidden;
// padding:7px 0 7px 14px;
max-width:240px;
float:right;
input[type="search"] {
@include box-sizing(border-box);
-webkit-appearance:none;
float:left;
display:block;
@include font-size(16);
height:2.1em;
@include rounded-corners(4px);
width:100%;
border:none;
margin-bottom:0;
background-color: rgba(0, 0, 0, 0);
@include box-shadow(inset 0 1px 4px rgba(0,0,0,.2));
@include transition(); // Use defaults
padding:.5em 2.5em .5em .5em;
color:#555;
input[type="search"] {
@include box-sizing(border-box);
-webkit-appearance:none;
float:left;
display:block;
@include font-size(16);
height:2.1em;
@include rounded-corners(4px);
width:100%;
border:none;
margin-bottom:0;
background-color: rgba(0, 0, 0, 0);
@include box-shadow(inset 0 1px 4px rgba(0,0,0,.2));
@include transition(); // Use defaults
padding:.5em 2.5em .5em .5em;
color:#555;
&:focus {
background: rgba(0, 0, 0, 0.05);
}
&:focus {
background: rgba(0, 0, 0, 0.05);
}
@include placeholder(#555);
}
button[type="submit"] {
padding:3px 2px;
line-height:0;
float:left;
margin-left:-40px;
display:block;
background:none;
overflow:visible;
}
}
}
@include placeholder(#555);
}
button[type="submit"] {
padding:3px 2px;
line-height:0;
float:left;
margin-left:-40px;
display:block;
background:none;
overflow:visible;
}
}
}
.site-name {
float:right;
.logo-ubuntuit {
@include font-size(36);
margin-bottom:0;
position:relative;
text-transform:lowercase;
margin:0;
display:inline-block;
margin-left:20px;
font-weight:300;
}
}
.site-name {
float:right;
.logo-ubuntuit {
@include font-size(36);
margin-bottom:0;
position:relative;
text-transform:lowercase;
margin:0;
display:inline-block;
margin-left:20px;
font-weight:300;
}
}
}
template.php
View file @ 99080ceb
This diff is collapsed.
tpl/html.tpl.php
View file @ 99080ceb
......@@ -42,21 +42,24 @@
*
* @ingroup themeable
*/
?><!DOCTYPE html>
?>
<!DOCTYPE html>
<html lang="<?php print $language->language; ?>">
<head profile="<?php print $grddl_profile; ?>">
<?php print $head; ?>
<title><?php print $head_title; ?></title>
<?php print $styles; ?>
<?php print $scripts; ?>
</head>
<body class="<?php print $classes; ?>" <?php print $attributes;?>>
<div id="skip-link">
<a href="#main-content" class="element-invisible element-focusable"><?php print t('Skip to main content'); ?></a>
</div>
<?php print $page_top; ?>
<?php print $page; ?>
<?php print $page_bottom; ?>
</body>
<head profile="<?php print $grddl_profile; ?>">
<?php print $head; ?>
<title><?php print $head_title; ?></title>
<?php print $styles; ?>
<?php print $scripts; ?>
</head>
<body class="<?php print $classes; ?>" <?php print $attributes;?>>
<div id="skip-link">
<a href="#main-content" class="element-invisible element-focusable"><?php print t('Skip to main content'); ?></a>
</div>
<?php print $page_top; ?>
<?php print $page; ?>
<?php print $page_bottom; ?>
</body>
</html>
tpl/page.tpl.php
View file @ 99080ceb
......@@ -75,37 +75,38 @@
*/
?>
<header class="banner global" role="banner">
<nav class="nav-primary" role="navigation">
<?php print theme('links__system_main_menu', array(
'links' => $valencia_menu,
'id' => 'header'
));?>
<div class="site-name">
<a class="logo-ubuntuit" href="<?php print $front_page; ?>">
<span>ubuntu-it</span>
</a>
</div>
</nav>
<nav class="nav-primary" role="navigation">
<?php print theme('links__system_main_menu', array(
'links' => $valencia_menu,
'id' => 'header'
));?>
<div class="site-name">
<a class="logo-ubuntuit" href="<?php print $front_page; ?>">
<span>ubuntu-it</span>
</a>
</div>
</nav>
</header>
<header class="banner global inverted" role="banner">
<nav class="nav-primary nav-left" role="navigation">
<?php print theme('links__system_main_menu', array(
'links' => $valencia_menu,
'id' => 'subheader'
));?>
<form action="/search" id="search-form" class="header-search">
<input type="search" maxlength="255" name="q" id="edit-keys" class="form-text" placeholder="Cerca&hellip;" value="" />
<button type="submit">
<img src="http://assets.ubuntu.com/sites/ubuntu/1044/u/img/search-black.svg" alt="Search" height="28" />
</button>
</form>
</nav>
<nav class="nav-primary nav-left" role="navigation">
<?php print theme('links__system_main_menu', array(
'links' => $valencia_menu,
'id' => 'subheader'
));?>
<form action="/search" id="search-form" class="header-search">
<input type="search" maxlength="255" name="q" id="edit-keys" class="form-text" placeholder="Cerca&hellip;" value="" />
<button type="submit">
<img src="http://assets.ubuntu.com/sites/ubuntu/1044/u/img/search-black.svg" alt="Search" height="28" />
</button>
</form>
</nav>
</header>
<div class="wrapper">
<div id="main-content" class="inner-wrapper">
<?php print $messages; // Error messages ?>
<?php print $messages; // Error messages ?>
<nav role="navigation" class="nav-secondary clearfix">
<?php print theme('links__system_main_menu', array(
......@@ -114,37 +115,42 @@
));?>
</nav>
<div id="main-wrapper"><div id="main" class="clearfix">
<div id="content" class="column"><div class="section">
<a id="main-content"></a>
<?php if ($title): ?><h1 class="row" id="page-title"><?php print $title; ?></h1><?php endif; ?>
<?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
<?php print render($page['help']); ?>
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
<?php print render($page['content']); ?>
<?php print $feed_icons; ?>
</div></div> <!-- /.section, /#content -->
</div></div> <!-- /#main, /#main-wrapper -->
<div id="main-wrapper">
<div id="main" class="clearfix">
<div id="content" class="column">
<div class="section">
<a id="main-content"></a>
<?php if ($title): ?><h1 class="row" id="page-title"><?php print $title; ?></h1><?php endif; ?>
<?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
<?php print render($page['help']); ?>
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
<?php print render($page['content']); ?>
<?php print $feed_icons; ?>
</div>
</div>
</div>
</div>
</div></div> <!-- /#main-content, /.wrapper -->
</div>
</div>
<footer class="global clearfix">
<nav role="navigation">
<div class="footer-a">
<div class="clearfix">
<?php print theme('links__system_main_menu', array(
'links' => $valencia_menu,
'id' => 'footer'
));?>
</div> </div> <!-- /.clearfix, /.footer-a -->
<div class="legal clearfix">
<p class="twelve-col">&copy; Ubuntu e Canonical sono marchi registrati da Canonical Ltd.</p>
<p class="twelve-col">Sito realizzato con &hearts; dal Gruppo Web di ubuntu-it, con <a href="http://drupal.org" target="_blank">Drupal</a> e <a href="http://www.postgresql.org/" target="_blank">PostgreSQL</a>.</p>
<p class="twelve-col"><a href="http://code.ubuntu-it.org/ubuntu-it-web/valencia/issues" target="_blank">Segnala un errore</a> | <a href="http://code.ubuntu-it.org/ubuntu-it-web/www-test" target="_blank">Scarica il codice</a> | <a href="http://wiki.ubuntu-it.org/GruppoWeb/Contribuire" target="_blank">Collabora con noi</a>
</div> <!-- /.legal .clearfix -->
<span class="accessibility-aid"><a href="#">Got to the top of the page</a></span>
</nav> <!-- /nav -->
</footer> <!-- /footer -->
<footer class="global clearfix">
<nav role="navigation">
<div class="footer-a">
<div class="clearfix">
<?php print theme('links__system_main_menu', array(
'links' => $valencia_menu,
'id' => 'footer'
));?>
</div>
</div>
<div class="legal clearfix">
<p class="twelve-col">&copy; Ubuntu e Canonical sono marchi registrati da Canonical Ltd.</p>
<p class="twelve-col">
Sito realizzato con &hearts; dal Gruppo Web di ubuntu-it, con <a href="http://drupal.org" target="_blank">Drupal</a> e <a href="http://www.postgresql.org/" target="_blank">PostgreSQL</a>.
</p>
<p class="twelve-col"><a href="http://code.ubuntu-it.org/ubuntu-it-web/valencia/issues" target="_blank">Segnala un errore</a> | <a href="http://code.ubuntu-it.org/ubuntu-it-web/www-test" target="_blank">Scarica il codice</a> | <a href="http://wiki.ubuntu-it.org/GruppoWeb/Contribuire" target="_blank">Collabora con noi</a>
</div>
<span class="accessibility-aid"><a href="#">Got to the top of the page</a></span>
</nav>
</footer>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment