Skip to content
This repository
Browse code

Allow multi-line application names.

  • Loading branch information...
commit b44ff84aac8f697793b7eb491ede242aaf0658c1 1 parent 890f7e3
Andrew Short authored
10  admin/css/screen.css
@@ -760,14 +760,14 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
760 760
 .cms-tree a.jstree-loading .jstree-pageicon { background: url(../images/throbber.gif) top left no-repeat; }
761 761
 
762 762
 /** Styles for the left hand side menu and header for the admin panels.  Take into consideration CSS selector performance.   @package framework @subpackage admin */
763  
-.cms-logo-header { background-color: #00111d; position: relative; padding: 9px 8px 0 4px; line-height: 24px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMTExZCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAzMDUwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAxMTFkIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00111d), color-stop(50%, #003050), color-stop(100%, #00111d)); background-image: -webkit-linear-gradient(#00111d, #003050, #00111d); background-image: -moz-linear-gradient(#00111d, #003050, #00111d); background-image: -o-linear-gradient(#00111d, #003050, #00111d); background-image: -ms-linear-gradient(#00111d, #003050, #00111d); background-image: linear-gradient(#00111d, #003050, #00111d); }
764  
-.cms-logo-header span { color: white; white-space: nowrap; text-overflow: ellipsis; display: block; }
  763
+.cms-logo-header { background-color: #00111d; position: relative; padding: 0 8px 0 4px; line-height: 24px; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMTExZCIvPjxzdG9wIG9mZnNldD0iNTAlIiBzdG9wLWNvbG9yPSIjMDAzMDUwIi8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjMDAxMTFkIi8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g'); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00111d), color-stop(50%, #003050), color-stop(100%, #00111d)); background-image: -webkit-linear-gradient(#00111d, #003050, #00111d); background-image: -moz-linear-gradient(#00111d, #003050, #00111d); background-image: -o-linear-gradient(#00111d, #003050, #00111d); background-image: -ms-linear-gradient(#00111d, #003050, #00111d); background-image: linear-gradient(#00111d, #003050, #00111d); }
  764
+.cms-logo-header span { color: white; display: block; }
765 765
 .cms-logo-header span a { color: #3ebae0; display: inline; }
766 766
 
767  
-.cms-logo { border-bottom: 1px solid #03090c; height: 31px; overflow: hidden; padding: 0 0 0 4px; vertical-align: middle; font-size: 12px; }
  767
+.cms-logo { border-bottom: 1px solid #03090c; overflow: hidden; padding: 8px 0; position: relative; vertical-align: middle; font-size: 12px; }
768 768
 .cms-logo .version { display: none; }
769  
-.cms-logo a { display: inline-block; height: 24px; width: 24px; float: left; margin-right: 8px; background: url("../images/logo_small.png") no-repeat; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; }
770  
-.cms-logo span { font-weight: bold; font-size: 14px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; padding-top: 1px; }
  769
+.cms-logo a { position: absolute; top: 8px; bottom: 8px; left: 4px; display: block; width: 24px; background: url("../images/logo_small.png") no-repeat left center; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; }
  770
+.cms-logo span { font-weight: bold; font-size: 14px; line-height: 20px; padding: 2px 0; margin-left: 44px; }
771 771
 
772 772
 .cms-login-status { border-top: 1px solid #19435c; height: 24px; padding: 7px 4px 0 4px; overflow: hidden; line-height: 16px; font-size: 11px; }
773 773
 .cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 3px; background: url('../images/sprites-32x32-sb47394f892.png') 0 -76px no-repeat; text-indent: -9999em; }
24  admin/scss/_menu.scss
@@ -10,7 +10,7 @@
10 10
 .cms-logo-header {
11 11
 	background-color: darken($color-dark-bg, 10%);
12 12
 	position: relative;
13  
-	padding: $grid-y + 1 8px 0 4px;
  13
+	padding: 0 8px 0 4px;
14 14
 	line-height: 24px;
15 15
 
16 16
 	@include background-image(
@@ -19,8 +19,6 @@
19 19
 
20 20
 	span {
21 21
 		color: $color-text-light;
22  
-		white-space: nowrap;
23  
-		text-overflow: ellipsis;
24 22
 		display: block;
25 23
 
26 24
 		a {
@@ -32,9 +30,9 @@
32 30
 
33 31
 .cms-logo {
34 32
 	border-bottom: 1px solid darken($color-dark-separator, 20%);
35  
-	height: 31px;
36 33
 	overflow: hidden;
37  
-	padding: 0 0 0 4px;
  34
+	padding: $grid-y 0;
  35
+	position: relative;
38 36
 	vertical-align: middle;
39 37
 	font-size: $font-base-size;
40 38
 
@@ -43,12 +41,13 @@
43 41
 	} 
44 42
 
45 43
 	a {
46  
-		display: inline-block;
47  
-		height: 24px;
  44
+		position: absolute;
  45
+		top: $grid-y;
  46
+		bottom: $grid-y;
  47
+		left: 4px;
  48
+		display: block;
48 49
 		width: 24px;
49  
-		float: left;
50  
-		margin-right: 8px;
51  
-		background: $application-logo-small no-repeat;
  50
+		background: $application-logo-small no-repeat left center;
52 51
 		text-indent: -9999em;
53 52
 		padding-right: 7px;
54 53
 		border-right: 1px solid $color-dark-separator;
@@ -57,8 +56,9 @@
57 56
 	span {
58 57
 		font-weight: bold;
59 58
 		font-size: 14px;
60  
-		@include hide-text-overflow();
61  
-		padding-top:1px;
  59
+		line-height: 20px;
  60
+		padding: 2px 0;
  61
+		margin-left: 44px;
62 62
 	}
63 63
 }
64 64
 

0 notes on commit b44ff84

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