[#354] Merge fixes for masthead

ckan/public/base/less/masthead.less

@@ -1,4 +1,3 @@
-@mastheadPadding: 5px 10px 3px;
 @notificationsBg: #C9403A;
 
 .account-masthead {
@@ -78,45 +77,17 @@
   }
 }
 
-header.masthead {
-
 .masthead {
   .clearfix();
-
-	.container {
   min-height: 55px;
-	}
-
-	a {
   color: @mastheadTextColor;
   background: @mastheadBackgroundColor url("@{bgPath}");
 
-	hgroup {
-		h1,
-		h2 {
-			float: left;
-			font-size: 34px;
-			line-height: 1.5;
-		}
-		h1 {
-			font-weight: 900;
-			letter-spacing: -1px;
-		}
   .container {
-			position: absolute;
-			bottom: -3px;
-			left: 0;
-			margin: 0;
-			font-size: 15px;
     position: relative;
-			line-height: 1.2;
-			white-space: nowrap;
-		}
   }
 
   a {
-		position: absolute;
-		top: 10px;
     color: @mastheadLinkColor;
   }
 
@@ -143,125 +114,18 @@ header.masthead {
     }
   }
 
-	.navigation {
-		margin-right: 20px;
-		ul.unstyled {
-			.clearfix();
-			margin: 5px 0;
   .content {
-				display: block;
-				float: left;
-				a {
-					display: block;
-					font-size: 12px;
     position: absolute;
-					padding: 4px 10px;
-					.border-radius(3px);
-				}
-				&.active a {
     top: 10px;
     right: 0;
-				}
-			}
-		}
   }
 
   .section {
-		margin: 3px 0;
-		input {
-			width: 190px;
     float: left;
-			padding: 4px;
-		}
   }
 
-	.account {
-		background: darken(@mastheadBackgroundColorEnd, 5);
-		padding: 3px 5px;
-		margin: 2px 0 2px 30px;
-		.border-radius(4px);
-		.box-shadow(inset 0 2px 4px darken(@mastheadBackgroundColorEnd, 10));
-		ul.unstyled {
-			.clearfix();
-			li {
-				display: block;
-				float: left;
-				a {
-					display: block;
-					font-size: 12px;
-					font-weight: bold;
-					padding: 4px 10px;
-					&.sub {
-						font-weight: 300;
-						border-left: 1px solid darken(@mastheadBackgroundColorEnd, 10);
-					}
-				}
-			}
-		}
-		.dropdown {
-			float: left;
-		}
-		.button {
-			display: block;
-			text-decoration: none;
-			background-color: @mastheadBackgroundColorStart;
-			color: mix(@mastheadBackgroundColorStart, @mastheadLinkColor, 50%);
   input[type="text"] {
-			.border-radius(4px);
-			.box-shadow(inset 0 1px 0 lighten(@mastheadBackgroundColorStart, 5));
-		}
-		.image {
-			margin: 2px 0;
-			padding: 0 4px 0 0;
-			overflow: hidden;
-			font-size: 10px;
-			.border-radius(4px);
-			i {
-				vertical-align: -1px;
-			}
-			img {
-				opacity: 0.7;
-				border-right: 1px solid @mastheadBackgroundColorEnd;
-				.border-radius(4px 0 0 4px);
-			}
-		}
-		.notifications {
-			padding: 4px 8px 3px 8px;
-			margin: 2px 5px 2px 0;
-			&.notifications-important {
-				color: @mastheadLinkColor;
-				background-color: @notificationsBg;
     border-color: darken(@mastheadBackgroundColor, 5);
-				.box-shadow(inset 0 1px 0 lighten(@notificationsBg, 5));
-			}
-		}
-		.dropdown {
-			&.open .image img,
-			.image:hover img {
-				opacity: 1;
-				border-right-color: lighten(@mastheadBackgroundColorEnd, 10);
-			}
-			&.open .button,
-			.button:hover {
-				color: @mastheadLinkColor;
-				background-color: mix(@mastheadBackgroundColorStart, @mastheadLinkColor, 60%);
-				.box-shadow(inset 0 1px 0 mix(@mastheadBackgroundColorStart, @mastheadLinkColor, 50%));
-				text-decoration: none;
-			}
-			&.open .notifications-important,
-			.notifications-important:hover {
-				background-color: lighten(@notificationsBg, 10);
-				text-shadow: 0 1px 1px @notificationsBg;
-				.box-shadow(inset 0 1px 0 lighten(@notificationsBg, 15));
-			}
-		}
-		&.authed {
-			margin: 0 0 0 30px;
-		}
-		&.not-authed {
-			padding-top: 2px;
-			padding-bottom: 2px;
-		}
   }
 
   .navigation {
@@ -292,4 +156,4 @@ header.masthead {
     left: 10px;
     color: rgba(255, 255, 255, 0.5);
   }
-}
+}