Skip to content
Snippets Groups Projects
Commit 5092e420 authored by Neil Drumm's avatar Neil Drumm :wave:
Browse files

Issue #2182993: Merge branch 'dev' into 2182993-api-breadcrumb-space

parents 0cd425b1 2065ae4e
No related branches found
No related tags found
No related merge requests found
This theme is for Drupal.org sites. This theme is for Drupal.org sites.
## Where’s the CSS? ## Contributing
Work from the `dev` branch, using feature branches named
`{issue number}-{short-description}`, for example
`2182993-api-breadcrumb-space`.
See https://www.drupal.org/node/2406727 for more information.
### Where’s the CSS?
CSS is compiled with Compass. See https://drupal.org/node/1953368 for more CSS is compiled with Compass. See https://drupal.org/node/1953368 for more
information. information.
......
/** // Main top navigation
* Navigation
*/
/* Main top navigation */
@include breakpoint(max-width $medium) { @include breakpoint(max-width $medium) {
#nav-header { #nav-header {
...@@ -27,7 +24,8 @@ ...@@ -27,7 +24,8 @@
} }
#nav-header { #nav-header {
font-size: 0.923076em; /* 12px */ font-size: 0.923076em; // 12px
height: (18em / 12); // 18px, minimum height when links not present.
ul { ul {
@include pie-clearfix(); @include pie-clearfix();
background: $navy-blue; background: $navy-blue;
...@@ -53,13 +51,12 @@ ...@@ -53,13 +51,12 @@
a:hover, a:hover,
a:focus { a:focus {
color: $header-link-hover; /* Not a standard color, matches prototype */ color: $header-link-hover; // Not a standard color, matches prototype
text-decoration: none; text-decoration: none;
} }
}
} // #nav-header // User navigation: Homepage, Dashboard, Login
/* User navigation: Homepage, Dashboard, Login */
#nav-masthead { #nav-masthead {
@include span-columns(12 omega); @include span-columns(12 omega);
display: block; display: block;
...@@ -70,7 +67,7 @@ ...@@ -70,7 +67,7 @@
#nav-masthead ul li { #nav-masthead ul li {
list-style: none; list-style: none;
float: left; float: left;
font-size: 0.923076em; /* 12px */ font-size: 0.923076em; // 12px
margin-right: 0.615384em; margin-right: 0.615384em;
} }
#nav-masthead ul li a { #nav-masthead ul li a {
...@@ -90,7 +87,7 @@ ...@@ -90,7 +87,7 @@
color: $black; color: $black;
} }
/* Logged in user navigation */ // Logged in user navigation
#userinfo { #userinfo {
clear: both; clear: both;
background-color: $white; background-color: $white;
...@@ -98,7 +95,7 @@ ...@@ -98,7 +95,7 @@
padding: 5px 0 0; padding: 5px 0 0;
text-align: right; text-align: right;
a { a {
font-size: 0.92307em; /* 0.92307 * 13 = 12px */ font-size: 0.92307em; // 0.92307 * 13 = 12px
margin: 0 1em 0 0; margin: 0 1em 0 0;
text-decoration: none; text-decoration: none;
} }
...@@ -122,7 +119,7 @@ ...@@ -122,7 +119,7 @@
} }
} }
/* Content Navigation Tabs */ // Content Navigation Tabs
#nav-content ul { #nav-content ul {
@include pie-clearfix(); @include pie-clearfix();
display: block; display: block;
......
@include breakpoint(max-width $small) {
.login-text {
margin-top: 1.5em;
}
}
@include breakpoint($small) {
#user-login,
.login-text {
@include span-columns(6);
}
.login-text {
@include omega;
}
}
/** // Limit width of forum pages to 8 columns
* Forums
*/
/* Limit width of forum pages to 8 columns */
.node-type-forum #main { .node-type-forum #main {
@include span-columns(8); @include span-columns(8);
} }
...@@ -10,10 +7,6 @@ ...@@ -10,10 +7,6 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
/* #forum td > td {
border: 1px solid #f0f;
}*/
#forum ul { #forum ul {
padding: 0; padding: 0;
} }
...@@ -30,9 +23,9 @@ ...@@ -30,9 +23,9 @@
#forum tr td.container .name { #forum tr td.container .name {
background: transparent $sprite-small-icons no-repeat; background: transparent $sprite-small-icons no-repeat;
background-position: 0 3px; /*@todo: fix sprites here ;*/ background-position: 0 3px; // todo fix sprites here
padding: 0px 0 5px 20px; padding: 0px 0 5px 20px;
min-width: 20px; /* IE7 hack */ min-width: 20px; // IE7 hack
} }
#forum div.indent { #forum div.indent {
...@@ -41,7 +34,7 @@ ...@@ -41,7 +34,7 @@
#forum { #forum {
.title { .title {
word-break: break-all; @include force-wrap;
} }
} }
...@@ -52,8 +45,8 @@ ...@@ -52,8 +45,8 @@
#forum tr td.forum .name { #forum tr td.forum .name {
background: transparent $sprite-small-icons no-repeat; background: transparent $sprite-small-icons no-repeat;
background-position: 0 -155px; /*@todo:fix sprites here ;*/ background-position: 0 -155px; // todo fix sprites here
min-width: 20px; /* IE7 hack */ min-width: 20px; // IE7 hack
} }
#forum tr td.forum .name, #forum tr td.forum .name,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment