Commit ebd81897 authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon
Browse files

Changes to default / primaryschool themes



Change-Id: I55b8a15fba954958f92d8097881b1abd3eeebdb4
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 1b91c170
File mode changed from 100644 to 100755
......@@ -69,24 +69,3 @@
}
}
}
// Groups join group button out of alignment, this needs porting back to raw
.join-group {
.form-group {
border-bottom: 0;
padding: 0;
}
}
// Groups accept/decline to join group buttons out of alignment, this needs porting back to raw
.group-request {
.form-group {
border-bottom: 0;
padding: 0;
.button {
display: inline-block;
}
}
}
\ No newline at end of file
......@@ -11,28 +11,35 @@
@for $i from 1 through 5 {
.header.message-count-#{$i} {
top: 33px * $i;
@media (max-width: $screen-sm-min) {
top: 0;
}
+ .main-nav {
margin-top: $i * 32px;
@media (max-width: $screen-sm-min) {
margin-top: 0;
}
}
~ .middle-container-wrap .container {
~ .container {
.toolbar-affix.affix {
margin-top: $i * 33px;
@media (max-width: $screen-sm-min) {
margin-top: 0;
}
}
}
+ .middle-container-wrap .container {
+ .middle-container-wrap {
// if container is directly after header, then it will need a margin
margin-top: ($i * 33px);
@media (max-width: $screen-sm-min) {
margin-top: 0;
}
}
}
}
......
......@@ -29,9 +29,7 @@
}
.navbar-inverse {
background-image: url(../images/main-nav-bkgd.png);
background-repeat: repeat;
background-position: left top;
background-color: transparent;
.navbar-nav {
......
// Display objects in panels differently
.panel-body {
.sidebar & .form-group,
.login-panel & .form-group {
padding: 0;
}
}
// tinymce heading font
.mce-content-body {
.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
font-family: $font-family-sans-serif !important;
color: #474220;
font-weight: 300;
}
h1 {
border-bottom: 0;
padding-bottom: 0;
}
}
\ No newline at end of file
......@@ -8,7 +8,6 @@
// Panels are a very commonly used layout component
@import "../layout/panel/panel";
@import "../layout/panel/panel-body";
@import "../layout/panel/panel-collapse"; // for collapsible panels and collapsible fieldsets
@import "../layout/panel/panel-footer";
@import "../layout/panel/panel-heading";
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -14,126 +14,9 @@
}
// 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;
}
}
}
}
// custom icons to some blocks
.bt-newviews .panel-heading:before {
content: $fa-var-bullhorn;
font-family: FontAwesome;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-inbox .panel-heading:before {
content: $fa-var-inbox;
font-family: FontAwesome;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-myviews .panel-heading:before {
content: $fa-var-file;
font-family: FontAwesome;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-filedownload .panel-heading:before {
content: $fa-var-download;
font-family: FontAwesome;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-folder .panel-heading:before {
content: $fa-var-folder;
font-family: FontAwesome;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-gallery .panel-heading:before {
content: $fa-var-picture-o;
font-family: FontAwesome;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
// makes the edit page toolbar position more fitting for this theme, plus responsive position
.toolbar-affix.affix {
top: 110px;
top: 90px;
@media (max-width: $screen-sm-min) {
top: 0;
......@@ -178,24 +61,12 @@
}
// external media block video overflows
.mediaplayer-container {
overflow: hidden;
}
// copy page table buttons
.searchlist .right .form-as-button .btn-sm {
margin-bottom: 3px;
}
// Progress bar sidebar label pushes forms out, the block is currently unstyled at the moment in raw
.progressbar table label {
min-width: 0;
}
// comment delete button alignment
.comment-item-buttons {
.form-as-button {
......@@ -203,25 +74,4 @@
margin-top: 0;
}
}
}
// Groups join group button out of alignment, this needs porting back to raw
.join-group {
.form-group {
border-bottom: 0;
padding: 0;
}
}
// Groups accept/decline to join group buttons out of alignment, this needs porting back to raw
.group-request {
.form-group {
border-bottom: 0;
padding: 0;
.button {
display: inline-block;
}
}
}
\ No newline at end of file
......@@ -2,10 +2,6 @@
background-color: #f3f8fa;
border-top: 0;
border-radius: 0;
h2 {
clear: none;
}
.prevpage {
color: $btn-primary-color;
background-color: $btn-primary-bg;
......@@ -15,12 +11,6 @@
&:hover {
background-color: lighten($btn-primary-bg, 5%);
}
&:before {
font-family: 'FontAwesome';
content: $fa-var-arrow-circle-left;
margin-right: 5px;
}
}
.nextpage {
color: $btn-primary-color;
......@@ -31,11 +21,5 @@
&:hover {
background-color: lighten($btn-primary-bg, 5%);
}
&:after {
font-family: 'FontAwesome';
content: $fa-var-arrow-circle-right;
margin-left: 5px;
}
}
}
.footer {
background-color: transparent;
background-color: rgba(255, 255, 255, 0.7);
border-top: 5px solid $brand-default;
.footer-nav {
......
......@@ -10,9 +10,9 @@ body {
.main-content {
margin-top: 0;
padding-top: 25px;
padding-top: 20px;
.main {
padding-top: 0;
padding-top: 20px;
}
}
......
......@@ -55,13 +55,6 @@
.btn {
margin-left: 5px;
font-size: 13px;
background-color: #0591ce;
&:focus,
&:hover {
background-color: lighten(#0591ce, 5%);
color: #FFFFFF;
}
}
}
}
......@@ -13,4 +13,308 @@
font-size: 11px;
}
}
}
// 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;
}
}
}
}
// custom icons to some blocks
.bt-newviews .panel-heading:before {
content: $fa-var-bullhorn;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-inbox .panel-heading:before {
content: $fa-var-inbox;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-myviews .panel-heading:before {
content: $fa-var-file;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-filedownload .panel-heading:before {
content: $fa-var-download;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-folder .panel-heading:before {
content: $fa-var-folder;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-gallery .panel-heading:before {
content: $fa-var-picture-o;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-internalmedia .panel-heading:before {
content: $fa-var-video-camera;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-pdf .panel-heading:before {
content: $fa-var-file-pdf-o;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-html .panel-heading:before {
content: $fa-var-code;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-blog .panel-heading:before {
content: $fa-var-pencil;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-blogpost .panel-heading:before {
content: $fa-var-file-text;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-recentposts .panel-heading:before {
content: $fa-var-clock-o;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-taggedposts .panel-heading:before {
content: $fa-var-tags;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-comment .panel-heading:before {
content: $fa-var-comment;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-annotation .panel-heading:before {
content: $fa-var-pencil-square-o;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-creativecommons .panel-heading:before {
content: $fa-var-creative-commons;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-navigation .panel-heading:before {
content: $fa-var-location-arrow;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-plans .panel-heading:before {
content: $fa-var-check-square-o;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-recentforumposts .panel-heading:before {
content: $fa-var-comments;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-textbox .panel-heading:before {
content: $fa-var-pencil-square-o;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);
padding-right: 5px;
}
.bt-profileinfo .panel-heading:before {
content: $fa-var-info;
font-family: FontAwesome;
font-weight: 300;
color: rgba(255, 255, 255, 0.6);