Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle

Conflicts:
	theme/base/style/core.css
	theme/base/style/filemanager.css

diff --cc files/renderer.php
Simple merge

diff --cc theme/base/style/core.css
index 28153ca,c2a25bd..e63a4a0
--- 1/theme/base/style/core.css
--- 2/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@@ -960,5 -954,3 +960,5 @@@ sup {vertical-align: super;
      -webkit-box-shadow: 0px 0px 10px 0px #CCCCCC;
      -moz-box-shadow: 0px 0px 10px 0px #CCCCCC;
  }
- .initialbar a {padding-right: 2px;}
 +
++.initialbar a {padding-right: 2px;}

diff --cc theme/base/style/filemanager.css
index 1691b81,8e04ead..aed0eba
--- 1/theme/base/style/filemanager.css
--- 2/theme/base/style/filemanager.css
+++ b/theme/base/style/filemanager.css
@@@ -63,10 -43,7 +63,10 @@@ background: #CCCCCC;filter: progid:DXIm
  /*
   * Tools, Path & View on fp-navbar (File Picker and File Manager)
   */
- .fp-toolbar {display: table-row;line-height: 22px;float:left;/*display: inline-block;*/}
+ .fp-toolbar {display: table-row;line-height: 22px;float:left;}
 +
 +.dir-rtl .fp-toolbar {float: right;}
 +
  .fp-toolbar.empty {display:none;}
  .fp-toolbar .disabled {display:none;}
  .fp-toolbar div {display: inline-block;padding: 0px 2px;padding-right: 10px;}
@@@ -76,42 -51,22 +76,42 @@@
  .fp-toolbar .fp-tb-search {width: 228px;height: 14px;}
  .fp-toolbar .fp-tb-search input {background:#FFFFFF url('[[pix:a/search]]') no-repeat 3px 3px;padding: 2px 6px 1px 20px;width: 200px;height: 16px;border: 1px solid #BBBBBB;}
  
- .fp-viewbar {float:right;width:69px;height:22px;margin-right:8px;/*display: inline-block;*/}
+ .fp-viewbar {float:right;width:69px;height:22px;margin-right:8px;}
 +.dir-rtl .fp-toolbar img {vertical-align: -35%;}
 +.dir-rtl .fp-viewbar {float: left;width: 100px;}
 +
  .fp-vb-icons {background:url('[[pix:theme|fp/view_icon_active]]') no-repeat 0 0;width:22px;height:22px;display: inline-block;}
 +.dir-rtl .fp-vb-icons {background:url('[[pix:theme|fp/view_icon_active]]') no-repeat 0 0; display: block; float:left; margin-right: 4px;}
  .fp-vb-icons.checked {background:url('[[pix:theme|fp/view_icon_selected]]');}
 +.dir-rtl .fp-vb-icons.checked {background:url('[[pix:theme|fp/view_icon_selected]]'); display: block; float:left; margin-right: 4px;}
  .fp-viewbar.disabled .fp-vb-icons {background:url('[[pix:theme|fp/view_icon_inactive]]');}
  .fp-vb-details {background:url('[[pix:theme|fp/view_list_active]]') no-repeat 0px 0px;width:23px;height:22px;display: inline-block;margin-left: -4px;}
 +.dir-rtl .fp-vb-details {background:url('[[pix:theme|fp/view_list_active]]') no-repeat 0px 0px; display: block; float:left;  margin-right: 4px;}
  .fp-vb-details.checked {background:url('[[pix:theme|fp/view_list_selected]]');}
 +.dir-rtl .fp-vb-details.checked {background:url('[[pix:theme|fp/view_list_selected]]'); display: block; float:left; margin-right: 4px;}
  .fp-viewbar.disabled .fp-vb-details {background:url('[[pix:theme|fp/view_list_inactive]]');}
  .fp-vb-tree {background:url('[[pix:theme|fp/view_tree_active]]') no-repeat 0px 0px;width:23px;height:22px;display: inline-block;margin-left: -4px;}
 +.dir-rtl .fp-vb-tree {background:url('[[pix:theme|fp/view_tree_active]]') no-repeat 0px 0px; display: block; float:left;  margin-right: 4px;}
  .fp-vb-tree.checked {background:url('[[pix:theme|fp/view_tree_selected]]');}
 +.dir-rtl .fp-vb-tree.checked {background:url('[[pix:theme|fp/view_tree_selected]]'); display: block; float:left; margin-right: 4px;}
  .fp-viewbar.disabled .fp-vb-tree {background:url('[[pix:theme|fp/view_tree_inactive]]');}
  .file-picker .fp-clear-left {clear: left;}
  
- .file-picker .fp-pathbar {display: table-row;/*display: inline-block;*/}
 +/* over ride hover rule from core.css*/
 +.dir-rtl .filemanager-toolbar .fp-vb-icons a:hover {background:url('[[pix:theme|fp/view_icon_selected]]');}
 +.dir-rtl .filemanager-toolbar .fp-vb-icons.checked a:hover {background:url('[[pix:theme|fp/view_icon_active]]') no-repeat 0 0;}
 +.dir-rtl .fp-vb-details a:hover {background:none; border:20px solid black}
 +.dir-rtl .fp-vb-details.checked a:hover {background:none; border:40px solid black}
 +.dir-rtl .fp-vb-tree a:hover {background:none; border:30px solid black}
 +.dir-rtl .fp-vb-tree.checked a:hover {background:none; border:50px solid black}
 +
+ .file-picker .fp-pathbar {display: table-row;}
  .fp-pathbar.empty {display: none;}
  .fp-pathbar .fp-path-folder {background:url('[[pix:theme|fp/path_folder]]') no-repeat 0 0;width:27px;height:12px;margin-left: 4px;}
 +.dir-rtl .fp-pathbar .fp-path-folder {background:url('[[pix:theme|fp/path_folder_rtl]]') no-repeat right top;width:auto;height:12px;margin-left: 4px;}
 +.dir-rtl .fp-pathbar span {display: inline-block;float:right; margin-left: 32px;}
  .fp-pathbar .fp-path-folder-name {margin-left: 32px;line-height: 20px;}
 +.dir-rtl .fp-pathbar .fp-path-folder-name {margin-right: 32px;line-height: 20px;}
  
  /*
   * Icon view (File Picker and File Manager)
@@@ -371,10 -313,8 +371,10 @@@ a.ygtvspacer:hover {color: transparent;
   * Create folder dialogue (File Manager only)
   */
  .filemanager.fp-mkdir-dlg {text-align: center;}
- .filemanager.fp-mkdir-dlg .fp-mkdir-dlg-text {text-align: left;margin: 40px 20px 20px;}
+ .filemanager.fp-mkdir-dlg .fp-mkdir-dlg-text {text-align: left;margin: 20px;}
  
 +.dir-rtl .filemanager .fp-mkdir-dlg p {text-align: right;}
 +
  /*
   * Confirm dialogue for delete (File Manager only)
   */