Commit 1acda1eb authored by Liam's avatar Liam Committed by Rebecca Blundell

Bug #1765276: Lots of changes to default, small changes to raw, including...

Bug #1765276: Lots of changes to default, small changes to raw, including adding the default flag to the custom variables

Change-Id: I9320f7bb9c5289d31ddd5785745d0b50b6663350
parent ee0da00e
...@@ -7554,14 +7554,14 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) { ...@@ -7554,14 +7554,14 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
'type' => 'hidden', 'type' => 'hidden',
'value' => $view->get_collection()->get('id'), 'value' => $view->get_collection()->get('id'),
); );
$form['elements']['text1']['value'] = get_string('submitthiscollectionto1', 'view') . ' '; $form['elements']['text1']['value'] = get_string('submitthiscollectionto1', 'view') . ' ';
} }
else { else {
$form['elements']['view'] = array( $form['elements']['view'] = array(
'type' => 'hidden', 'type' => 'hidden',
'value' => $viewid 'value' => $viewid
); );
$form['elements']['text1']['value'] = get_string('submitthisviewto1', 'view') . ' '; $form['elements']['text1']['value'] = get_string('submitthisviewto1', 'view') . ' ';
} }
return pieform($form); return pieform($form);
......
...@@ -7,3 +7,22 @@ ...@@ -7,3 +7,22 @@
color: $theme-primary-color; color: $theme-primary-color;
} }
} }
.btn-secondary, .drag-default-button {
background: $btn-secondary-bg;
margin-bottom: 0;
&:hover,
&:focus {
background: darken($btn-secondary-bg, 9.7%);
color: $btn-secondary-color;
border-color: darken($btn-secondary-border, 12%);
}
}
.btn-secondary {
background: darken($btn-secondary-bg, 4.75%);
&:hover,
&:focus {
background: darken($btn-secondary-bg, 14.5%);
}
}
...@@ -12,3 +12,16 @@ ...@@ -12,3 +12,16 @@
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
font-weight: 700; font-weight: 700;
} }
.list-group-item {
&.published {
background-color: #fff;
}
.list-group-item-controls {
.btn-group-top {
@include media-breakpoint-up(lg) {
margin-top: -13px;
}
}
}
}
.collection-nav {
background-color: $card-heading-bg;
}
...@@ -10,6 +10,14 @@ ...@@ -10,6 +10,14 @@
} }
} }
&.card {
&.blockinstance.card {
.card-header {
background-color: $card-heading-bg;
}
}
}
.blockinstance-controls .btn-group-top { .blockinstance-controls .btn-group-top {
@include media-breakpoint-down(lg) { @include media-breakpoint-down(lg) {
margin: 0; margin: 0;
......
...@@ -6,4 +6,9 @@ ...@@ -6,4 +6,9 @@
border-bottom: 2px solid #ddd; border-bottom: 2px solid #ddd;
} }
} }
&:not(.card-block).has-attachment {
.card-header a:not(.collapsed) {
border-bottom-width: 1px;
}
}
} }
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
} }
} }
.card-header .help a {
border: 0;
}
// sidebar card headings // sidebar card headings
.sidebar .card-secondary > .card-header { .sidebar .card-secondary > .card-header {
......
.card-secondary {
.card-header {
background: $card-heading-bg;
}
}
...@@ -45,6 +45,10 @@ ...@@ -45,6 +45,10 @@
font-weight: bold; font-weight: bold;
background-color: #3a4a22; background-color: #3a4a22;
color: #ffffff; color: #ffffff;
&:hover,
&:focus {
color: #FFFFFF;
}
} }
.navbar-toggle { .navbar-toggle {
.icon { .icon {
......
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
background-color: lighten(#bc9f54, 35%); background-color: lighten(#bc9f54, 35%);
color: #423017; color: #423017;
} }
} &.active {
.active > a { background-color: lighten(#bc9f54, 25%);
background-color: lighten(#bc9f54, 25%);
color: #423017;
border: 0;
border-bottom: 1px solid #bc9f54;
&:focus,
&:hover {
background-color: lighten(#bc9f54, 10%);
color: #423017; color: #423017;
border: 0; border: 0;
border-bottom: 1px solid #bc9f54; border-bottom: 1px solid #bc9f54;
&:focus,
&:hover {
background-color: lighten(#bc9f54, 10%);
color: #423017;
border: 0;
border-bottom: 1px solid #bc9f54;
}
} }
} }
} }
......
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
* This file is licensed under the same terms as Mahara itself * This file is licensed under the same terms as Mahara itself
*/ */
// Import raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/style";
// Import our theme based variables (colors, fonts, padding, etc) // Import our theme based variables (colors, fonts, padding, etc)
@import "utilities/theme-variables"; // Import our theme variables @import "utilities/theme-variables"; // Import our theme variables
@import "utilities/custom-variables"; // ...and our custom variables file
@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 raw default variables (colors, fonts, padding, etc)
@import "../../raw/sass/style";
@import "utilities/index"; // custom components / layout / forms / features @import "utilities/index"; // custom components / layout / forms / features
......
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
font-family: $headings-font-family;
}
...@@ -46,9 +46,9 @@ $state-danger-bg: lighten($brand-danger, 30%); ...@@ -46,9 +46,9 @@ $state-danger-bg: lighten($brand-danger, 30%);
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%); $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%);
// Buttons // Buttons
$btn-default-color: #333333; $btn-secondary-color: #333333;
$btn-default-bg: #F3F3F3; $btn-secondary-bg: $white;
$btn-default-border: #CCCCCC; $btn-secondary-border: #CCCCCC;
$btn-primary-color: #FFFFFF; $btn-primary-color: #FFFFFF;
$btn-primary-bg: #556d32; $btn-primary-bg: #556d32;
...@@ -105,7 +105,7 @@ $navbar-inverse-toggle-border-color: #fff; ...@@ -105,7 +105,7 @@ $navbar-inverse-toggle-border-color: #fff;
$card-inner-border: transparent; $card-inner-border: transparent;
$card-footer-bg: #f0f5ea; $card-footer-bg: #f0f5ea;
$card-primary-heading-bg: #fff; $card-heading-bg: #fff;
$card-secondary-border: #d9d9d9; $card-secondary-border: #d9d9d9;
$card-secondary-heading-bg: #FFFFFF; $card-secondary-heading-bg: #FFFFFF;
......
@import "../typography/tables"; @import "../typography/tables";
@import "../typography/typography";
// General customisation and component files go here... // General customisation and component files go here...
@import "../layout/footer"; @import "../layout/footer";
...@@ -12,6 +13,7 @@ ...@@ -12,6 +13,7 @@
@import "../layout/card/card-footer"; @import "../layout/card/card-footer";
@import "../layout/card/card-header"; @import "../layout/card/card-header";
@import "../layout/card/card-block"; @import "../layout/card/card-block";
@import "../layout/card/card-secondary";
// Navigation // Navigation
@import "../layout/nav/main-nav"; @import "../layout/nav/main-nav";
...@@ -26,5 +28,6 @@ ...@@ -26,5 +28,6 @@
// Feature related sass. We avoid this where we can in favour of reusable components // Feature related sass. We avoid this where we can in favour of reusable components
@import "../features/dashboard-widget"; @import "../features/dashboard-widget";
@import "../features/collection-navigation";
@import "../custom"; @import "../custom";
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
{if $config.selectmodal} {if $config.selectmodal}
<div id="{$prefix}_upload_browse" class="filebrowser in-collapsible"> <div id="{$prefix}_upload_browse" class="filebrowser in-collapsible">
{else} {else}
{if !$config.noselect}
<button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#{$prefix}_upload_browse"> <button type="button" class="btn btn-secondary" data-toggle="modal" data-target="#{$prefix}_upload_browse">
<span class="icon icon-paperclip icon-lg left" role="presentation" aria-hidden="true"></span> <span class="icon icon-paperclip icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=addafile section=artefact.file} {str tag=addafile section=artefact.file}
......
...@@ -458,6 +458,9 @@ td.action-list-copy { ...@@ -458,6 +458,9 @@ td.action-list-copy {
} }
} }
.btn-sm { .btn-sm,
.btn-group .btn.btn-sm {
font-size: $font-size-base / 1.1665;
border: 1px solid $btn-secondary-border;
padding: 0.14375rem 0.625rem; padding: 0.14375rem 0.625rem;
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
.card-control { .card-control {
display: block; display: block;
font-size: $font-size-base - 2; font-size: $font-size-base / 1.1665;
margin: 0; margin: 0;
min-width: 0; min-width: 0;
padding: 12px 0 12px 15px; padding: 12px 0 12px 15px;
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
} }
} }
input { input,
input[type='checkbox'] {
margin-top:0; margin-top:0;
} }
.control { .control {
......
...@@ -269,7 +269,7 @@ table.table tr { ...@@ -269,7 +269,7 @@ table.table tr {
// Unset border top on the first row of the table // Unset border top on the first row of the table
.table>tbody>tr:first-child>th, .table>tbody>tr:first-child>th,
.table>tbody>tr:first-child>td { .table>tbody>tr:first-child td {
border-top-width: 0; border-top-width: 0;
} }
......
...@@ -28,132 +28,132 @@ $assessment-completed-color: theme-color("success") !default; ...@@ -28,132 +28,132 @@ $assessment-completed-color: theme-color("success") !default;
// LEGACY BOOTSTRAP 3 VARIABLES // LEGACY BOOTSTRAP 3 VARIABLES
$navbar-height: 60px; $navbar-height: 60px !default;
$navbar-default-color: $link-color; $navbar-default-color: $link-color !default;
$navbar-default-bg: #fff; $navbar-default-bg: #fff !default;
$navbar-default-border: scale-color($navbar-default-bg, $lightness: -6.5%); $navbar-default-border: scale-color($navbar-default-bg, $lightness: -6.5%) !default;
// Navbar links // Navbar links
$navbar-default-link-color: $link-color; $navbar-default-link-color: $link-color !default;
$navbar-default-link-hover-color: $link-hover-color; $navbar-default-link-hover-color: $link-hover-color !default;
$navbar-default-link-hover-bg: #F1F1F1; $navbar-default-link-hover-bg: #F1F1F1 !default;
// Navbar toggle // Navbar toggle
$navbar-default-toggle-hover-bg: $navbar-default-link-hover-bg; $navbar-default-toggle-hover-bg: $navbar-default-link-hover-bg !default;
$navbar-default-toggle-icon-bar-bg: $link-color; $navbar-default-toggle-icon-bar-bg: $link-color !default;
$navbar-default-toggle-border-color: transparent; $navbar-default-toggle-border-color: transparent !default;
// Inverted navbar // Inverted navbar
// Reset inverted navbar basics // Reset inverted navbar basics
$navbar-inverse-bg: #F1F1F1; $navbar-inverse-bg: #F1F1F1 !default;
// Inverted navbar links // Inverted navbar links
$navbar-inverse-link-color: $link-color; $navbar-inverse-link-color: $link-color !default;
$navbar-inverse-link-hover-color: $link-hover-color; $navbar-inverse-link-hover-color: $link-hover-color !default;
$navbar-inverse-link-hover-bg: scale-color($navbar-inverse-bg, $lightness: -5.5%); $navbar-inverse-link-hover-bg: scale-color($navbar-inverse-bg, $lightness: -5.5%) !default;
$navbar-inverse-link-active-color: theme-color("text"); $navbar-inverse-link-active-color: theme-color("text") !default;
$navbar-inverse-link-active-bg: #F1F1F1; $navbar-inverse-link-active-bg: #F1F1F1 !default;
// Inverted navbar toggle // Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: $navbar-inverse-bg; $navbar-inverse-toggle-hover-bg: $navbar-inverse-bg !default;
$navbar-inverse-toggle-icon-bar-bg: scale-color($gray-500, $lightness: 37.5%); $navbar-inverse-toggle-icon-bar-bg: scale-color($gray-500, $lightness: 37.5%) !default;
//Fonts //Fonts
$line-height-computed: $font-size-base * $line-height-base; // ~20px $line-height-computed: $font-size-base * $line-height-base !default; // ~20px
$text-shadow: $white; $text-shadow: $white !default;
// Form states // Form states
$state-success-text: theme-color("success"); $state-success-text: theme-color("success") !default;
$state-success-bg: mix(theme-color("success"), #fff, 20%); $state-success-bg: mix(theme-color("success"), #fff, 20%) !default;
$state-success-border: darken(adjust-hue($state-success-bg, -10), 10%); $state-success-border: darken(adjust-hue($state-success-bg, -10), 10%) !default;
$state-info-text: #31708f; $state-info-text: #31708f !default;
$state-info-bg: #d9edf7; $state-info-bg: #d9edf7 !default;
$state-info-border: darken(adjust-hue($state-info-bg, -10), 7%); $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
$state-warning-text: #8a6d3b; $state-warning-text: #8a6d3b !default;
$state-warning-bg: #fcf8e3; $state-warning-bg: #fcf8e3 !default;
$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%); $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
$state-danger-text: #a94442; $state-danger-text: #a94442 !default;
$state-danger-bg: #f2dede; $state-danger-bg: #f2dede !default;
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%); $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
// Buttons + Forms // Buttons + Forms
$btn-secondary-color: $theme-text-color; $btn-secondary-color: $theme-text-color !default;
$btn-secondary-bg: #F9F9F9; $btn-secondary-bg: #F9F9F9 !default;
$btn-secondary-border: $secondary; $btn-secondary-border: $secondary !default;
$btn-primary-color: #fff; $btn-primary-color: #fff !default;
$btn-primary-bg: theme-color("primary"); $btn-primary-bg: theme-color("primary") !default;
$btn-primary-border: scale-color(theme-color("primary"), $lightness: -16%); $btn-primary-border: scale-color(theme-color("primary"), $lightness: -16%) !default;
$btn-dark-color: $btn-secondary-color; $btn-dark-color: $btn-secondary-color !default;
$btn-dark-bg: $gray-400; $btn-dark-bg: $gray-400 !default;
$btn-dark-border: $btn-secondary-border; $btn-dark-border: $btn-secondary-border !default;
$btn-success-color: #fff; $btn-success-color: #fff !default;
$btn-success-bg: theme-color("success"); $btn-success-bg: theme-color("success") !default;
$btn-success-border: scale-color(theme-color("success"), $lightness: -25%); $btn-success-border: scale-color(theme-color("success"), $lightness: -25%) !default;
$btn-link-disabled-color: $gray-300; $btn-link-disabled-color: $gray-300 !default;
// Cards // Cards
$card-text: $gray-700; $card-text: $gray-700 !default;
$card-border: #ddd; $card-border: #ddd !default;
$card-heading-bg: #f9f9f9; $card-heading-bg: #f9f9f9 !default;
$card-footer-bg: #f5f5f5; $card-footer-bg: #f5f5f5 !default;
$card-block-text: $gray-700; $card-block-text: $gray-700 !default;
$card-block-border: theme-color("primary"); $card-block-border: theme-color("primary") !default;
$card-block-heading-bg: darken($card-heading-bg, 2%); $card-block-heading-bg: darken($card-heading-bg, 2%) !default;
$card-secondary-text: $gray-900; $card-secondary-text: $gray-900 !default;
$card-secondary-border: lighten(theme-color("secondary"), 6.5%); $card-secondary-border: lighten(theme-color("secondary"), 6.5%) !default;
$card-secondary-heading-bg: $card-heading-bg; $card-secondary-heading-bg: $card-heading-bg !default;
$card-success-text: $state-success-text; $card-success-text: $state-success-text !default;
$card-success-border: $state-success-border; $card-success-border: $state-success-border !default;
$card-success-heading-bg: $state-success-bg; $card-success-heading-bg: $state-success-bg !default;
$card-info-text: $state-info-text; $card-info-text: $state-info-text !default;
$card-info-border: $state-info-border; $card-info-border: $state-info-border !default;
$card-info-heading-bg: $state-info-bg; $card-info-heading-bg: $state-info-bg !default;
$card-warning-text: $state-warning-text; $card-warning-text: $state-warning-text !default;
$card-warning-border: $state-warning-border; $card-warning-border: $state-warning-border !default;
$card-warning-heading-bg: $state-warning-bg; $card-warning-heading-bg: $state-warning-bg !default;
$card-warning-bg: $state-warning-bg; $card-warning-bg: $state-warning-bg !default;
$card-danger-text: $state-danger-text; $card-danger-text: $state-danger-text !default;
$card-danger-border: $state-danger-border; $card-danger-border: $state-danger-border !default;
$card-danger-heading-bg: $state-danger-bg; $card-danger-heading-bg: $state-danger-bg !default;
// Tables // Tables
$cursor-disabled: not-allowed; // Disabled cursor for form controls and buttons. $cursor-disabled: not-allowed !default; // Disabled cursor for form controls and buttons.
// Pagination // Pagination
$pagination-padding-y-xs: 0.0625rem; $pagination-padding-y-xs: 0.0625rem !default;
$pagination-padding-x-xs: 0.4375rem; $pagination-padding-x-xs: 0.4375rem !default;
// Popovers // Popovers
$popover-fallback-border-color: #ccc; $popover-fallback-border-color: #ccc !default;
// Modals // Modals
$modal-header-color: $white; $modal-header-color: $white !default;
$modal-header-padding: 0.125rem; $modal-header-padding: 0.125rem !default;
// List groups // List groups
$list-group-border: #ddd; $list-group-border: #ddd !default;