Bug 1674518: Design changes for themes

Change-Id: Ib22e09ecc91221f5a42f2d2b16f614c8b067a84a
behatnotneeded: design changes only

htdocs/search/elasticsearch/lib.php

@@ -142,7 +142,7 @@ class PluginSearchElasticsearch extends PluginSearch {
                         ),
                         'submit' => array(
                             'type' => 'button',
-                            'class' => 'btn-primary input-group-btn',
+                            'class' => 'btn-default input-group-btn',
                             'usebuttontag' => true,
                             'value' => '<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('go') . '</span>',
                         )

htdocs/search/lib.php

@@ -244,7 +244,7 @@ abstract class PluginSearch extends Plugin implements IPluginSearch {
                         ),
                         'submit' => array(
                             'type' => 'button',
-                            'class' => 'btn-primary input-group-btn',
+                            'class' => 'btn-default input-group-btn',
                             'usebuttontag' => true,
                             'value' => '<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">'. get_string('go') . '</span>',
                         )

htdocs/theme/default/sass/_custom.scss

-// blog post headings
-.myblogs {
-    h1 {
-        border-bottom: 0;
-        padding-bottom: 0;
-    }
-    .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-        font-weight: 700;
-    }
-    .list-group-item-heading {
-        font-weight: 300;
-    }
-}
-
 // viewfooter
 .viewfooter {
-    padding: 15px !important;
+    padding: 15px;
     background-color: #f7f7f7;
     border-radius: 10px;
-    margin-top: 20px;
-    h3:first-child {
-        margin-top: 0;
-    }
-    h4:first-child {
-        margin-top: 0;
-    }
-    .pieform {
-        .files {
-            .btn {
-                margin-left: 0; // fixes the attach file btn alignment
-            }
-        }
-    }
 }

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

-.navbar-toggle {
-    background-color: $link-color;
-    &:hover,
-    &:focus {
-        border-color: $link-hover-color;
-        background-color: $link-hover-color;
-    }
-}

htdocs/theme/default/sass/layout/_header.scss

@@ -6,24 +6,9 @@
         height: 5px;
         background-image: url(../images/header-bkgd.png);
     }
-    .logo-area {
-        .logo {
-            @media (max-width: $screen-xs-min - 1) {
-                width: 25px;
-                height: 45px;
-                overflow-x: hidden;
-                background: url(../images/site-logo-mobile.png) no-repeat 0 0;
-            }
-        }
-        img {
-            @media (max-width: $screen-xs-min - 1) {
-                display: none;
-            }
-        }
-    }
 
     .admin-title {
         font-weight: 300;
-        font-size: $font-size-large;
+        font-size: 16px;;
     }
 }

htdocs/theme/default/sass/layout/_profile-block.scss

@@ -7,18 +7,8 @@
                 text-decoration: underline;
             }
         }
-        a {
-        color: #FFFFFF;
-
-            &:after {
-                border-radius: 30px;
-                bottom: 0px;
-            }
-        }
     }
-}
 
-.sidebar {
     .user-panel {
         > .panel-default {
             box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);

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

+.navbar-main {
+    border: 0;
+
+    .navbar-nav {
+        > li > a {
+            color: #FFFFFF;
+            background-color: $theme-primary-color;
+            border-color: $link-hover-color;
+            &:hover,
+            &:focus {
+                color: #FFFFFF;
+            }
+            @media (min-width: $screen-sm-min) {
+                border-color: $link-hover-color;
+            }
+        }
+        .navbar-toggle {
+            color: #FFFFFF;
+            background-color: $link-hover-color;
+
+            &:hover,
+            &:focus {
+              background-color: $link-hover-color;
+              color: #FFFFFF;
+            }
+
+            &.collapsed {
+              background-color: transparent;
+              &:hover,
+              &:focus {
+                background-color: $link-hover-color;
+                color: #FFFFFF;
+              }
+            }
+        }
+
+        .active > a {
+          font-weight: bold;
+        }
+    }
+}

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

@@ -387,14 +387,14 @@ $navbar-collapse-max-height:       340px;
 
 $navbar-default-color:             #777;
 $navbar-default-bg:                #FFFFFF;
-$navbar-default-border:            #e5e5e5;
+$navbar-default-border:            transparent;
 
 // Navbar links
-$navbar-default-link-color:                $theme-primary-color;
-$navbar-default-link-hover-color:          #FFF;
-$navbar-default-link-hover-bg:             $theme-primary-color;
-$navbar-default-link-active-color:         #333333;
-$navbar-default-link-active-bg:            #FFFFFF;
+$navbar-default-link-color:                $link-color;
+$navbar-default-link-hover-color:          #FFFFFF;
+$navbar-default-link-hover-bg:             $link-hover-color;
+$navbar-default-link-active-color:         #FFFFFF;
+$navbar-default-link-active-bg:            darken($link-color, 10%);
 $navbar-default-link-disabled-color:       #ccc;
 $navbar-default-link-disabled-bg:          transparent;
 
@@ -404,23 +404,23 @@ $navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 1
 $navbar-default-brand-hover-bg:            transparent;
 
 // Navbar toggle
-$navbar-default-toggle-hover-bg:           $link-hover-color;
-$navbar-default-toggle-icon-bar-bg:        #ffffff;
-$navbar-default-toggle-border-color:       $link-color;
+$navbar-default-toggle-hover-bg:           #f1f6eb;
+$navbar-default-toggle-icon-bar-bg:        $link-color;
+$navbar-default-toggle-border-color:       transparent;
 
 
 // Inverted navbar
 // Reset inverted navbar basics
-$navbar-inverse-color:                      $link-color;
-$navbar-inverse-bg:                         lighten($theme-primary-color, 50%);
-$navbar-inverse-border:                     darken($navbar-inverse-bg, 5%);
+$navbar-inverse-color:                      #FFFFFF;
+$navbar-inverse-bg:                         $link-hover-color;
+$navbar-inverse-border:                     $link-hover-color;
 
 // Inverted navbar links
-$navbar-inverse-link-color:                 $theme-primary-color;
+$navbar-inverse-link-color:                 #FFFFFF;
 $navbar-inverse-link-hover-color:           #FFFFFF;
-$navbar-inverse-link-hover-bg:              #2e3a1c;
+$navbar-inverse-link-hover-bg:              lighten($link-hover-color, 5%);
 $navbar-inverse-link-active-color:          #FFFFFF;
-$navbar-inverse-link-active-bg:             #2e3a1c;
+$navbar-inverse-link-active-bg:             $link-hover-color;
 $navbar-inverse-link-disabled-color:        #444;
 $navbar-inverse-link-disabled-bg:           transparent;
 
@@ -431,7 +431,7 @@ $navbar-inverse-brand-hover-bg:             transparent;
 
 // Inverted navbar toggle
 $navbar-inverse-toggle-hover-bg:            #fff;
-$navbar-inverse-toggle-icon-bar-bg:         #fff;
+$navbar-inverse-toggle-icon-bar-bg:         $link-hover-color;
 $navbar-inverse-toggle-border-color:        #fff;
 
 

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

@@ -12,7 +12,7 @@ $section-heading-color: #999;
 $admin-title-color: $brand-primary;
 $admin-title-bg: $brand-primary;
 
-$dashboard-widget-bg: #2e3a1c;
+$dashboard-widget-bg: $brand-primary;
 $dashboard-widget-color: #FFFFFF;
 
 $help-icon-color: #5b8fc8;

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

@@ -14,6 +14,7 @@
 @import "../layout/panel/panel-secondary";
 
 // Navigation
+@import "../layout/nav/main-nav";
 @import "../layout/nav/nav-tabs";
 
 // Components - small reusable design elements

htdocs/theme/modern/fonts/raleway/raleway-bold.otf:Zone.Identifier:$DATA

+[ZoneTransfer]
+ZoneId=3

htdocs/theme/modern/fonts/raleway/raleway-italic.otf:Zone.Identifier:$DATA

+[ZoneTransfer]
+ZoneId=3

htdocs/theme/modern/fonts/raleway/raleway-light.otf:Zone.Identifier:$DATA

+[ZoneTransfer]
+ZoneId=3

htdocs/theme/modern/fonts/raleway/raleway-lightitalic.otf:Zone.Identifier:$DATA

+[ZoneTransfer]
+ZoneId=3

htdocs/theme/modern/fonts/raleway/raleway-regular.otf:Zone.Identifier:$DATA

+[ZoneTransfer]
+ZoneId=3

htdocs/theme/modern/fonts/raleway/raleway-thin.otf:Zone.Identifier:$DATA

+[ZoneTransfer]
+ZoneId=3

htdocs/theme/modern/sass/_custom.scss

@@ -8,11 +8,6 @@ body {
   }
 }
 
-.dashboard-widget-container {
-  .circle-bg {
-    border-radius: 0;
-  }
-}
 .icon {
   &.text-danger,
   &.text-success,
@@ -21,36 +16,9 @@ body {
   }
 }
 
-.messages {
-  a {
-    color: #FFFFFF;
-  }
-}
-
-// Login Box padding fixes {
-#login-helplinks {
-  .register-link{
-    padding-right: 2px;
-  }
-  .forgotpass-link {
-    padding-left: 7px;
-  }
-}
-// TINY MCE colour inherit bug fix
-.mce-panel.mce-tinymce {
-  .mce-statusbar.mce-container {
-    background-color: lighten($gray-light, 50%);
-    border: 1px solid;
-    border-color: lighten($gray-light, 50%) !important;
-  }
-}
-
-// Makes the text darker and field show red outline when a form error is shown
+// Makes the label red when a form error is shown
 .has-error {
   label {
-    color: #545B5D;
-  }
-  .form-control {
-    border-color: #CF2C33;
+    color: $state-danger-text;
   }
 }

htdocs/theme/modern/sass/components/_user-icon.scss

@@ -2,6 +2,8 @@ a.user-icon {
   border: none;
   padding: 0;
   background: none;
+  border-radius: 50%;
+  
   img {
       border-radius: 50%;
       border: 0px solid #FFF;

htdocs/theme/modern/sass/features/_dashboard-widget.scss

+.dashboard-widget-container {
+  .circle-bg {
+    border-radius: 0;
+  }
+}

htdocs/theme/modern/sass/form/_form.scss

@@ -6,17 +6,3 @@
 form#filter {
     background-colour: lighten($brand-primary, 80%);
 }
-
-
-
-// fix for set width on labels
-#languageselect_lang_container {
-  label {
-    text-align: right;
-    color: #FFF;
-  }
-  .picker {
-    margin-right: 4px;
-    border-radius: 4px;
-  }
-}

htdocs/theme/modern/sass/layout/_columns.scss

-/*
- * Non-bootstrap column layout. Used by the page builder
- */
-
-.column {
-    &.editing {
-
-    }
-}

htdocs/theme/modern/sass/layout/_profile-block.scss

-.profile-block {
-    .user-icon{
-        border-radius: 50%; 
-    }
-}
\ No newline at end of file

htdocs/theme/modern/sass/layout/panel/_panel-secondary.scss

@@ -13,26 +13,3 @@
       font-family: $font-family-sans-serif;
     }
 }
-
-.panel-success {
-  a.panel-footer {
-    color: darken($state-success-bg, 10%);
-    background-color: lighten($state-success-bg, 40%);
-    border-top-color: lighten($state-success-bg, 40%);
-    &:hover {
-      background-color: lighten($state-success-bg, 45%);
-      color: darken($state-success-bg, 10%);
-    } 
-  }
-}
-.panel-info {
-  a.panel-footer {
-    color: darken($state-info-bg, 10%);
-    background-color: lighten($state-info-bg, 40%);
-    border-top-color: lighten($state-info-bg, 40%);
-    &:hover {
-      background-color: lighten($state-info-bg, 45%);
-      color: darken($state-success-bg, 30%);
-    } 
-  }
-}
\ No newline at end of file