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

Changes to the Primary school theme by Evonne 



Change-Id: I721972ed83bb51577d791f64841937ac3c1c4681
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 426c5299
Hide whitespace changes
Inline Side-by-side
htdocs/theme/primaryschool/sass/_custom.scss
View file @ 03383329
// Generic custom css (anything longer than a screen view should have its own component file)
//custom main nav
.main-nav .nav > {
li > a {
font-weight: bold;
color: #FFFFFF;
&:before {
font-family: 'FontAwesome';
font-weight: normal;
padding-right: 5px;
font-size: 19px;
color: #FFFFFF;
}
&:focus,
&:hover {
color: #FFFFFF;
}
}
.home {
> a {
background-color: #0591ce;
&:before {
content: $fa-var-tachometer;
}
&:focus,
&:hover {
background-color: lighten(#0591ce, 5%);
}
}
&.active {
> a:before {
color: #0591ce;
}
}
}
.content {
> a {
background-color: #ca0238;
&:before {
content: $fa-var-pencil-square;
}
&:focus,
&:hover {
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;
li {
a {
color: #FFFFFF;
}
&.active a {
color: #000000;
}
}
}
}
.myportfolio {
> a {
background-color: #f29907;
&:before {
content: $fa-var-file;
}
&:focus,
&:hover {
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 {
background-color: #799323;
&:before {
content: $fa-var-users;
}
&:focus,
&:hover {
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 {
background-color: #773f97;
&:before {
content: $fa-var-cog;
}
&:focus,
&:hover {
background-color: lighten(#773f97, 2%);
}
}
&.active > a:before {
color: #773f97;
}
}
.active > a {
background-color: #FFFFFF;
&:focus,
&:hover {
color: #FFFFFF;
&:before {
color: #FFFFFF;
}
}
}
}
// 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;
}
}
}
// Tag result page
.mytags {
margin-bottom: 25px;
.tagfreq.badge {
font-weight: 300;
font-size: 10px;
padding: 3px 5px;
margin-bottom: 10px;
vertical-align: super;
}
}
// custom block heading
.column-layout {
&:nth-child(3n+1) {
......@@ -300,35 +90,34 @@
}
}
// makes the edit page toolbar position more fitting for this theme
// makes the edit page toolbar position more fitting for this theme, plus responsive position
.toolbar-affix.affix {
top: 110px;
@media (max-width: $screen-sm-min) {
top: 0;
}
}
// makes certain buttons primary colour
.col-collapse-offset.col-with-collapse .btn {
color: #fff;
background-color: $brand-primary;
border-color: darken($btn-primary-bg, 5%);
.icon {
color: #fff;
// viewfooter
.viewfooter {
padding: 10px 15px !important;
background-color: $panel-default-heading-bg;
border-radius: 10px;
margin-top: 20px;
h3:first-child {
margin-top: 0;
}
&:focus,
&:hover {
background-color: lighten($brand-primary, 5%);
h4:first-child {
margin-top: 0;
}
}
.submitcancel .btn {
color: #fff;
background-color: $brand-primary;
border-color: darken($btn-primary-bg, 5%);
.icon {
color: #fff;
}
&:focus,
&:hover {
background-color: lighten($brand-primary, 5%);
.pieform {
.files {
.btn {
margin-left: 0; // fixes the attach file btn alignment
}
}
}
}
......@@ -357,4 +146,29 @@
// copy page table buttons
.searchlist .right .form-as-button .btn-sm {
margin-bottom: 3px;
}
\ No newline at end of file
}
// 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 {
&.delete-comment {
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;
}
}
htdocs/theme/primaryschool/sass/components/_arrow-bar.scss
View file @ 03383329
.arrow-bar {
.nav-inpage {
&.nav {
> li {
> a {
margin-bottom: 9px;
}
}
}
}
.arrow {
width: auto;
@media (max-width: $screen-md-min) {
......@@ -6,8 +16,8 @@
}
}
// to theme the Résumé nav differently from groups
&.Résumé {
// to theme the Résumé nav red
&.resume {
background-color: lighten(#ca0238, 5%);
.arrow {
......@@ -25,4 +35,24 @@
}
}
}
// to theme the Groups nav green
&.group {
background-color: lighten(#799323, 5%);
.arrow {
background-color: #799323;
&:after {
border-left: 14px solid #799323;
}
}
.nav-inpage {
&.nav > li {
&.active > a,
&.active > button, {
color: #799323;
}
}
}
}
}
\ No newline at end of file
htdocs/theme/primaryschool/sass/components/_btn.scss
View file @ 03383329
......@@ -52,3 +52,30 @@
}
}
}
// makes certain buttons primary colour
.col-collapse-offset.col-with-collapse .btn {
color: #fff;
background-color: $brand-primary;
border-color: darken($btn-primary-bg, 5%);
.icon {
color: #fff;
}
&:focus,
&:hover {
background-color: lighten($brand-primary, 5%);
}
}
.submitcancel .btn {
color: #fff;
background-color: $brand-primary;
border-color: darken($btn-primary-bg, 5%);
.icon {
color: #fff;
}
&:focus,
&:hover {
background-color: lighten($brand-primary, 5%);
}
}
htdocs/theme/primaryschool/sass/components/_indicator.scss
View file @ 03383329
.expand-indicator,
.move-indicator {
margin-left: -4px;
.panel-secondary & {
color: #FFF;
}
......
htdocs/theme/primaryschool/sass/components/_toggles.scss
View file @ 03383329
......@@ -13,11 +13,16 @@
margin-top: 0;
}
.header {
.navbar-toggle {
margin-top: 7px;
}
}
.navbar-showchildren {
background-color: transparent;
border-radius: 3px 3px 0 0;
color: #FFF;
height: 35px;
height: 37px;
&:hover,
&:focus {
.icon {
......@@ -31,4 +36,10 @@
&.collapsed {
height: auto;
}
}
.adminnav {
.navbar-showchildren {
height: 35px;
}
}
\ No newline at end of file
htdocs/theme/primaryschool/sass/features/_collection-navigation.scss 0 → 100755
View file @ 03383329
.collection-nav {
background-color: #f3f8fa;
border-top: 0;
border-radius: 0;
h2 {
clear: none;
}
.prevpage {
color: $btn-primary-color;
background-color: $btn-primary-bg;
border-color: $btn-primary-border;
&:focus,
&: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;
background-color: $btn-primary-bg;
border-color: $btn-primary-border;
&:focus,
&:hover {
background-color: lighten($btn-primary-bg, 5%);
}
&:after {
font-family: 'FontAwesome';
content: $fa-var-arrow-circle-right;
margin-left: 5px;
}
}
}
htdocs/theme/primaryschool/sass/features/_dashboard-widget.scss
View file @ 03383329
......@@ -7,29 +7,28 @@ $logged-in-height-phone: 130px;
.remove-widgets {
font-size: $font-size-small - 1;
}
.thumbnail-widget {
position: relative;
display: inline-block;
margin-bottom: 10px;
margin-left: 0;
vertical-align: top;
@media (min-width: $screen-sm-min ) {
float:left;
width: 10 / 4 * 10%;
padding: 0;
padding-left: 2%;
&.first {
padding-left: 0;
}
}
@media (min-width: $screen-sm-min ) and (max-width: $screen-lg-min ) {
width: 10 / 3.7 * 10%;
border-left: 0;
}
@media (max-width: $screen-sm-min ) {
width: 10 / 3 * 10%;
width: 10 / 3.1 * 10%;
border-left: 0;
}
.widget {
......@@ -182,12 +181,12 @@ $logged-in-height-phone: 130px;
background-color: transparent;
position: relative;
top: -85px;
top: -80px;
text-align: center;
@media (min-width: $screen-sm-min ) and (max-width: $screen-lg-min ) {
height: $logged-in-height-tablet;
top: -65px;
top: -60px;
padding: 10px 15px;
}
......@@ -198,7 +197,7 @@ $logged-in-height-phone: 130px;
h2 {
font-family: 'GoodDog', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
margin: 0 0 13px 0;
margin: 0 0 5px 0;
font-weight: normal;
font-size: 42px;
color: #FFFFFF;
......@@ -257,6 +256,7 @@ $logged-in-height-phone: 130px;
@media (max-width: $screen-sm-min ) {
top: 0;
padding: 10px 0 0 0;
}
p {
......@@ -292,14 +292,27 @@ $logged-in-height-phone: 130px;
}
h2 {
margin: 0 0 13px 0;
margin: 0 0 5px 0;
font-weight: normal;
@media (min-width: $screen-sm-min ) and (max-width: $screen-lg-min ) {
font-size: 32px;
margin: 0;
}
@media (max-width: $screen-xs-min) {
font-size: 26px;
}
}
p {
margin: 0;
font-size: $font-size-small;
color: #FFFFFF;
@media (max-width: $screen-sm-min ) {
margin: 0 0 0 10px;
}
}
}
......@@ -331,6 +344,7 @@ $logged-in-height-phone: 130px;
font-weight: normal;
opacity: 1;
height: auto;
padding: 10px 0 0 0;
}
p {
......@@ -344,6 +358,10 @@ $logged-in-height-phone: 130px;
}
.logged-in:hover {
.widget-heading {
background-color: $brand-primary;
}
.widget-detail {
@include transition(0.3s);
opacity: 1;
......@@ -364,7 +382,5 @@ $logged-in-height-phone: 130px;
}
.dashboard-editable {
margin-top: $grid-gutter-width;
padding: ($grid-gutter-width - 10) 0;
border-top: 1px solid #cccccc;