more css changes for the new layout

pull/654/head
Christian Ratz 11 years ago
parent 1640ee3494
commit 6c70c806de
  1. 2
      app/assets/javascripts/application.js
  2. 2
      app/assets/javascripts/top_menu.js
  3. 4
      app/assets/stylesheets/content/breadcrumb.css.sass
  4. 10
      app/assets/stylesheets/default/application.css.erb
  5. 2
      app/assets/stylesheets/layout/base.css.sass

@ -831,7 +831,7 @@ $(window).resize(function() {
});
$(window).bind('resizeEnd', function() {
jQuery("div#breadcrumb ul.breadcrumb").adjustBreadcrumbToWindowSize();
//jQuery("div#breadcrumb ul.breadcrumb").adjustBreadcrumbToWindowSize();
});
$.fn.mySlide = function(callback) {

@ -248,5 +248,5 @@
}(jQuery));
jQuery(document).ready(function($) {
$("#account-nav").top_menu();
$(".account-nav").top_menu();
});

@ -30,14 +30,16 @@
height: 40px
overflow: hidden
min-width: 750px
max-width: 100%
background: none repeat scroll 0 0 #EEEEEE
border: none
border-bottom: 1px solid #DDDDDD
margin: 0 0 0 270px
width: auto
overflow: hidden
position: absolute
&.nosidebar
margin-left: 20px
margin-left: 0
&.hidden-navigation
margin-left: 15px

@ -1183,9 +1183,9 @@ a:hover {
#main-menu {bottom: auto; left: 6px; margin-right: -500px;}
#main-menu {
width: 270px;
height: 100%;
float: left;
left: 0;
background-color: #053242;
}
#main-menu ul ul {
display: none;
@ -1328,6 +1328,7 @@ a:hover {
z-index: 20;
padding-bottom: 0;
overflow: auto;
height: 100%;
}
h1.title {
@ -1338,7 +1339,8 @@ h1.title {
padding: 10px;
width: auto;
overflow: hidden;
min-height: 350px;
height: 100%;
padding-top: 45px;
}
#content .title-bar {
position: relative;
@ -1692,8 +1694,8 @@ ul.journal-attributes li {
------------------------------------------------------------------------------*/
#content.nosidebar {
margin-left: 20px;
padding: 15px 60px 15px 25px;
margin-left: 0;
padding: 45px 60px 15px 25px;
}
#project-links {

@ -43,7 +43,7 @@ body
#wrapper
background: none
min-height: 100%
height: 100%
position: relative
h1

Loading…
Cancel
Save