Skip to content
GitLab
Commit c21c60cd authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon
Browse files

Primary school theme update 



Change-Id: I17174486bf5600a01684276b6cd61a8e7ae65461
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 6582a805
Expand all Hide whitespace changes
Inline Side-by-side
htdocs/theme/primaryschool/fonts/dekko/dekko-regular-webfont.svg 0 → 100755
View file @ c21c60cd
This source diff could not be displayed because it is too large. You can view the blob instead.
htdocs/theme/primaryschool/fonts/kalam/kalam-bold-webfont.svg 0 → 100755
View file @ c21c60cd
This diff is collapsed.
htdocs/theme/primaryschool/fonts/patrickhand/patrickhand-regular-webfont.svg 0 → 100755
View file @ c21c60cd
This source diff could not be displayed because it is too large. You can view the blob instead.
htdocs/theme/primaryschool/sass/_custom.scss
View file @ c21c60cd
......@@ -26,11 +26,13 @@
}
&:focus,
&:hover {
background-color: darken(#0591ce, 10%);
background-color: lighten(#0591ce, 5%);
}
}
&.active > a:before {
color: #0591ce;
&.active {
> a:before {
color: #0591ce;
}
}
}
.content {
......@@ -41,20 +43,33 @@
}
&:focus,
&:hover {
background-color: darken(#ca0238, 10%);
background-color: lighten(#ca0238, 2%);
}
}
&.active {
> a:before {
color: #ca0238;
}
}
.navbar-toggle {
background-color: #ca0238;
&:focus,
&:hover {
background-color: darken(#ca0238, 2%);
}
}
.child-nav {
background-color: #ca0238;
.navbar-showchildren {
background-color: #ca0238;
&:focus,
&:hover {
background-color: #ca0238;
li {
a {
color: #FFFFFF;
}
&.active a {
color: #000000;
}
}
}
&.active > a:before {
color: #ca0238;
}
}
.myportfolio {
> a {
......@@ -64,12 +79,31 @@
}
&:focus,
&:hover {
background-color: darken(#f29907, 10%);
background-color: lighten(#f29907, 2%);
}
}
&.active > a:before {
color: #f29907;
}
.navbar-toggle {
background-color: #f29907;
&:focus,
&:hover {
background-color: darken(#f29907, 2%);
}
}
.child-nav {
background-color: #f29907;
li {
a {
color: #FFFFFF;
}
&.active a {
color: #000000;
}
}
}
}
.groups {
> a {
......@@ -79,12 +113,31 @@
}
&:focus,
&:hover {
background-color: darken(#799323, 10%);
background-color: lighten(#799323, 2%);
}
}
&.active > a:before {
color: #799323;
}
.navbar-toggle {
background-color: #799323;
&:focus,
&:hover {
background-color: darken(#799323, 2%);
}
}
.child-nav {
background-color: #799323;
li {
a {
color: #FFFFFF;
}
&.active a {
color: #000000;
}
}
}
}
.siteadmin {
> a {
......@@ -94,7 +147,7 @@
}
&:focus,
&:hover {
background-color: darken(#773f97, 10%);
background-color: lighten(#773f97, 2%);
}
}
&.active > a:before {
......@@ -111,4 +164,138 @@
}
}
}
}
\ No newline at end of file
}
// custom subnav background color
.minor-nav {
&.content {
background-color: #FFFFFF;
border-color: #ca0238;
.nav > li {
> a {
color: #ca0238;
&:focus,
&:hover {
background-color: lighten(#ca0238, 5%);
color: #FFFFFF;
}
}
&.active > a {
color: #FFFFFF;
background-color: #ca0238;
}
}
}
&.myportfolio {
background-color: #FFFFFF;
border-color: #f29907;
.nav > li {
> a {
color: #c07800;
&:focus,
&:hover {
background-color: lighten(#f29907, 5%);
color: #FFFFFF;
}
}
&.active > a {
color: #FFFFFF;
background-color: #f29907;
}
}
}
&.groups {
background-color: #FFFFFF;
border-color: #799323;
.nav > li {
> a {
color: #799323;
&:focus,
&:hover {
background-color: lighten(#799323, 5%);
color: #FFFFFF;
}
}
&.active > a {
color: #FFFFFF;
background-color: #799323;
}
}
}
}
// custom block heading
.column-layout {
&:nth-child(3n+1) {
.panel-secondary {
&:nth-child(5n+1) > .panel-heading, .panel-heading-nested {
background-color: #0591ce;
color: #FFFFFF;
}
&:nth-child(5n+2) > .panel-heading, .panel-heading-nested {
background-color: #ca0238;
color: #FFFFFF;
}
&:nth-child(5n+3) > .panel-heading, .panel-heading-nested {
background-color: #f29907;
color: #FFFFFF;
}
&:nth-child(5n+4) > .panel-heading, .panel-heading-nested {
background-color: #799323;
color: #FFFFFF;
}
&:nth-child(5n+5) > .panel-heading, .panel-heading-nested {
background-color: #773f97;
color: #FFFFFF;
}
}
}
&:nth-child(3n+2) {
.panel-secondary {
&:nth-child(5n+1) > .panel-heading, .panel-heading-nested {
background-color: #f29907;
color: #FFFFFF;
}
&:nth-child(5n+2) > .panel-heading, .panel-heading-nested {
background-color: #799323;
color: #FFFFFF;
}
&:nth-child(5n+3) > .panel-heading, .panel-heading-nested {
background-color: #773f97;
color: #FFFFFF;
}
&:nth-child(5n+4) > .panel-heading, .panel-heading-nested {
background-color: #0591ce;
color: #FFFFFF;
}
&:nth-child(5n+5) > .panel-heading, .panel-heading-nested {
background-color: #ca0238;
color: #FFFFFF;
}
}
}
&:nth-child(3n+3) {
.panel-secondary {
&:nth-child(5n+1) > .panel-heading, .panel-heading-nested {
background-color: #773f97;
color: #FFFFFF;
}
&:nth-child(5n+2) > .panel-heading, .panel-heading-nested {
background-color: #0591ce;
color: #FFFFFF;
}
&:nth-child(5n+3) > .panel-heading, .panel-heading-nested {
background-color: #ca0238;
color: #FFFFFF;
}
&:nth-child(5n+4) > .panel-heading, .panel-heading-nested {
background-color: #f29907;
color: #FFFFFF;
}
&:nth-child(5n+5) > .panel-heading, .panel-heading-nested {
background-color: #799323;
color: #FFFFFF;
}
}
}
}
htdocs/theme/primaryschool/sass/components/_btn.scss 0 → 100755
View file @ c21c60cd
// Modifications and extra use cases for bootstrap buttons
.btn.text-left {
text-align:left;
}
.btn.text-right {
text-align:right;
}
.btn label {
min-width: 0;
}
.btn-link-danger {
color: $brand-danger;
}
.btn-text {
color: inherit;
padding:0;
}
.btn {
vertical-align: baseline;
.customrow & {
margin-top: 25px; // layout builder button alignment
}
input {
margin-top: 0;
}
&.checkbox input.checkbox {
width: auto;
display: inline-block;
float: right;
}
}
// Used on pending friends page
.btn-toggle.panel-footer {
padding:0;
> .btn {
border-radius: 0;
width: 50%;
float: left;
height: 42px;
line-height: 30px;
&:first-child {
border-radius: 0 0 0 3px;
border-right: 1px solid $panel-default-border;
}
&:last-child {
border-radius: 0 0 3px 0;
}
.btn {
padding: 0;
margin: 0;
color: inherit;
&:hover {
text-decoration: none;
}
}
form {
display: inline-block;
}
&:hover {
color: #222;
background: $gray-lighter;
text-decoration: none;
.icon {
color: #777;
}
}
}
}
h1 + div > .btn-top-left,
.page-header + div.btn-top-left {
float: none;
margin-bottom: 0;
@media (min-width: $screen-xs-min) {
margin-top: -53px;
.page-header + & {
margin-top: -43px;
}
}
form {
margin: 0 !important;
display: inline-block;
.form-group-inline {
padding: 0;
}
}
}
h1 ~ div > .btn-group-top,
.page-header ~ div.btn-group-top,
.page-header + .btn-action-list .btn-group-top,
.nav-tabs + div.btn-group-top {
margin-top: -20px;
}
.btn-group-top {
float: right;
position: relative;
z-index: 1;
.btn {
@include border-top-radius(0);
border-top: 0;
}
.btn-group-top {
margin: 0;
}
}
.nav-tabs + div.btn-group-top{
margin-top: 0;
}
td.btn-group {
min-width: 300px;
}
// Often the same template is used to render buttons at the top of the page and
// in a list group. cf. groups table/groups
.list-group,
.panel-heading {
.btn-group {
@include clearfix;
text-align: right;
float: right;
margin-top: -10px;
margin-bottom:11px;
@media (min-width: $screen-xs-max ) {
@include clearfix;
&.btn-group-top .btn {
@include border-top-radius(0);
border-top: 0;
}
}
@media (max-width: $screen-xs-max ) {
margin-top: 10px;
}
.btn {
@extend .btn-sm;
}
// this means that in the 'smaller view' we hide the element with this class
// cf buttons in list group
.hide-small {
@extend .sr-only;
}
.btn-top-right {
margin: 0; // negate nested margin
}
}
.btn-action-list{
float:right;
width:100%;
}
}
// Edit page configure buttons
.panel-secondary .blockinstance-controls .btn-group-top {
position: absolute;
top: 11px;
right: 10px;
.btn {
background: rgba(#ccc, 0.8);
&:hover {
background: rgba(#ddd, 1);
}
}
}
// Page editor column + and - controls
.btn-header {
width:100%;
&.btn-two .btn {
width: 25%;
&:first-child {
width:75%
}
}
&.btn-three .btn {
width: 50%;
&:first-child,
&:last-child {
width:25%;
}
}
}
//page builder collapsible
.btn-group-vertical {
.indicator {
margin-left: -4px;
font-size: 9px;
&.icon-arrows {
vertical-align: middle;
margin-left: -7px;
}
}
.block-icon {
vertical-align: middle;
margin-left:-2px;
font-size: 14px;
.col-collapsed & {
margin-left: 2px;
font-size: 18px;
}
}
&.btn-accordion {
.btn {
font-size: 13px;
margin-bottom: -1px;
max-width: 100%;
overflow: hidden;
width:100%;
&.ui-accordion-header {
margin-bottom: -3px;
}
&.last {
border-bottom-radius: 3px;
background-color: #F9F9F9
}
}
// To override btn-primary colour
.btn-primary {
color: $gray-dark;
background: darken($brand-default, 10%);
border-color: #adadad;
}
}
label {
font-size: 12px;
white-space: normal;
vertical-align: middle;
padding: 0;
padding-right: 5px;
padding-top: 3px;
width: auto;
max-width: 90%;
margin-left: 2px;
}
}
//page builder collapsible
.btn-accordion.ui-accordion .ui-accordion-content {
@include box-sizing(border-box);
border-radius: 0;
margin-top: 10px;
margin-bottom:15px;
padding: 0;
max-width:100%;
border:0;
.btn-group-vertical {
@include box-sizing(border-box);
max-width: 100%;
width: 100%;
// take away the edges on inner accordion buttons
.btn {
border-radius: 0;
display:block;
margin: 0;
&:not(:last-child) {
border-bottom: 0;
&:hover {
+.btn {
border-top-color: darken($btn-default-border, 12%);
}
}
}
}
}
}
// Hack to fix the inline script tags that keep getting in places they don't belong
.btn-group .form-as-button.last + script + .btn {
margin-left: -1px;
}
.btn {
.icon-chevron-down {
opacity: 0.5;
}
&:hover {
.icon-chevron-down {
opacity: 1;
}
}
}
.btn:disabled {
.icon {
opacity:0.3;
}
}
.btn-with-heading {
float: right;
margin-top:-75px;
}