Skip to content

add styling for Connect Smart and HIV sections #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rizziepit merged 6 commits into from
Jul 17, 2015
Merged

add styling for Connect Smart and HIV sections #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01ea1af
add Connect Smart repo
Rizziepit Jul 16, 2015
c3a1e00
Merge branch 'develop' into feature/issue-23-add-styling-for-connects…
Rizziepit Jul 16, 2015
a641b3c
add styling and section data for HIV and Connect Smart
Rizziepit Jul 16, 2015
dd0922c
Merge branch 'develop' into feature/issue-23-add-styling-for-connects…
Rizziepit Jul 17, 2015
eaff70c
match colour codes exactly with spec
Rizziepit Jul 17, 2015
cab12b9
add arrow images in new colours
Rizziepit Jul 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions development.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ unicore.content_repo_urls =
unicore_frontend_mariestopes_za
unicore_frontend_ffl_za
unicore_frontend_ebola_tz
unicore_frontend_connectsmart_za

featured_languages =
eng_GB
Expand Down Expand Up @@ -67,3 +68,4 @@ formatter = generic

[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s

3 changes: 2 additions & 1 deletion springboard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ models:
type: string
repositories:
unicore_frontend_barefootlaw_za: https://github.com/universalcore/unicore-cms-content-barefootlaw-za-qa
unicore_frontend_connectsmart_za: https://github.com/universalcore/unicore-cms-content-connectsmart-za-qa
unicore_frontend_ebola_tz: https://github.com/universalcore/unicore-cms-content-ebola-tz-qa
unicore_frontend_ffl_za: https://github.com/universalcore/unicore-cms-content-ffl-za-qa
unicore_frontend_mariestopes_za: https://github.com/universalcore/unicore-cms-content-mariestopes-za-qa
unicore_frontend_straighttalk_za: https://github.com/universalcore/unicore-cms-content-straighttalk-za-qa
unicore_frontend_ureport_za: https://github.com/universalcore/unicore-cms-content-ureport-za-qa
unicore_frontend_ebola_tz: https://github.com/universalcore/unicore-cms-content-ebola-tz-qa
Binary file added springboard_iogt/static/css/img/arrow_darkgreen.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added springboard_iogt/static/css/img/arrow_darkgreen_flipped.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added springboard_iogt/static/css/img/arrow_lightpink.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added springboard_iogt/static/css/img/arrow_lightpink_flipped.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 26 additions & 29 deletions springboard_iogt/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@
input, select, textarea { font-size: 95%; font-family: Arial, Helvetica, sans-serif; }
a { color: #9630c8; text-decoration: none; font-weight: bold; }
.clr { width: 100%; height: 0px; clear: both; display: block; }
.purple { background: #514392; color: #fff; }
.purple { background: #4d4391; color: #fff; }
.grey { background: #ededed; color: #666; }


/* HEADER */

#header { width: 100%; background: #000; position: relative; z-index: 100000; }
#header .logo { background-color: #514392; }
#header .logo { background-color: #4d4391; }
#header .logo a { margin: 0; display: block; line-height: 0; }
#header .logo-stacked { padding: 24px; }
#header .logo-stacked img { width: 50%; }
#header .logo-long { padding: 14px 24px; }
#header .logo-long img { width: 66%;}
#header .drop { display: none; }
#header .lang {width: 100%; line-height: 20px; padding: 9px 24px; display: block; background: #2d2d2d; color: #514392; }
#header .lang {width: 100%; line-height: 20px; padding: 9px 24px; display: block; background: #2d2d2d; color: #4d4391; }
#header .lang a {color: #fff; font-weight: normal; }


/* SUBMENU */

#submenu .h1 { background: #514392; color: #fff; }
#submenu .h1 { background: #4d4391; color: #fff; }
#submenu ul { list-style: none; padding: 0; margin: 0;}
#submenu li { background: #ededed; }
#submenu li a{ display: block; border-bottom: solid 1px #fff; padding: 14px 24px;}
Expand Down Expand Up @@ -77,59 +77,56 @@
.articles .article img { width: 100%; margin: 24px 0; display: block; }

/* Content section-specific */
.section-title { margin: 0; padding: 0; background-color: #514392; }
.section-title { margin: 0; padding: 0; background-color: #4d4391; }
.section-title div { margin: 0; padding: 24px 24px; line-height: 32px; font-size: 200%; font-weight: bold; }
.section-title a { color: #fff; }
.section-banner { padding: 0; margin: 0; }
.section-banner img { width: 100%; padding: 0; margin: 0; display: block; }

/* Facts For Life */
.articles .ffl a { color: #32bac2; }
.section-title.ffl div { background-color: #32bac2; }
.articles .ffl a { color: #00bfc6; }
.section-title.ffl div { background-color: #00bfc6; }

/* Barefoot Law */
.articles .barefootlaw a { color: #6ec17c; }
.section-title.barefootlaw div { background-color: #6ec17c; }
.articles .barefootlaw a { color: #6ec17f; }
.section-title.barefootlaw div { background-color: #6ec17f; }

/* Mariestopes */
.articles .mariestopes a { color: #e04a5a; }
.section-title.mariestopes div { background-color: #e04a5a; }
.articles .mariestopes a { color: #e24256; }
.section-title.mariestopes div { background-color: #e24256; }

/* Straight Talk */
.articles .straighttalk a { color: #c977b2; }
.section-title.straighttalk div { background-color: #c977b2; }
.articles .straighttalk a { color: #cb78b3; }
.section-title.straighttalk div { background-color: #cb78b3; }

/* U-report */
.articles .ureport a { color: #f18054; }
.section-title.ureport div { background-color: #f18054; }
.articles .ureport a { color: #ff7e4e; }
.section-title.ureport div { background-color: #ff7e4e; }

/* Ebola */
.articles .ebola a { color: #fdbe61; }
.section-title.ebola div { background-color: #fdbe61; }
.articles .ebola a { color: #ffbe61; }
.section-title.ebola div { background-color: #ffbe61; }

/* Connect Smart */
.articles .connectsmart a { color: #f38aa5; }
.section-title.connectsmart div { background-color: #f38aa5; }

/* HIV */
.articles .hiv a { color: #4f946e; }
.section-title.hiv div { background-color: #4f946e; }

/* Personae */
.personae { padding: 0; margin: 0; }
.personae a { display: block; padding: 0.4em 24px; }

/* CALL TO ACTION */

.cta .h2 {padding: 24px;}
.cta .ffl .h2 a{color: #32bac2;}
.cta .ebola .h2 a{color: #fdbe61;}
.cta .barefootlaw .h2 a{color: #6ec17c;}
.cta .mariestopes .h2 a{color: #e04a5a;}
.cta .straighttalk .h2 a{color: #c977b2;}
.cta .ureport .h2 a{color:#f18054;}
.cta .ebola .h2 a{color: #fdbe61;}

/* PERSONA*/
#content ul.personae{list-style: none; padding: 13px 0px;}


/* FOOTER */

#footer { padding: 24px; position: relative; }
#footer a { color: #514392; }
#footer a { color: #4d4391; }


/* RETINA (because it's nice when you work on something that looks good) */
Expand Down
49 changes: 13 additions & 36 deletions springboard_iogt/static/css/super.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
#content .articles .ffl .h1 .back{background-image: url("img/arrow_turquoise_flipped.png");}
#content .articles .mariestopes .h1 .back{background-image: url("img/arrow_red_flipped.png");}
#content .articles .straighttalk .h1 .back{background-image: url("img/arrow_purple_flipped.png");}
#content .articles .ureport .h1 .back{background-image: url("img/arrow_orange.png");}
#content .articles .ureport .h1 .back{background-image: url("img/arrow_orange_flipped.png");}
#content .articles .connectsmart .h1 .back{background-image: url("img/arrow_lightpink_flipped.png");}
#content .articles .hiv .h1 .back{background-image: url("img/arrow_darkgreen_flipped.png");}

.articles .detail { padding: 24px; }

Expand All @@ -75,45 +77,20 @@
#submenu .mariestopes a{background-image: url("img/arrow_red.png");}
#submenu .straighttalk a{background-image: url("img/arrow_purple.png");}
#submenu .ureport a{background-image: url("img/arrow_orange.png");}
#submenu .connectsmart a{background-image: url("img/arrow_lightpink.png");}
#submenu .home a{background-image: url("img/arrow_right_grey.png");}
#submenu .hiv a{background-image: url("img/arrow_darkgreen.png");}

#content .home .articles .listing {position: relative;}
#content .home .articles .listing:after {padding:0; margin:0; display:block; content: ""; width:93%; height:10px; position: absolute;right: 0;top:0;}
#content .home .articles .ffl:after {background-color:#32bac2; }
#content .home .articles .barefootlaw:after {background-color:#6ec17c;}
#content .home .articles .mariestopes:after {background-color:#e04a5a; }
#content .home .articles .straighttalk:after {background-color:#c977b2; }
#content .home .articles .ureport:after {background-color:#f18054; }
#content .home .articles .ebola:after {background-color:#fdbe61; }

.cta .h2 a {
padding: 10px 10px 10px 18px;
display: block;
}
.cta .ffl .h2 a{
color: white;
background-color: #32bac2;
}
.cta .barefootlaw .h2 a{
color: white;
background-color: #6ec17c;
}
.cta .mariestopes .h2 a{
color: white;
background-color: #e04a5a;
}
.cta .straighttalk .h2 a{
color: white;
background-color: #c977b2;
}
.cta .ureport .h2 a{
color: white;
background-color: #f18054;
}
.cta .ebola .h2 a{
color: white;
background-color: #fdbe61;
}
#content .home .articles .ffl:after {background-color:#00bfc6; }
#content .home .articles .barefootlaw:after {background-color:#6ec17f;}
#content .home .articles .mariestopes:after {background-color:#e24256; }
#content .home .articles .straighttalk:after {background-color:#cb78b3; }
#content .home .articles .ureport:after {background-color:#ff7e4e; }
#content .home .articles .ebola:after {background-color:#ffbe61; }
#content .home .articles .connectsmart:after {background-color:#f38aa5; }
#content .home .articles .hiv:after {background-color:#4f946e; }

#content .section-title.h1 {padding: 0;}

Expand Down
8 changes: 8 additions & 0 deletions springboard_iogt/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ class ContentSection(object):
('ffl', {
'owner': _('Facts For Life'),
'title': _('Facts for Life')
}),
('hiv', {
'owner': _('HIV'),
'title': _('HIV')
}),
('connectsmart', {
'owner': _('Connect Smart'),
'title': _('Connect Smart'),
})
])

Expand Down