Commit 07e4220b authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

NEW: optionally include parent theme css

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I59856e71b5aeba04474a017c4fd9d381c1ae56ac
parent dd18d93c
// Custom component variables (non-bootstrap components)
//Arrow compoanent variables
$arrow-color: lighten(desaturate($brand-primary, 22%), 43%);
$arrow-text-color: $text-color;
$arrow-link-color: $link-color;
$arrow-link-hover-color: $text-color;
$arrow-link-active-color: $text-color;
// color for the secondary title in sections (cf. groups)
$section-heading-color: #999;
This source diff could not be displayed because it is too large. You can view the blob instead.
<head data-basehref="{$WWWROOT}">
<meta name="generator" content="Mahara {$SERIES} (https://mahara.org)" />
<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta property="og:title" content="{$PAGETITLE}" />
<meta property="og:description" content="{$sitedescription4facebook}" />
<meta property="og:image" content="{$sitelogo4facebook}" />
<meta name="viewport" id="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=10.0,initial-scale=1.0" />
{if isset($PAGEAUTHOR)}<meta name="author" content="{$PAGEAUTHOR}">{/if}
<title>{$PAGETITLE}</title>
<script type="text/javascript">
var config = {literal}{{/literal}
'theme': {$THEMELIST|safe},
'sesskey' : '{$SESSKEY}',
'wwwroot': '{$WWWROOT}',
'loggedin': {$USER->is_logged_in()|intval},
'userid': {$USER->get('id')},
'mobile': {if $MOBILE}1{else}0{/if},
'handheld_device': {if $HANDHELD_DEVICE}1{else}0{/if},
'cc_enabled': {$CC_ENABLED|intval}
{literal}}{/literal};
</script>
{$STRINGJS|safe}
{foreach from=$JAVASCRIPT item=script}
<script type="text/javascript" src="{$script}"></script>
{/foreach}
{if isset($INLINEJAVASCRIPT)}
<script type="text/javascript">
{$INLINEJAVASCRIPT|safe}
</script>
{/if}
{foreach from=$HEADERS item=header}
{$header|safe}
{/foreach}
{foreach from=$STYLESHEETLIST item=cssurl}
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<script type="text/javascript" src="{$WWWROOT}/lib/bootstrap/assets/javascripts/bootstrap.js?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/bootstrap-accessibility.min.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{$WWWROOT}js/jquery.rating.js?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/masonry.min.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/pieform.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/block.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/formtabs.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/filebrowser.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/theme.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{theme_url filename='js/notification.js'}?v={$CACHEVERSION}"></script>
<script type="text/javascript" src="{$WWWROOT}js/css.js?v={$CACHEVERSION}"></script>
<link rel="shortcut icon" href="{$WWWROOT}favicon.ico?v={$CACHEVERSION}" type="image/vnd.microsoft.icon">
{if $ADDITIONALHTMLHEAD}{$ADDITIONALHTMLHEAD|safe}{/if}
{if $COOKIECONSENTCODE}{$COOKIECONSENTCODE|safe}{/if}
</head>
{dynamic}{flush}{/dynamic}
......@@ -11,9 +11,13 @@
$theme = new stdClass();
$theme->displayname = 'Default';
/* Set parent to boolean FALSE to specify the theme has no parent */
// Set parent to boolean FALSE to specify the theme has no parent
$theme->parent = 'raw';
// this theme includes all css via sass, so we don't need raw's css.
$theme->overrideparentcss = true;
/**
* The following themeconfig options are available. If you make new themeconfig
* options please add them here and explain what they do.
......@@ -23,4 +27,4 @@ $theme->parent = 'raw';
$theme->skins = true;
/* Limit this theme to certain institutions */
// $theme->institutions = array('institution_a', 'institution_b');
\ No newline at end of file
// $theme->institutions = array('institution_a', 'institution_b');
......@@ -26,7 +26,7 @@
<div class="panel-footer has-form">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn btn-default btn-sm">
<span class="fa fa-plus text-primary mrs"></span>
<span class="fa fa-plus text-success mrs"></span>
{str tag=addpost section=artefact.blog}
</a>
<div class="pull-right">
......
{include file="header.tpl"}
<div class="text-right btn-top-right btn-group btn-group-top">
<a class="btn btn-default settings" href="{$WWWROOT}artefact/blog/new/index.php">
<span class="fa fa-lg fa-plus text-primary prs"></span>
<span class="fa fa-lg fa-plus text-success prs"></span>
{str section="artefact.blog" tag="addblog"}
</a>
</div>
......
{include file="header.tpl"}
<div class="text-right btn-top-right btn-group btn-group-top">
<a class="btn btn-default addpost" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">
<span class="fa fa-lg fa-plus prs text-primary"></span>
<span class="fa fa-lg fa-plus prs text-success"></span>
{str section="artefact.blog" tag="addpost"}
</a>
{if !$blog->get('locked')}
......
......@@ -75,7 +75,7 @@
{if $post->allowcomments}
<p class="text-right">
<a class="addcomment text-thin" href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&view={$options.viewid}">
<span class="fa fa-lg fa-plus text-primary prs"></span>
<span class="fa fa-lg fa-plus text-success prs"></span>
{str tag=addcomment section=artefact.comment}
</a>
</p>
......
......@@ -16,7 +16,7 @@
<tr>
<td colspan="4" class="text-right">
<button id="settings_default" type="submit" class="submit btn btn-default" name="default">
<span class="fa fa-check fa-lg text-primary prs"></span>
<span class="fa fa-check fa-lg text-success prs"></span>
{str tag="setdefault" section=artefact.file}
</button>
<button id="settings_delete" type="submit" class="delete btn btn-default" name="delete">
......
<div class="text-right">
<a class="btn btn-default" href="{$WWWROOT}artefact/internal/socialprofile.php">
<span class="fa fa-lg fa-plus text-primary prs"></span>
<span class="fa fa-lg fa-plus text-success prs"></span>
{str tag=newsocialprofile section=artefact.internal}
</a>
</div>
......
{include file="header.tpl"}
<div class="btn-group btn-group-top">
<a class="btn btn-default" href="{$WWWROOT}artefact/plans/new.php">
<span class="fa fa-plus fa-lg prs text-primary"></span>
<span class="fa fa-plus fa-lg prs text-success"></span>
{str section="artefact.plans" tag="newplan"}</a>
</div>
{if !$plans.data}
......
{include file="header.tpl"}
<div class="text-right btn-top-right btn-group btn-group-top">
<a class="btn btn-default settings" href="{$WWWROOT}artefact/plans/new.php?id={$plan}">
<span class="fa fa-lg fa-plus text-primary prs"></span>
<span class="fa fa-lg fa-plus text-success prs"></span>
{str section="artefact.plans" tag="newtask"}
</a>
</div>
......
......@@ -3,7 +3,7 @@
{if $admin}
<div id="forumbtn" class="text-right btn-top-right btn-group btn-group-top">
<a href="{$WWWROOT}interaction/edit.php?group={$groupid}&amp;plugin=forum" class="btn btn-default newforum">
<span class="fa fa-plus fa-lg prs text-primary"></span>
<span class="fa fa-plus fa-lg prs text-success"></span>
{str tag="newforum" section=interaction.forum}
</a>
</div>
......
......@@ -7,7 +7,7 @@
{if $membership && ($moderator || ($forum->newtopicusers != 'moderators') && $ineditwindow) }
<a href="{$WWWROOT}interaction/forum/edittopic.php?forum={$forum->id}" class="btn btn-default newforumtopic">
<span class="fa fa-plus fa-lg prs text-primary"></span>
<span class="fa fa-plus fa-lg prs text-success"></span>
{str tag="newtopic" section="interaction.forum"}
</a>
{if $admin}
......
......@@ -147,7 +147,7 @@ $output .= '<div id="createcustomlayoutpane" class="row col-static">'
// 'Add row' button
$output .='<button type="button" name="addrow" class="btn btn-sm btn-default mtm" id="addrow" onclick="CustomLayoutManager.customlayout_add_row()">'
.'<span class="fa fa-lg fa-plus-circle prm text-primary"></span>'
.'<span class="fa fa-lg fa-plus-circle prm text-success"></span>'
. get_string('addarow', 'view')
.'</button>'
. '</div>';
......
$arrow-color: lighten(desaturate($brand-primary, 22%), 43%);
.arrow-bar {
@include border-radius(3px);
overflow: hidden;
......@@ -18,6 +16,20 @@ $arrow-color: lighten(desaturate($brand-primary, 22%), 43%);
display: block;
}
.nav-inpage.nav > li {
> a {
color: $arrow-link-color;
&:hover,
&:focus {
color: $arrow-link-hover-color;
}
}
&.active {
a {
color: $arrow-link-active-color;
}
}
}
.arrow {
float: left;
......@@ -42,7 +54,7 @@ $arrow-color: lighten(desaturate($brand-primary, 22%), 43%);
.text {
@include ellipsis(true);
display: block;
color: $text-color;
color: $arrow-text-color;
font-weight: 700;
}
}
......
......@@ -5,7 +5,7 @@ $height: 28px;
.switchbox.form-group {
> label {
vertical-align: bottom;
line-heigth: $height;
line-height: $height;
}
}
......@@ -26,9 +26,9 @@ $height: 28px;
+ .switch-label {
@include tab-focus;
outline-color: #66afe9;
.switch-inner:before,
.switch-inner:before,
.switch-inner:after {
background-color: darken($brand-default, 5%);
background-color: darken($brand-default, 5%);
}
}
}
......@@ -37,43 +37,43 @@ $height: 28px;
.switch-label {
@include border-radius(3px);
display: block;
overflow: hidden;
display: block;
overflow: hidden;
cursor: pointer;
padding: 0;
min-width: 0;
margin: 0;
&:hover {
.switch-inner:before,
.switch-inner:before,
.switch-inner:after {
background-color: darken($brand-default, 5%);
background-color: darken($brand-default, 5%);
}
}
}
.switch-inner {
@include transition(margin $transition);
display: block;
width: 200%;
display: block;
width: 200%;
margin-left: -100%;
&:before,
&:before,
&:after {
@include box-sizing(border-box);
@include box-shadow(none);
background-color: $brand-default;
background-color: $brand-default;
border: 1px solid $btn-default-border;
display: block;
float: left;
width: 50%;
height: $height;
padding: 0;
display: block;
float: left;
width: 50%;
height: $height;
padding: 0;
line-height: 26px;
font-size: 14px;
font-size: 14px;
text-transform: capitalize;
}
}
&:before {
content:'';
padding-left: 10px;
......@@ -95,22 +95,22 @@ $height: 28px;
.switch-indicator {
@include transition(all $transition);
@include border-radius(20px);
display: block;
width: 10px;
display: block;
width: 10px;
height:10px;
margin: 6px 7px;
background: rgba($brand-danger, 0.8);
border: 1px solid rgba(darken($brand-danger, 5%), 0.8);
position: absolute;
top: 3px;
//bottom: 0;
position: absolute;
top: 3px;
//bottom: 0;
right: 38px;
}
input:checked + .switch-label .switch-indicator {
right: 0px;
background-color: rgba($brand-primary, 0.8);
border: 1px solid rgba(darken($brand-primary, 5%), 0.8);
background-color: rgba($brand-success, 0.8);
border: 1px solid rgba(darken($brand-success, 5%), 0.8);
~ .off {
text-indent: 50%;
......@@ -139,4 +139,4 @@ $height: 28px;
text-indent: -50%;
}
}
}
\ No newline at end of file
}
......@@ -17,14 +17,14 @@ $logged-in-height-mobile: 100px;
@include clearfix;
padding: 13px 15px;
height: $logged-in-height;
border-top: 3px solid $mahara-green-bright;
border-top: 3px solid $brand-primary;
background-color: darken($panel-default-heading-bg, 3%);
@media (min-width: $screen-sm-min ) and (max-width: $screen-lg-min ) {
height: $logged-in-height-mobile;
padding: 7px 15px;
}
h2 {
margin: 5px 0 3px;
font-weight: bold;
......@@ -44,11 +44,11 @@ $logged-in-height-mobile: 100px;
@include border-radius(50%);
position: relative;
float: left;
background-color: $mahara-green-bright;
background-color: $brand-primary;
width: 60px;
height: 60px;
text-align:center;
.fa {
color: #fff;
padding-top:16px;
......@@ -63,7 +63,7 @@ $logged-in-height-mobile: 100px;
padding: 10px 15px;
border: 1px solid $gray-lighter;
p {
p {
margin-bottom: 0;
color: $text-color;
}
......@@ -122,7 +122,7 @@ $logged-in-height-mobile: 100px;
position: relative;
display: inline-block;
z-index: 2;
background-color: darken($mahara-green-bright, 8%);
background-color: darken($brand-primary, 8%);
height: $logged-in-height;
margin-right: 15px;
vertical-align: top;
......
......@@ -40,7 +40,6 @@
}
.navbar-brand {
color:#fff;
padding: 13px 15px;
margin-left: -10px;
border-bottom:1px solid lighten($navbar-inverse-bg, 2%);
......
// Variables
// --------------------------
$fa-font-path: "../fonts/font-awesome" !default; // relative to compiled css
$fa-font-path: "../../../raw/static/fonts/font-awesome" !default; // relative to compiled css
$fa-font-size-base: 15px !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.3.0/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: fa !default;
......
Supports Markdown
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