Skip to content
This repository
Browse code

BUGFIX:fixed overflow issues in cms-content-header with back button /…

… breadcrumbs / tabs
  • Loading branch information...
commit 20aeb76979e0e7a562ac6eb84015a3e07bc510f7 1 parent 6a7668f
authored
10  admin/css/screen.css
@@ -259,11 +259,12 @@ body.cms { overflow: hidden; }
259 259
 
260 260
 .cms-content-header { padding: 0px 8px 8px; height: 32px; z-index: 60; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; }
261 261
 .cms-content-header a { color: #1556b2; }
262  
-.cms-content-header .backlink { float: left; margin-top: 7px; }
263 262
 .cms-content-header .backlink span.btn-icon-back { height: 16px; }
264  
-.cms-content-header h2 { float: left; padding: 8px 8px 0 8px; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; max-width: 400px; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
265  
-.cms-content-header > div { width: 9999em; overflow: hidden; }
266  
-.cms-content-header .cms-content-header-tabs { position: fixed; right: 40px; }
  263
+.cms-content-header h2 { padding: 8px 8px 0 8px; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; max-width: 100%; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; display: table-cell; vertical-align: top; }
  264
+.cms-content-header div { width: 100%; overflow: hidden; display: table-row; }
  265
+.cms-content-header div .cms_backlink { display: table-cell; vertical-align: middle; width: auto; }
  266
+.cms-content-header .cms-content-header-tabs { display: table-cell; white-space: nowrap; }
  267
+.cms-content-header .cms-content-header-tabs .ui-tabs-nav { float: right; margin-right: 32px; }
267 268
 .cms-content-header .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 12px; }
268 269
 .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-default, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-default { border-top: none; }
269 270
 .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active { border-top: none; padding-bottom: 0px; }
@@ -728,7 +729,6 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
728 729
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form .resetformaction { margin-right: 0px; }
729 730
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm { overflow: hidden; }
730 731
 
731  
-.SecurityAdmin .cms-edit-form .cms-content-header h2 { display: none; }
732 732
 .SecurityAdmin .permissioncheckboxset .optionset li, .SecurityAdmin .permissioncheckboxsetfield_readonly .optionset li { float: none; width: auto; }
733 733
 
734 734
 .cms .cms-content .SecurityAdmin .cms-content-fields { overflow-y: auto; }
4  admin/scss/_SecurityAdmin.scss
... ...
@@ -1,8 +1,4 @@
1 1
 .SecurityAdmin {
2  
-	.cms-edit-form .cms-content-header h2 {
3  
-		display: none;
4  
-	}
5  
-
6 2
 	// Same rules in .member-profile-form
7 3
 	.permissioncheckboxset, .permissioncheckboxsetfield_readonly {
8 4
 		.optionset {
23  admin/scss/_style.scss
@@ -101,34 +101,41 @@ body.cms {
101 101
 	}
102 102
 	
103 103
 	.backlink {
104  
-		float:left;
105  
-		margin-top:$grid-x - 1;
106 104
 		span.btn-icon-back {
107 105
 			height:16px;
108 106
 		}
109 107
 	}
110 108
 
111 109
 	h2 {
112  
-		float: left;
113 110
 		padding: $grid-y $grid-x 0 $grid-x;
114 111
 		font-size: $font-base-size + 2;
115 112
 		line-height: $grid-x * 3;
116 113
 		font-weight: bold;
117 114
 		text-shadow: darken($color-widget-bg, 15%) 1px 1px 0;
118  
-		max-width: $grid-x*50;
  115
+		max-width: 100%;
119 116
 		margin: 0;
120 117
 		@include hide-text-overflow();
  118
+		display:table-cell;
  119
+		vertical-align:top;
121 120
 	}
122 121
 
123  
-	& > div {
124  
-		width: 9999em;
  122
+	& div {
  123
+		width: 100%;
125 124
 		overflow: hidden;
  125
+		display:table-row;
  126
+		& .cms_backlink {
  127
+			display:table-cell;
  128
+			vertical-align:middle;
  129
+			width:auto;
  130
+		}
126 131
 	}
127 132
 	
128 133
 	.cms-content-header-tabs {
129  
-		position:fixed;
130  
-		right:40px;
  134
+		display:table-cell;
  135
+		white-space:nowrap;
131 136
 		.ui-tabs-nav {
  137
+			float:right;
  138
+			margin-right:$grid-x*4;
132 139
 			li {
133 140
 				a {
134 141
 					font-weight: bold;

0 notes on commit 20aeb76

Please sign in to comment.
Something went wrong with that request. Please try again.