Permalink
Browse files

Conflict resolution

  • Loading branch information...
2 parents a736ab9 + 460fb10 commit a39f49b606c3174230c5370b74a295bf8d28eb5c @dannydb dannydb committed Sep 13, 2012
Showing with 168 additions and 74 deletions.
  1. +30 −12 css/adaptive.css
  2. BIN img/menu-arrow.png
  3. BIN img/search-glass.png
  4. +138 −62 style.css
View
@@ -76,51 +76,65 @@ body:after {
background-image: linear-gradient(#344b61, #222e38);
border-top: 1px solid rgba(0,0,0,.5);
}
-#global-branding header { width: auto; }
-#global-branding h4 { margin: 0; }
+#global-branding header { width: auto; margin: 0; }
+#wrapper #global-branding header h3 {
+ font-size: 24px;
+ margin: 0;
+}
+#wrapper #global-branding header h4 {
+ margin: 0;
+ padding: 0;
+ font-size: 18px;
+ font-weight: 400;
+}
#wrapper #global-branding header h3 a,
#topnav li a,
#wrapper #global-branding header h4 {
+ display: block;
color: #fff;
+ border: none;
text-shadow: 0 1px 2px rgba(0,0,0,.5);
-webkit-font-smoothing: antialiased;
}
-#global-branding .sitesearch {
+#wrapper #global-branding .sitesearch {
display: none;
position: absolute;
top: 0;
left: 0;
- z-index: 100;
+ z-index: 250;
width: 100% !important;
}
-#local-wrapper #global-branding .sw-about-search {
+#wrapper #local-wrapper #global-branding .sw-about-search {
-webkit-box-sizing: border-box;
height: 40px !important;
width: 100% !important;
padding: 0 5px !important;
vertical-align: bottom;
position: static !important;
background-image: none;
- background-color: #333;
+ color: #999 !important;
+ background-color: #333 !important;
font-family: proxima-nova,sans-serif;
font-size: 18px !important;
-webkit-border-radius: 0 !important;
-moz-border-radius: 0 !important;
border-radius: 0 !important;
- -webkit-box-shadow: inset 0 -1px 2px rgba(0,0,0,.7);
- -moz-box-shadow: inset 0 -1px 2px rgba(0,0,0,.7);
- box-shadow: inset 0 -1px 2px rgba(0,0,0,.7);
+ -webkit-box-shadow: inset 0 -1px 2px rgba(0,0,0,.7) !important;
+ -moz-box-shadow: inset 0 -1px 2px rgba(0,0,0,.7) !important;
+ box-shadow: inset 0 -1px 2px rgba(0,0,0,.7) !important;
}
#local-wrapper #global-branding input[placeholder] { color: #333 !important; }
#local-wrapper #global-branding input:focus {
color: #fff !important;
}
#global-branding .sitesearch .search-submit {
position: absolute;
- right: 5px;
+ right: 0;
+ left: auto;
top: 0;
- background: url(../img/mobile-search.png) no-repeat;
+ bottom: auto;
+ background: transparent url(../img/mobile-search.png) no-repeat !important;
width: 40px;
height: 40px;
-webkit-border-radius: 0;
@@ -143,15 +157,19 @@ body:after {
}
#topnav li a {
padding: 10px;
+ background: transparent;
color: #ccc;
border-left: none;
font-family: proxima-nova,sans-serif !important;
+ font-size: 18px !important;
+ line-height: 1 !important;
+ height: auto !important;
font-weight: 300 !important;
text-transform: none !important;
letter-spacing: 0 !important;
}
#topnav li a:target {
- background: #666;
+ background: #666 !important;
}
#topnav li {
display: block;
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit a39f49b

Please sign in to comment.