Commit 038b52dd authored by Pat Kira's avatar Pat Kira Committed by Robert Lyon

IE9 fixes (BUG 1465107)

Add blessCSS

behatnotneeded - styling only

Change-Id: I4019ccca069dba999a3457fda7f51d540af11264
parent e73f228c
......@@ -29,7 +29,7 @@ function smarty_core() {
* @param Smarty | an initialized smarty object
* @param String | the name of the icon to include (eg "icon-university")
*/
function setpageicon($smarty, $icon){
function setpageicon($smarty, $icon) {
$smarty->assign('pageicon', 'icon ' . $icon);
}
......@@ -44,7 +44,7 @@ function setpageicon($smarty, $icon){
* @return array
*/
function get_stylesheets_for_current_page($stylesheets, $extraconfig){
function get_stylesheets_for_current_page($stylesheets, $extraconfig) {
global $USER, $SESSION, $THEME, $HEADDATA, $langselectform;
......@@ -52,7 +52,7 @@ function get_stylesheets_for_current_page($stylesheets, $extraconfig){
$allstylesheets = $THEME->get_url('style/style.css', true);
// determine if we want to include the parent css
if(isset($THEME->overrideparentcss) && $THEME->overrideparentcss && $THEME->parent){
if (isset($THEME->overrideparentcss) && $THEME->overrideparentcss && $THEME->parent) {
unset($allstylesheets[$THEME->parent]);
}
......
// Include 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 postcss = require('gulp-postcss');
var path = require('path');
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 () {
return gulp.src('sass/**/*.scss')
.pipe(sass({
paths: [ path.join(__dirname, 'sass', 'includes') ]
.pipe(sass().on('error', sass.logError))
.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(bless())
.pipe(gulp.dest('style/'));
});
// Watch Files For Changes
// Watch files for changes
gulp.task('watch', function() {
gulp.watch('sass/**/*.scss', ['css']);
gulp.watch('sass/**/*.scss', ['sass']);
});
// Default Task
gulp.task('default', ['watch']);
// Default task (recompile on init before watching)
gulp.task('default', ['sass', 'watch']);
......@@ -4,14 +4,13 @@
"description": "The base for Mahara themes",
"main": "gulpfile.js",
"dependencies": {
"es6-promise": "^3.0.2",
"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",
"autoprefixer-core": "^5.2.0",
"gulp-sass": "^2.0.1",
"path": "^0.11.14"
"gulp-sass": "^2.0.1"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
}
......
......@@ -6,3 +6,34 @@
// * Please comment your code to make it easier for someone to fix or hunt down later.
// *
// *
// IE9 specific styles
.ie9 {
// dropdown group
.dropdown,
.pieform {
.picker {
width: 218px;
}
.picker:before {
content: "";
}
select.form-control {
padding: 0;
}
}
.admin-user-search .dropdown-group{
.picker {
@media (min-width: $screen-sm-min) {
width: 300px;
}
}
.dropdown-group .with-dropdown {
@media (min-width: $screen-sm-min) {
width: 282px;
}
}
}
}
......@@ -19,18 +19,16 @@
}
&.form-group {
margin-left: 11px;
border-bottom: none;
.with-heading & {
margin-left: 15px;
}
}
.with-dropdown {
position: absolute;
top: 0;
left: -5px;
left: 0;
padding: 0 5px;
width: 210px;
width: 200px;
z-index: 2;
float: left;
height: $input-height-base;
......@@ -39,7 +37,7 @@
margin-top: 24px;
}
label {
margin-left: -10px;
margin-left: -5px;
width: auto;
min-width: 0;
}
......@@ -87,7 +85,7 @@
cursor: pointer;
position: absolute;
top: 0;
width: 230px;
width: 240px;
z-index: 5;
}
......@@ -103,14 +101,16 @@
// User search dropdown-group
.admin-user-search {
.picker {
@media (min-width: $screen-sm-min) {
width: 300px;
.dropdown-group {
.picker {
@media (min-width: $screen-sm-min) {
width: 300px;
}
}
}
.dropdown-group .with-dropdown {
@media (min-width: $screen-sm-min) {
width: 280px;
.dropdown-group .with-dropdown {
@media (min-width: $screen-sm-min) {
width: 270px;
}
}
}
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -40,7 +40,7 @@
<div class="skin-content">
{if $skin.editable}
<a title="{str tag=clicktoedit section=skin}" href="{$WWWROOT}skin/design.php?id={$skin.id}{if $siteskins}&site=1{/if}">
<img src="{$WWWROOT}skin/thumb.php?id={$skin.id}" alt="{str(tag=skinpreviewedit section=skin arg1=$skin.title)|escape}" width="100%" height="auto">
<img src="{$WWWROOT}skin/thumb.php?id={$skin.id}" alt="{str(tag=skinpreviewedit section=skin arg1=$skin.title)|escape}" width="100%">
</a>
{else}
<img src="{$WWWROOT}skin/thumb.php?id={$skin.id}" alt="{str(tag=skinpreview section=skin arg1=$skin.title)|escape}" width="240" height="135">
......
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