V3.0.0.7 - Fix glyphicon carousel position.

gjb2048 · Feb 5, 2016 · 14c1ab7 · 14c1ab7
1 parent 283f019
commit 14c1ab7
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 10 deletions.
diff --git a/Changes.md b/Changes.md
@@ -4,6 +4,7 @@ Version 3.0.0.7
   1. Colour popup in Collapsed Topics and Grid course formats.
   2. Fix incorrect pip calculation when one section per page.
   3. Only resize carousel images on the front page.
+  4. Fix glyphicon carousel position.
 
 Version 3.0.0.6
   1. Tidy up forum search.

diff --git a/less/shoehorn/shoehorn-bootstrap.less b/less/shoehorn/shoehorn-bootstrap.less
@@ -167,21 +167,49 @@ button, input.form-submit, input[type="button"], input[type="submit"], input[typ
     background-repeat: no-repeat;
   }
 
-  .icon-prev, .glyphicon-chevron-left {
+  .icon-prev {
     left: auto;
   }
 
-  .icon-next, .glyphicon-chevron-right {
+  .icon-next {
     right: auto;
   }
 
+  .glyphicon-chevron-left,
+  .glyphicon-chevron-right {
+    margin-top: -19px;
+  }
+  .glyphicon-chevron-left {
+    margin-left: -17px;
+  }
+  .glyphicon-chevron-right {
+    margin-right: -17px;
+  }
+
   // Hover/focus state.
   &:hover,
   &:focus {
     color: lighten(@carousel-control-color, 5%);
   }
 }
 
+// Scale up controls for tablets and up
+@media screen and (min-width: @screen-sm-min) {
+  .carousel-control {
+    .glyphicon-chevron-left,
+    .glyphicon-chevron-right {
+      margin-top: (-(@carousel-control-font-size / 4) * 3);
+    }
+    .glyphicon-chevron-left {
+      margin-left: (-(@carousel-control-font-size / 4) * 3);
+    }
+    .glyphicon-chevron-right {
+      margin-right: (-(@carousel-control-font-size / 4) * 3);
+    }
+  }
+}
+
+
 @media(min-width: @screen-xs-min) {
     .carousel-control {
         width: 36px;

diff --git a/style/moodle-rtl.css b/style/moodle-rtl.css
@@ -26617,24 +26617,57 @@ input[type='reset']
     background-repeat: no-repeat;
 }
 
-.carousel-control .icon-prev,
-.carousel-control .glyphicon-chevron-left
+.carousel-control .icon-prev
 {
     right: auto;
 }
 
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-right
+.carousel-control .icon-next
 {
     left: auto;
 }
 
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right
+{
+    margin-top: -19px;
+}
+
+.carousel-control .glyphicon-chevron-left
+{
+    margin-right: -17px;
+}
+
+.carousel-control .glyphicon-chevron-right
+{
+    margin-left: -17px;
+}
+
 .carousel-control:hover,
 .carousel-control:focus
 {
     color: #fff;
 }
 
+@media screen and (min-width:768px)
+{
+    .carousel-control .glyphicon-chevron-left,
+    .carousel-control .glyphicon-chevron-right
+    {
+        margin-top: -15px;
+    }
+
+    .carousel-control .glyphicon-chevron-left
+    {
+        margin-right: -15px;
+    }
+
+    .carousel-control .glyphicon-chevron-right
+    {
+        margin-left: -15px;
+    }
+}
+
 @media (min-width:480px)
 {
     .carousel-control

diff --git a/style/moodle.css b/style/moodle.css
@@ -14289,18 +14289,39 @@ input[type='reset']
 .carousel-control.right
 {
     background-image: none;background-repeat: no-repeat;
-}.carousel-control .icon-prev,
-.carousel-control .glyphicon-chevron-left
+}.carousel-control .icon-prev
 {
     left: auto;
-}.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-right
+}.carousel-control .icon-next
 {
     right: auto;
+}.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right
+{
+    margin-top: -19px;
+}.carousel-control .glyphicon-chevron-left
+{
+    margin-left: -17px;
+}.carousel-control .glyphicon-chevron-right
+{
+    margin-right: -17px;
 }.carousel-control:hover,
 .carousel-control:focus
 {
     color: #fff;
+}@media screen and (min-width:768px)
+{
+    .carousel-control .glyphicon-chevron-left,
+    .carousel-control .glyphicon-chevron-right
+    {
+        margin-top: -15px;
+    }.carousel-control .glyphicon-chevron-left
+    {
+        margin-left: -15px;
+    }.carousel-control .glyphicon-chevron-right
+    {
+        margin-right: -15px;
+    }
 }@media (min-width:480px)
 {
     .carousel-control