Sync for release 2.7.6b

gjb2048 · Aug 24, 2014 · ef00528 · ef00528
1 parent 9155d2e
commit ef00528
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 273 deletions.
diff --git a/layout/includes/fonts.php b/layout/includes/fonts.php
@@ -26,27 +26,27 @@
 
 switch ($fontselect) {
 case 1:
-    $fonts[] = "'Open+Sans".$fontcharacterset."'";
+    $fonts[] = "'Open+Sans::".$fontcharacterset."'";
     break;
 case 2:
-    $fonts[] = "'Oswald".$fontcharacterset."'";
-    $fonts[] = "'PT+Sans".$fontcharacterset."'";
+    $fonts[] = "'Oswald::".$fontcharacterset."'";
+    $fonts[] = "'PT+Sans::".$fontcharacterset."'";
     break;
 case 3:
-    $fonts[] = "'Roboto".$fontcharacterset."'";
+    $fonts[] = "'Roboto::".$fontcharacterset."'";
     break;
 case 4:
-    $fonts[] = "'PT+Sans".$fontcharacterset."'";
+    $fonts[] = "'PT+Sans::".$fontcharacterset."'";
     break;
 case 5:
-    $fonts[] = "'Ubuntu".$fontcharacterset."'";
+    $fonts[] = "'Ubuntu::".$fontcharacterset."'";
     break;
 case 6:
-    $fonts[] = "'Arimo".$fontcharacterset."'";
+    $fonts[] = "'Arimo::".$fontcharacterset."'";
     break;
 case 7:
-    $fonts[] = "'Lobster".$fontcharacterset."'";
-    $fonts[] = "'Raleway".$fontcharacterset."'";
+    $fonts[] = "'Lobster::".$fontcharacterset."'";
+    $fonts[] = "'Raleway::".$fontcharacterset."'";
 	break;
 }
 

diff --git a/layout/includes/pagesettings.php b/layout/includes/pagesettings.php
@@ -77,7 +77,7 @@
 }
 
 $fontselect = theme_essential_get_setting('fontselect');
-$fontcharacterset = '&subset='.theme_essential_get_setting('fontcharacterset');
+$fontcharacterset = theme_essential_get_setting('fontcharacterset');
 
 
 /* Group Header */

diff --git a/less/essential.less b/less/essential.less
@@ -33,6 +33,7 @@
 @import "essential/form";
 @import "essential/forum";
 @import "essential/frontpage";
+@import "essential/gradebook";
 @import "essential/greybox";
 @import "essential/header";
 @import "essential/navigation";

diff --git a/less/essential/alternative/alternative1.less b/less/essential/alternative/alternative1.less
@@ -245,7 +245,7 @@
                 color: ~"[[setting:alternativethemecolor1]]";
             }
         }
-        #icon {
+        .icon {
             color: @icon-colour;
         }
     }

diff --git a/less/essential/alternative/alternative2.less b/less/essential/alternative/alternative2.less
@@ -245,7 +245,7 @@
                 color: ~"[[setting:alternativethemecolor2]]";
             }
         }
-        #icon {
+        .icon {
             color: @icon-colour;
         }
     }

diff --git a/less/essential/alternative/alternative3.less b/less/essential/alternative/alternative3.less
@@ -245,7 +245,7 @@
                 color: ~"[[setting:alternativethemecolor3]]";
             }
         }
-        #icon {
+        .icon {
             color: @icon-colour;
         }
     }

diff --git a/less/essential/blocks.less b/less/essential/blocks.less
@@ -8,18 +8,10 @@
     .content {
         padding: 4px 0px;
     }
-    #icon {
+    .icon {
         margin-right: 5px;
         color: @icon-colour;
     }
-    a.toggle-display:before {
-        content: '\f085';
-        font-family: FontAwesome;
-        color: @icon-colour;
-    }
-    a.toggle-display:hover:before {
-        color: ~"[[setting:themehovercolor]]";
-    }
     .menu {
         a.menu-action {
             color: ~"[[setting:themeurlcolor]]";
@@ -34,6 +26,18 @@
             color: #fff;
         }
     }
+  .moodle-core-dragdrop-draghandle {
+    &:before {
+      font-family: 'FontAwesome';
+      content:"\f047 ";
+      color: @icon-colour;
+      margin-right: 5px;
+      cursor: move;
+    }
+    img {
+      display: none;
+    }
+  }
 }
 
 .editing  {

diff --git a/less/essential/course.less b/less/essential/course.less
@@ -4,6 +4,10 @@
     border-bottom: 0px none;
 }
 
+#course-category-listings .item-actions.show .menu a {
+  padding: 0px 5px;
+}
+
 div.mdl-align.title {
     text-align: left;
     border-bottom: 1px solid #e1e1e1;
@@ -12,70 +16,14 @@ div.mdl-align.title {
 
 .course-content ul.topics li.section.main.clearfix.current {
     border-radius: 5px;
-}   
-
-.firstword {
-    margin-right: -5px;
-}
-
-.left.side {
-    display: none;
-}
-
-.editing .left.side {
-    display: inline;
-}
-
-.label, .badge {
-    font-weight: normal;
 }
 
-.listitem .fa-circle {
-    margin-right: 10px;
-    font-size: .5em;
-}
-
-#course-category-listings {
-    li {
-        #icon {
-            margin-left: 0;
-        }
-        li {
-            #icon {
-                margin-left: 1em;
-            }
-            li {
-                #icon {
-                    margin-left: 2em;
-                }
-                li {
-                    #icon {
-                        margin-left: 3em;
-                    }
-                    li {
-                        #icon {
-                            margin-left: 4em;
-                        }
-                        li {
-                            #icon {
-                                margin-left: 4.5em;
-                            }
-                            li {
-                                #icon {
-                                    margin-left: 5em;
-                                }
-                                li {
-                                    #icon {
-                                        margin-left: 5.5em;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+.listitem-category {
+  .icon {
+    margin-right: 5px;
+    margin-left: 3px;
+    color: @icon-colour;
+  }
 }
 
 /* @group Course Footer */
-Original file line number
+Diff line change
@@ Expand Up / @@ -245,7 +245,7 @@ @@
                     color: ~"[[setting:alternativethemecolor1]]";
                 }
             }
-            #icon {
+            .icon {
                 color: @icon-colour;
             }
         }
@@ Expand Down @@