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

Committing the changes to the 'Mahara' theme



Change-Id: Ie17cff123b443f60ef1553002c60d4bf6cdcecfd
Signed-off-by: default avatarRobert Lyon <robertl@learn-design.catalyst.net.nz>
parent eb53c7aa
......@@ -25,11 +25,11 @@
font-size: 11px;
}
.collapsed & {
color: #aaa;
color: $mahara-green;
}
a:hover &,
a:focus & {
color: $brand-success;
color: lighten($mahara-green, 5%);
}
}
......@@ -50,13 +50,14 @@
[data-toggle="collapse"].outer-link {
&.collapsed {
~ .collapse-indicator {
color: #aaa;
color: $mahara-green;
margin-top: 3px;
}
}
&:hover,
&:focus {
~ .collapse-indicator {
color: $brand-success;
color: lighten($mahara-green, 5%);
}
}
}
$logged-in-height: 200px;
$logged-in-height-mobile: 150px;
$logged-in-height-mobile: 120px;
.dashboard-widget-container {
......@@ -31,14 +31,23 @@ $logged-in-height-mobile: 150px;
margin: 5px 0 3px;
text-align: center;
color: $mahara-dark-brown;
@media (max-width: $screen-sm-min ) {
font-size: 20px;
margin-top: 0;
}
}
p {
margin: 0 40px;
font-size: 13px;
text-align: center;
@media (max-width: $screen-sm-min ) {
display: none;
}
}
a {
color: $link-color;
}
......@@ -48,21 +57,24 @@ $logged-in-height-mobile: 150px;
text-align:center;
margin-top: 10px;
margin-right: 0 !important;
@media (max-width: $screen-sm-min ) {
font-size: 30px;
padding-top: 5px;
margin-top: 5px;
}
.icon {
color: #fff;
padding-top:16px;
font-size: 72px;
@media (max-width: $screen-sm-min ) {
font-size: 50px;
}
&.icon-user {
padding-left:0; // the only one that is actually centered by default
}
}
}
......@@ -70,7 +82,7 @@ $logged-in-height-mobile: 150px;
padding: 0 10px;
vertical-align: middle;
display: block;
@media (max-width: $screen-sm-min ) {
display: none;
}
......@@ -92,7 +104,7 @@ $logged-in-height-mobile: 150px;
margin-right: 20px;
width: $logged-in-height;
padding: 0;
@media (max-width: $screen-sm-min ) {
width: $logged-in-height-mobile;
}
......
......@@ -3,6 +3,7 @@
background-image: url(../images/header-bkgd.png);
background-repeat: repeat-x;
background-position: left top;
height: 124px;
@media (max-width: $screen-sm-min) {
top: 0;
......@@ -46,7 +47,7 @@
margin-left: 25px;
font-family: $font-family-serif;
font-size: $font-size-large;
@media (min-width: 768px) {
display: inline-block;
}
......@@ -64,10 +65,14 @@
+ .container {
// if container is directly after header, then it will need a margin
margin-top: 50px;
margin-top: 75px;
@media (max-width: $screen-sm-min) {
margin-top: -30px;
margin-top: -20px;
}
h1 {
padding-top: 10px;
}
}
}
......@@ -5,7 +5,7 @@ body {
max-width:100%;
overflow-x:hidden;
@media (min-width: 768px) {
padding-top: 65px; // Move down content because we have a fixed navbar on desktop/tablet that is 50px tall
padding-top: 65px; // Move down content because we have a fixed navbar on desktop/tablet that is 65px tall
}
&.admin {
background-color: lighten($brand-default, 5%);
......
......@@ -2,7 +2,7 @@
fonf-family: $headings-font-family;
padding:0;
background: $mahara-green;
color: #FFF;
color: $mahara-green;
.username {
padding: 10px 75px 10px 15px;
......
......@@ -16,7 +16,7 @@
@media (min-width: $screen-md-min) {
padding:0;
font-size: 13px;
margin-top: 7px;
margin-top: -7px;
}
> li {
......
......@@ -18,14 +18,6 @@
> a.outer-link {
border-bottom: 2px solid $mahara-dark-brown;
border-radius: 3px;
background: none;
&.collapsed {
border-bottom: 0;
border-radius: 0;
background-color: $panel-default-heading-bg;
}
}
}
}
......
......@@ -16,6 +16,9 @@
margin: 0;
}
}
.icon {
color: $link-color;
}
// by default links in headings get display: block and padding.
// Use .secondary-link if you don't want this behaviour
a:not(.secondary-link) {
......
......@@ -2,6 +2,8 @@
.panel-secondary {
@include box-shadow(none);
background-color: transparent;
.admin & {
border-color: #ddd;
}
......
.panel {
background-color: #fbfaf5;
border: 0;
border-radius: 0;
form {
margin:0;
}
......@@ -9,7 +14,7 @@
small {
margin-top:5px;
line-height: 1.5em;
font-size: 0.8em;
font-size: 11px;
color: $gray;
display: block;
}
......@@ -28,10 +33,15 @@
dd {
color: $gray;
line-height: 1.5em;
font-size: 0.9em;
font-size: 11px;
}
}
.nav-pills {
margin: 0;
}
}
.panel-default > .panel-heading {
background-color: #f9f7ef;
border: 0;
}
......@@ -18,10 +18,7 @@ h1 {
}
// Add padding if there is no navigation
.header + .container h1 {
padding-top: 20px;
}
.header + .container
.page-header {
margin-bottom:20px;
~ .with-heading {
......
// Core variables and mixins
@import "../lib/font-awesome/font-awesome";
@import "../../../raw/sass/lib/font-awesome/font-awesome";
@import "mixins";
@import "classes"; // Custom utility classes
......@@ -82,12 +82,12 @@
// Supporting sass for library code
@import "../lib/meter.scss"; // progress bar (old/ported)
@import "../lib/select2";
@import "../lib/star";
@import "../lib/tinymce";
@import "../lib/draggable";
@import "../lib/graph";
@import "../../../raw/sass/lib/meter.scss"; // progress bar (old/ported)
@import "../../../raw/sass/lib/select2";
@import "../../../raw/sass/lib/star";
@import "../../../raw/sass/lib/tinymce";
@import "../../../raw/sass/lib/draggable";
@import "../../../raw/sass/lib/graph";
// Keep these files last to override all other style sheets
@import "../custom";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment