Commit d3adae31 authored by Lisa Wood's avatar Lisa Wood Committed by Robert Lyon

Design change to modern theme by Lisa

Change-Id: I77f74c99e963551ade1621717c33d13a2567d21e
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 71f286e7
...@@ -29,7 +29,8 @@ mahara-*.zip ...@@ -29,7 +29,8 @@ mahara-*.zip
/debian/mahara-apache2.postrm.debhelper /debian/mahara-apache2.postrm.debhelper
/debian/mahara-apache2.substvars /debian/mahara-apache2.substvars
/debian/mahara-apache2 /debian/mahara-apache2
.DS_Store *.DS_Store
.__*
/external /external
logfile logfile
node_modules/ node_modules/
// Include gulp // Include gulp
var gulp = require('gulp'); var gulp = require('gulp');
// Include Our Plugins // Polyfill so we don't need >= node 0.12
require('es6-promise').polyfill();
// Include plugins
var sass = require('gulp-sass'); var sass = require('gulp-sass');
var postcss = require('gulp-postcss');
var path = require('path');
var minifyCSS = require('gulp-minify-css'); var minifyCSS = require('gulp-minify-css');
var autoprefixer = require('autoprefixer-core'); var autoprefixer = require('gulp-autoprefixer');
var bless = require('gulp-bless');
// Turn sass into css // Turn sass into css, prefix, minify and bless
gulp.task('sass', function () { gulp.task('sass', function () {
return gulp.src('sass/**/*.scss') return gulp.src('sass/**/*.scss')
.pipe(sass({ .pipe(sass().on('error', sass.logError))
paths: [ path.join(__dirname, 'sass', 'includes') ] .pipe(autoprefixer({
browsers: ['last 4 version'],
cascade: false
})) }))
.on('error', function(err){
console.log(err); // catch and log the error, don't kill the process
this.emit('end');
})
.pipe(gulp.dest('style/'));
});
// Prefix and minify css files
// this will first run the 'sass' task above, then this one
gulp.task('css', ['sass'], function () {
return gulp.src('style/*.css')
.pipe(postcss([ autoprefixer({ browsers: ['last 4 version'] }) ]))
.on('error', function(err){
console.log(err); // catch and log the error, don't kill the process
this.emit('end');
})
.pipe(minifyCSS()) .pipe(minifyCSS())
.pipe(bless())
.pipe(gulp.dest('style/')); .pipe(gulp.dest('style/'));
}); });
// Watch Files For Changes // Watch files for changes
gulp.task('watch', function() { gulp.task('watch', function() {
gulp.watch(['sass/**/*.scss', '../raw/sass/**/*.scss'], ['css']); gulp.watch('sass/**/*.scss', ['sass']);
}); });
// Default Task // Default task (recompile on init before watching)
gulp.task('default', ['watch']); gulp.task('default', ['sass', 'watch']);
{ {
"name": "mysubthemename", "name": "Modern",
"version": "1.0.0", "version": "1.0.0",
"description": "Mahara's mysubthemename theme", "description": "",
"main": "gulpfile.js", "main": "gulpfile.js",
"dependencies": { "dependencies": {
"es6-promise": "^3.0.2",
"gulp": "^3.9.0", "gulp": "^3.9.0",
"gulp-postcss": "^5.1.8", "gulp-autoprefixer": "^3.0.1",
"gulp-bless": "^3.0.1",
"gulp-minify-css": "^1.1.6", "gulp-minify-css": "^1.1.6",
"autoprefixer-core": "^5.2.0", "gulp-sass": "^2.0.1"
"gulp-sass": "^2.0.1",
"path": "^0.11.14"
}, },
"devDependencies": {},
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
} }
......
...@@ -5,11 +5,17 @@ ...@@ -5,11 +5,17 @@
} }
} }
.nav-inpage.nav { .nav-inpage.nav {
li > a { li {
color: #FFF; a {
&:hover {
color: #FFF; color: #FFF;
background-color: $theme-secondary-color; &:hover {
color: #FFF;
background-color: $theme-secondary-color;
}
}
&.active a {
background-color: #FFF;
color: #333;
} }
} }
} }
......
//adjust header and fixed elements for sitemessages
@for $i from 1 through 5 {
.header.message-count-#{$i} {
+ .main-nav {
@media (max-width: $screen-sm-min) {
margin-top: $i * 0px !important;
}
}
}
}
.user-icon { a.user-icon {
border: none; border: none;
padding: 0; padding: 0;
background: none; background: none;
img { img {
border-radius: 50%; border-radius: 50%;
border: 2px solid #FFF; border: 0px solid #FFF;
} }
&:hover {
background-color: transparent;
}
} }
\ No newline at end of file
...@@ -19,4 +19,4 @@ form#filter { ...@@ -19,4 +19,4 @@ form#filter {
margin-right: 4px; margin-right: 4px;
border-radius: 4px; border-radius: 4px;
} }
} }
\ No newline at end of file
/*
* Non-bootstrap column layout. Used by the page builder
*/
.column {
&.editing {
}
}
...@@ -8,11 +8,14 @@ header { ...@@ -8,11 +8,14 @@ header {
} }
.admin-title { .admin-title {
padding: 5px 10px; padding: 2px 8px;
margin-top: 24px; margin-top: 12px;
height: auto; height: auto;
background-color: $state-info-bg; background-color: darken($brand-secondary, 10%);
border-radius: 3px; border-radius: 3px;
a{
color: #FFF;
}
&:before, &:before,
&:after { &:after {
display: none; display: none;
......
...@@ -22,33 +22,36 @@ ...@@ -22,33 +22,36 @@
@media (max-width: 768px) { @media (max-width: 768px) {
.navbar-default .navbar-toggle { .navbar-inverse {
border-color: transparent; .navbar-toggle, {
background-color: lighten($theme-primary-color, 1%); border-color: transparent;
color: #FFF; background-color: lighten($theme-primary-color, 1%);
&:hover { color: #FFF;
background-color: lighten($theme-primary-color, 3%); &:hover {
background-color: lighten($theme-primary-color, 3%);
}
} }
} .navbar-showchildren:focus,
.navbar-showchildren:focus, .navbar-showchildren:hover {
.navbar-showchildren:hover { background: none;
background: none;
}
.main-nav {
margin-top: 0;
li > a {
border-bottom-color: darken($theme-primary-color, 10%);
} }
.main-nav {
.child-nav { margin-top: 0;
background-color: darken($theme-primary-color, 5%); li > a {
a { border-bottom-color: darken($theme-primary-color, 10%);
color: lighten($theme-primary-color, 60%);
} }
.active > a {
color: #FFF; .child-nav {
background-color: darken($theme-primary-color, 8%); background-color: darken($theme-primary-color, 5%);
a {
color: lighten($theme-primary-color, 60%);
}
.active > a {
color: #FFF;
background-color: darken($theme-primary-color, 8%);
}
} }
} }
} }
} }
...@@ -8,11 +8,17 @@ ...@@ -8,11 +8,17 @@
* This file is licensed under the same terms as Mahara itself * This file is licensed under the same terms as Mahara itself
*/ */
// Import theme based variables (colors, fonts, padding, etc) // Import theme based variables (colors, fonts, padding, etc)
@import "utilities/theme-variables"; // Import our brand variables @import "utilities/theme-variables"; // Import our brand variables
@import "utilities/bootstrap-variables"; // ...and our custom bootstrap variables file @import "utilities/bootstrap-variables"; // ...and our custom bootstrap variables file
@import "utilities/custom-variables"; // ...and our custom variables file @import "utilities/custom-variables"; // ...and our custom variables file
// Import raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/utilities/theme-variables";
@import "../../raw/sass/utilities/bootstrap-variables";
@import "../../raw/sass/utilities/custom-variables";
@import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file @import "../../raw/sass/utilities/bootstrap-index"; // bootstrap scss dependency file
@import "../../raw/sass/utilities/index"; // raw sass files (if you want heavier customisation you can copy this file and replace partials with your own sass) @import "../../raw/sass/utilities/index"; // raw sass files (if you want heavier customisation you can copy this file and replace partials with your own sass)
......
...@@ -16,4 +16,5 @@ $admin-title-bg: $brand-primary; ...@@ -16,4 +16,5 @@ $admin-title-bg: $brand-primary;
$dashboard-widget-bg: darken(#f9f9f9, 2%); $dashboard-widget-bg: darken(#f9f9f9, 2%);
$dashboard-widget-color: $brand-primary; $dashboard-widget-color: $brand-primary;
$help-icon-color: darken(#22C49C, 5%); $help-icon-color: darken(#22C49C, 5%);
\ No newline at end of file $rss-icon-color: #FE6500;
...@@ -5,4 +5,7 @@ ...@@ -5,4 +5,7 @@
$theme-primary-color: #374757; $theme-primary-color: #374757;
$theme-primary-color-dark: darken($theme-primary-color, 10%); $theme-primary-color-dark: darken($theme-primary-color, 10%);
$theme-secondary-color: #1EAE8B; $theme-secondary-color: #1EAE8B;
$theme-text-color: #545B5D; $theme-text-color: #545B5D;
\ No newline at end of file
$theme-text-lighttone-color: #888;
$theme-text-midtone-color: #888;
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
} }
@media (max-width: $screen-sm-min) { @media (max-width: $screen-sm-min) {
top: 0; top: 0;
+ .main-nav {
margin-top: $i * 0px;
}
} }
} }
} }
......
File mode changed from 100644 to 100755
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