Skip to content
This repository has been archived by the owner on Dec 9, 2019. It is now read-only.

Commit

Permalink
Issue #3: Moved few custom styles into pycon/ dir.
Browse files Browse the repository at this point in the history
  • Loading branch information
@passiomatic
passiomatic committed Feb 26, 2014
1 parent dbcf62a commit b31be89
Show file tree
Hide file tree
Showing 9 changed files with 251 additions and 246 deletions.
10 changes: 6 additions & 4 deletions p3/static/p5/stylesheets/_imports.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ URL: http://stuffandnonsense.co.uk/projects/rock-hammer/
@import "partials/navigation-responsive-nav";
//@import "partials/navigation-responsive-breadcrumb";

// Styles for specific PyCon setions
@import "partials/blog";
@import "partials/cms";
@import "partials/profile";
// Styles for specific PyCon sections

@import "partials/pycon/legacy";
@import "partials/pycon/blog";
@import "partials/pycon/cms";
@import "partials/pycon/profile";

@media print {
@import "partials/print"; }
Expand Down
206 changes: 103 additions & 103 deletions p3/static/p5/stylesheets/all.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ URL: http://stuffandnonsense.co.uk/projects/rock-hammer/
*/
/* About $basefontsize*1.5 */
html, body, body, div, span, object, iframe, h1, h2, header .subhead, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, .badge p, .meta, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, hgroup, menu, nav, section, time, mark, audio, video {
html, body, body, div, span, object, iframe, h1, h2, header .subhead, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, .meta, .badge p, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, figure, footer, header, hgroup, menu, nav, section, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
Expand Down Expand Up @@ -143,13 +143,32 @@ figure {
font-style: italic;
color: #3c3a34; }

.meta {
color: #807c6f; }
.meta a:link, .meta a:visited {
color: #807c6f; }

.tag {
background: #d4d2cd;
border: 1px solid #bcbab2;
border-radius: 4px;
padding: 0 6px;
display: inline-block;
font-size: 14px;
font-size: 1.4rem;
margin-right: 7px;
margin-bottom: 0.375em; }
.tag:hover {
background: white;
text-decoration: none; }

h1, h2, header .subhead, h3, h4, h5, h6 {
margin: 0;
font-family: inherit;
font-weight: 700;
color: inherit;
text-rendering: optimizelegibility; }
h1 small, h1 .badge p, .badge h1 p, h1 .meta, h2 small, header .subhead small, h2 .badge p, .badge h2 p, header .subhead .badge p, .badge header .subhead p, h2 .meta, header .subhead .meta, h3 small, h3 .badge p, .badge h3 p, h3 .meta, h4 small, h4 .badge p, .badge h4 p, h4 .meta, h5 small, h5 .badge p, .badge h5 p, h5 .meta, h6 small, h6 .badge p, .badge h6 p, h6 .meta {
h1 small, h1 .meta, h1 .badge p, .badge h1 p, h2 small, header .subhead small, h2 .meta, header .subhead .meta, h2 .badge p, .badge h2 p, header .subhead .badge p, .badge header .subhead p, h3 small, h3 .meta, h3 .badge p, .badge h3 p, h4 small, h4 .meta, h4 .badge p, .badge h4 p, h5 small, h5 .meta, h5 .badge p, .badge h5 p, h6 small, h6 .meta, h6 .badge p, .badge h6 p {
font-weight: normal;
line-height: 1;
color: #bcbab2; }
Expand Down Expand Up @@ -208,7 +227,7 @@ address {
font-size: 1.8rem;
line-height: 1.5em; }

small, .badge p, .meta {
small, .meta, .badge p {
font-size: 15px;
font-size: 1.5rem; }

Expand Down Expand Up @@ -239,18 +258,18 @@ blockquote {
padding: 14px;
background-color: #e0dfdb;
font-style: normal; }
blockquote small:before, blockquote .badge p:before, .badge blockquote p:before, blockquote .meta:before {
blockquote small:before, blockquote .meta:before, blockquote .badge p:before, .badge blockquote p:before {
content: '\00A0 \2014'; }
blockquote small:after, blockquote .badge p:after, .badge blockquote p:after, blockquote .meta:after {
blockquote small:after, blockquote .meta:after, blockquote .badge p:after, .badge blockquote p:after {
content: ''; }
blockquote.pull-right {
float: right;
background-color: transparent; }
blockquote.pull-right p, blockquote.pull-right small, blockquote.pull-right .badge p, .badge blockquote.pull-right p, blockquote.pull-right .meta {
blockquote.pull-right p, blockquote.pull-right small, blockquote.pull-right .meta, blockquote.pull-right .badge p, .badge blockquote.pull-right p {
text-align: right; }
blockquote.pull-right small:before, blockquote.pull-right .badge p:before, .badge blockquote.pull-right p:before, blockquote.pull-right .meta:before {
blockquote.pull-right small:before, blockquote.pull-right .meta:before, blockquote.pull-right .badge p:before, .badge blockquote.pull-right p:before {
content: ''; }
blockquote.pull-right small:after, blockquote.pull-right .badge p:after, .badge blockquote.pull-right p:after, blockquote.pull-right .meta:after {
blockquote.pull-right small:after, blockquote.pull-right .meta:after, blockquote.pull-right .badge p:after, .badge blockquote.pull-right p:after {
content: '\00A0 \2014'; }
blockquote cite {
font-style: normal; }
Expand Down Expand Up @@ -4486,6 +4505,47 @@ nav[role=navigation].active {
#navigation-toggle li.user a {
text-transform: none; }

/*
* Copyright (C) 2009-2013, Python Italia APS
* All rights reserved.
*
* This file is non-free. See README.md for an explanation.
*/
.janrain-box {
max-width: 558px;
display: block;
/* background: transparent url(../images/loading-janrain.png) center center no-repeat; */
min-height: 240px; }

form .field.error .errorlist {
margin: 0;
padding: 0;
color: #ad3d31; }

.overlay {
display: none;
z-index: 10000;
background: white;
padding: 0.75em 28px;
width: 30em;
min-height: 15em;
box-shadow: 0 0 15px #807c6f; }

.overlay .close {
position: absolute;
background: transparent url(../images/icon-close.png) center center no-repeat;
width: 36px;
height: 36px;
top: -18px;
right: -18px; }

#global-overlay {
padding: 0.75em 28px; }

#global-overlay .contentWrap {
height: 450px;
overflow-y: auto; }

/*
* Copyright (C) 2009-2013, Python Italia APS
* All rights reserved.
Expand Down Expand Up @@ -4686,9 +4746,20 @@ nav[role=navigation].active {
text-transform: capitalize;
padding-right: 10px; }

/*
* Copyright (C) 2009-2013, Python Italia APS
* All rights reserved.
*
* This file is non-free. See README.md for an explanation.
*/
#form_profile_picture .field > label {
display: none; }

.live-edit .live-edit-toggle {
display: none; }
.live-edit .autosubmit {
display: none; }

@media print {
* {
background: transparent !important;
Expand Down Expand Up @@ -4734,18 +4805,6 @@ nav[role=navigation].active {

tr {
page-break-inside: avoid; } }
.badge {
background: white;
border: 1px solid #bcbab2;
padding: 0.75em 14px;
border-radius: 4px;
text-align: center; }
.badge h5 {
margin-bottom: 0; }
.badge p {
color: #807c6f;
margin-bottom: 0; }

footer {
background: #1e425f; }
footer hr {
Expand Down Expand Up @@ -4777,19 +4836,25 @@ header {
header .subhead {
color: #807c6f; }

.notice {
/*
@extend .well;
@extend .well--large;
margin-bottom: 0;
*/ }
.notice .fa {
color: #807c6f; }
.notice h3 {
text-transform: uppercase;
margin-bottom: 0.75em; }
.notice h3 span {
color: #ad3d31; }
.notice .fa {
color: #807c6f; }
.notice h3 {
text-transform: uppercase;
margin-bottom: 0.75em; }
.notice h3 span {
color: #ad3d31; }

.badge {
background: white;
border: 1px solid #bcbab2;
padding: 0.75em 14px;
border-radius: 4px;
text-align: center; }
.badge h5 {
margin-bottom: 0; }
.badge p {
color: #807c6f;
margin-bottom: 0; }

.calendar .deadline.expired {
text-decoration: line-through;
Expand All @@ -4803,29 +4868,6 @@ header {
font-size: 1.4rem;
border-radius: 4px; }

.avatar, #comments .gravatar {
border: 2px solid #bcbab2;
display: block; }

.meta {
color: #807c6f; }
.meta a:link, .meta a:visited {
color: #807c6f; }

.tag {
background: #d4d2cd;
border: 1px solid #bcbab2;
border-radius: 4px;
padding: 0 6px;
display: inline-block;
font-size: 14px;
font-size: 1.4rem;
margin-right: 7px;
margin-bottom: 0.375em; }
.tag:hover {
background: white;
text-decoration: none; }

.toggle,
.tag-toggle {
padding: 0 0 0 14px;
Expand All @@ -4848,51 +4890,9 @@ dt.toggle + dd {
color: #807c6f;
margin: 0.75em 0 0 14px; }

.janrain-box {
max-width: 558px;
display: block;
/* background: transparent url(../images/loading-janrain.png) center center no-repeat; */
min-height: 240px; }

form .field.error .errorlist {
margin: 0;
padding: 0;
color: #ad3d31; }

.live-edit .live-edit-toggle {
display: none; }
.live-edit .autosubmit {
display: none; }

aside {
/*
p, li {
@include font-size(16);
}
*/ }
aside h4 {
margin: 0.75em 0; }

.overlay {
display: none;
z-index: 10000;
background: white;
padding: 0.75em 28px;
width: 30em;
min-height: 15em;
box-shadow: 0 0 15px #807c6f; }

.overlay .close {
position: absolute;
background: transparent url(../images/icon-close.png) center center no-repeat;
width: 36px;
height: 36px;
top: -18px;
right: -18px; }

#global-overlay {
padding: 0.75em 28px; }
aside h4 {
margin: 0.75em 0; }

#global-overlay .contentWrap {
height: 450px;
overflow-y: auto; }
.avatar, #comments .gravatar {
border: 2px solid #bcbab2;
display: block; }
28 changes: 27 additions & 1 deletion p3/static/p5/stylesheets/partials/_elements.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,30 @@ font-weight : normal;
@include font-size(14);
font-style : italic;
color : $midneutralcolor; }
}
}


// meta

.meta {
@extend small;
color: $neutralcolor;
a:link, a:visited {
color: $neutralcolor; }
}

// tag

.tag {
background: $lighterneutralcolor;
border: 1px solid $lightneutralcolor;
border-radius: $borderradius;
padding: 0 6px;
display: inline-block;
@include font-size(14);
margin-right: $gutterwidth/4;
margin-bottom: $baselineheight/4;
&:hover {
background: $white;
text-decoration: none; }
}
7 changes: 0 additions & 7 deletions p3/static/p5/stylesheets/partials/_profile.scss
View file

This file was deleted.

0 p3/static/p5/stylesheets/partials/_blog.scss → .../p5/stylesheets/partials/pycon/_blog.scss
View file
File renamed without changes.
0 p3/static/p5/stylesheets/partials/_cms.scss → ...c/p5/stylesheets/partials/pycon/_cms.scss
View file
File renamed without changes.
Loading

0 comments on commit b31be89

Please sign in to comment.