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

htdocs/lib/view.php

@@ -7554,14 +7554,14 @@ function view_group_submission_form($view, $tutorgroupdata, $returnto=null) {
             'type' => 'hidden',
             'value' => $view->get_collection()->get('id'),
         );
-        $form['elements']['text1']['value'] = get_string('submitthiscollectionto1', 'view') . ' ';
+        $form['elements']['text1']['value'] = get_string('submitthiscollectionto1', 'view') . ' ';
     }
     else {
         $form['elements']['view'] = array(
             'type' => 'hidden',
             'value' => $viewid
         );
-        $form['elements']['text1']['value'] = get_string('submitthisviewto1', 'view') . ' ';
+        $form['elements']['text1']['value'] = get_string('submitthisviewto1', 'view') . ' ';
     }
 
     return pieform($form);

htdocs/theme/default/sass/components/_btn.scss

@@ -7,3 +7,22 @@
         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%);
+    }
+}

htdocs/theme/default/sass/components/_list-group.scss

@@ -12,3 +12,16 @@
   font-family: $font-family-sans-serif;
   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;
+            }
+        }
+    }
+}

htdocs/theme/default/sass/features/_collection-navigation.scss

+.collection-nav {
+    background-color: $card-heading-bg;
+}

htdocs/theme/default/sass/layout/card/_card-block.scss

@@ -10,6 +10,14 @@
         }
     }
 
+    &.card {
+        &.blockinstance.card {
+            .card-header {
+                background-color: $card-heading-bg;
+            }
+        }
+    }
+
     .blockinstance-controls .btn-group-top {
         @include media-breakpoint-down(lg) {
             margin: 0;

htdocs/theme/default/sass/layout/card/_card-collapse.scss

@@ -6,4 +6,9 @@
             border-bottom: 2px solid #ddd;
         }
     }
+    &:not(.card-block).has-attachment {
+        .card-header a:not(.collapsed) {
+            border-bottom-width: 1px;
+        }
+    }
 }

htdocs/theme/default/sass/layout/card/_card-header.scss

@@ -13,6 +13,10 @@
     }
 }
 
+.card-header .help a {
+    border: 0;
+}
+
 
 // sidebar card headings
 .sidebar .card-secondary > .card-header {

htdocs/theme/default/sass/layout/card/_card-secondary.scss

+.card-secondary {
+    .card-header {
+        background: $card-heading-bg;
+    }
+}

htdocs/theme/default/sass/layout/nav/_main-nav.scss

@@ -45,6 +45,10 @@
               font-weight: bold;
               background-color: #3a4a22;
               color: #ffffff;
+              &:hover,
+              &:focus {
+                  color: #FFFFFF;
+              }
             }
             .navbar-toggle {
                 .icon {

htdocs/theme/default/sass/layout/nav/_nav-tabs.scss

@@ -14,19 +14,19 @@
                 background-color: lighten(#bc9f54, 35%);
                 color: #423017;
             }
-        }
-        .active > a {
-            background-color: lighten(#bc9f54, 25%);
-            color: #423017;
-            border: 0;
-            border-bottom: 1px solid #bc9f54;
-
-            &:focus,
-            &:hover {
-                background-color: lighten(#bc9f54, 10%);
+            &.active {
+                background-color: lighten(#bc9f54, 25%);
                 color: #423017;
                 border: 0;
                 border-bottom: 1px solid #bc9f54;
+
+                &:focus,
+                &:hover {
+                    background-color: lighten(#bc9f54, 10%);
+                    color: #423017;
+                    border: 0;
+                    border-bottom: 1px solid #bc9f54;
+                }
             }
         }
     }

htdocs/theme/default/sass/style.scss

@@ -8,13 +8,14 @@
  * 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 "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/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
 

htdocs/theme/default/sass/typography/_typography.scss

+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+    font-family: $headings-font-family;
+}

htdocs/theme/default/sass/utilities/_custom-variables.scss

@@ -46,9 +46,9 @@ $state-danger-bg:                lighten($brand-danger, 30%);
 $state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%);
 
 // Buttons
-$btn-default-color:              #333333;
-$btn-default-bg:                 #F3F3F3;
-$btn-default-border:             #CCCCCC;
+$btn-secondary-color:              #333333;
+$btn-secondary-bg:                 $white;
+$btn-secondary-border:             #CCCCCC;
 
 $btn-primary-color:              #FFFFFF;
 $btn-primary-bg:                 #556d32;
@@ -105,7 +105,7 @@ $navbar-inverse-toggle-border-color:        #fff;
 $card-inner-border:          transparent;
 $card-footer-bg:             #f0f5ea;
 
-$card-primary-heading-bg:    #fff;
+$card-heading-bg:    #fff;
 
 $card-secondary-border:        #d9d9d9;
 $card-secondary-heading-bg:    #FFFFFF;

htdocs/theme/default/sass/utilities/_index.scss

 
 @import "../typography/tables";
+@import "../typography/typography";
 
 // General customisation and component files go here...
 @import "../layout/footer";
@@ -12,6 +13,7 @@
 @import "../layout/card/card-footer";
 @import "../layout/card/card-header";
 @import "../layout/card/card-block";
+@import "../layout/card/card-secondary";
 
 // Navigation
 @import "../layout/nav/main-nav";
@@ -26,5 +28,6 @@
 
 // Feature related sass. We avoid this where we can in favour of reusable components
 @import "../features/dashboard-widget";
+@import "../features/collection-navigation";
 
 @import "../custom";

htdocs/theme/raw/plugintype/artefact/file/templates/form/filebrowser.tpl

@@ -16,6 +16,7 @@
     {if $config.selectmodal}
         <div id="{$prefix}_upload_browse" class="filebrowser in-collapsible">
     {else}
+        {if !$config.noselect}
         <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>
             {str tag=addafile section=artefact.file}

htdocs/theme/raw/sass/components/_btn.scss

@@ -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;
 }

htdocs/theme/raw/sass/layout/card/_card-control.scss

@@ -3,7 +3,7 @@
  */
 .card-control {
     display: block;
-    font-size: $font-size-base - 2;
+    font-size: $font-size-base / 1.1665;
     margin: 0;
     min-width: 0;
     padding: 12px 0 12px 15px;
@@ -26,7 +26,8 @@
         }
      }
 
-    input {
+    input,
+    input[type='checkbox'] {
         margin-top:0;
     }
     .control {

htdocs/theme/raw/sass/typography/_tables.scss

@@ -269,7 +269,7 @@ table.table tr {
 
 // Unset border top on the first row of the table
 .table>tbody>tr:first-child>th,
-.table>tbody>tr:first-child>td {
+.table>tbody>tr:first-child td {
     border-top-width: 0;
 }