Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-39138 theme_bootstrap: Revert Settings/Nav styles

  • Loading branch information...
commit 68ce389682edd5a971540a06350cf73cfe87865d 1 parent 3a8c438
David Scotson authored
2  theme/bootstrap/config.php
View
@@ -40,8 +40,6 @@
$THEME->plugins_exclude_sheets = array(
'block' => array(
- 'settings',
- 'navigation',
'html'
),
'gradereport' => array(
194 theme/bootstrap/less/moodle/blocks.less
View
@@ -15,10 +15,7 @@
.block .header .title .commands,
.block_adminblock .content,
-.block .footer,
-.block .block_tree li>p>a,
-.block .block_tree li>p>span
-{
+.block .footer {
display: block;
padding: 3px 15px;
}
@@ -40,6 +37,9 @@
.block .content {
padding: 4px 14px;
}
+.block .content hr {
+ margin: 5px 0;
+}
.block.hidden .content {
display: none;
@@ -104,34 +104,6 @@
display: inline;
}
-.jsenabled .block_tree .tree_item.branch {
- cursor: pointer;
-}
-.jsenabled .block_tree .collapsed ul {
- display: none;
-}
-.jsenabled .dock_on_load,
-.block_tree_box .requiresjs {
- display: none;
-}
-.jsenabled .block_tree_box .requiresjs {
- display: inline;
-}
-
-// Individual block styles
-.block_navigation .content,
-.block_settings .content {
- padding: 0;
-}
-
-.block_settings li > hr {
- margin: 4px 0;
-}
-
-.block_settings .leaf img,
-.block_navigation p.tree_item a img.smallicon {
- display: none;
-}
.block_calendar_upcoming .footer {
margin-top: .5em;
}
@@ -153,161 +125,3 @@
}
}
-// the rest is block settings and nav stuff, can stil be tidied up a great deal
-
-ul.block_tree ul {
- margin: 0;
-}
-
-.block_tree .tree_item.branch a:before,
-.block_tree .tree_item.branch span:before {
- content: "";
-}
-
-.block_tree .collapsed .tree_item.branch a:before,
-.block_tree .collapsed .tree_item.branch span:before,
-.block_tree .collapsed .tree_item.emptybranch a:before,
-.block_tree .collapsed .tree_item.emptybranch span:before {
- content: "";
-}
-
-.dir-rtl {
- .block_tree .tree_item.branch a:before,
- .block_tree .tree_item.branch span:before {
- content: ""; // Space on opposite side.
- }
- .block_tree .collapsed .tree_item.branch a:before,
- .block_tree .collapsed .tree_item.branch span:before,
- .block_tree .collapsed .tree_item.emptybranch a:before,
- .block_tree .collapsed .tree_item.emptybranch span:before {
- content: "";
- }
-}
-
-.block_navigation .block_tree .tree_item.branch.navigation_node a:before {
- content: none;
-}
-
-.block_tree .collapsed .tree_item.emptybranch a:before,
-.block_tree .collapsed .tree_item.emptybranch span:before {
- .muted
-}
-
-.block_settings .block_tree .tree_item,
-.block_navigation .block_tree .tree_item {
- margin: 0;
-}
-
-.block_tree>li>p>a,
-.block_tree>li>p>span,
-.block_tree .nav-header {
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-
-.block .block_tree li > p > span:hover,
-.block .block_tree li > p > a:hover {
- text-decoration: none;
- background-color: @grayLighter;
-}
-
-.block_tree li p.active_tree_node a,
-.block_tree li p.active_tree_node a:hover {
- color: @white;
- text-shadow: 0 -1px 0 rgba(0,0,0,.2);
- background-color: @linkColor;
-}
-
-
-.block_settings .block_tree li ul,
-.block_settings .block_tree li.depth_2 ul,
-.block_navigation .block_tree li ul,
-.block_navigation .block_tree li.depth_2 ul
-{
- padding-left: 0;
-}
-
-.block_settings ul.block_tree.list li ul li a,
-.block_settings ul.block_tree.list li ul li span,
-.block_navigation ul.block_tree.list li ul li ul li a,
-.block_navigation ul.block_tree.list li ul li ul li span
-{
- padding-left: 33px;
-}
-
-.block_settings ul.block_tree.list li ul li ul li a,
-.block_settings ul.block_tree.list li ul li ul li span,
-.block_navigation ul.block_tree.list li ul li ul li ul li a,
-.block_navigation ul.block_tree.list li ul li ul li ul li span
-{
- padding-left: 49.5px;
-}
-
-.block_settings ul.block_tree.list li ul li ul li ul li a,
-.block_settings ul.block_tree.list li ul li ul li ul li span,
-.block_navigation ul.block_tree.list li ul li ul li ul li ul li a,
-.block_navigation ul.block_tree.list li ul li ul li ul li ul li span
-{
- padding-left: 66px;
-}
-
-.block_settings ul.block_tree.list li ul li ul li ul li ul li a,
-.block_settings ul.block_tree.list li ul li ul li ul li ul li span,
-.block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li a,
-.block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li span
-{
- padding-left: 83.5px;
-}
-
-.block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li ul li a,
-.block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li ul li span
-{
- padding-left: 99px;
-}
-.dir-rtl {
- .block_settings .block_tree li ul,
- .block_settings .block_tree li.depth_2 ul,
- .block_navigation .block_tree li ul,
- .block_navigation .block_tree li.depth_2 ul
- {
- padding-right: 0;
- padding-left: 0;
- }
-
- .block_settings ul.block_tree.list li ul li a,
- .block_settings ul.block_tree.list li ul li span,
- .block_navigation ul.block_tree.list li ul li ul li a,
- .block_navigation ul.block_tree.list li ul li ul li span
- {
- padding-right: 33px;
- }
-
- .block_settings ul.block_tree.list li ul li ul li a,
- .block_settings ul.block_tree.list li ul li ul li span,
- .block_navigation ul.block_tree.list li ul li ul li ul li a,
- .block_navigation ul.block_tree.list li ul li ul li ul li span
- {
- padding-right: 49.5px;
- }
-
- .block_settings ul.block_tree.list li ul li ul li ul li a,
- .block_settings ul.block_tree.list li ul li ul li ul li span,
- .block_navigation ul.block_tree.list li ul li ul li ul li ul li a,
- .block_navigation ul.block_tree.list li ul li ul li ul li ul li span
- {
- padding-right: 66px;
- }
-
- .block_settings ul.block_tree.list li ul li ul li ul li ul li a,
- .block_settings ul.block_tree.list li ul li ul li ul li ul li span,
- .block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li a,
- .block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li span
- {
- padding-right: 83.5px;
- }
-
- .block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li ul li a,
- .block_navigation ul.block_tree.list li ul li ul li ul li ul li ul li ul li span
- {
- padding-right: 99px;
- }
-}
4 theme/bootstrap/style/generated.css
View
2 additions, 2 deletions not shown
2  theme/simple/config.php
View
@@ -46,8 +46,6 @@
$THEME->plugins_exclude_sheets = array(
'block' => array(
- 'settings',
- 'navigation',
'html',
),
'gradereport' => array(
Please sign in to comment.
Something went wrong with that request. Please try again.