$lightgrey: #EEE;
$darkgrey: #AAA;
$hovercolor: 20%;
-$headerHeight: 75px;
-$sidebarWidth: 350px;
-$keyline: 1px solid $grey;
+$headerHeight: 54px;
+$sidebarWidth: 300px;
+$keyline: 1px solid $lightgrey;
+$border-radius: 3px;
/* Styles common to large and small screens */
}
h1, h2, h3 {
- font-weight: bold;
+ font-weight: 500;
line-height: 1.2;
}
a {
color: #00f;
text-decoration: none;
+ -webkit-appearance: none;
+ outline: 0;
&:hover {
text-decoration: underline;
}
line-height: $lineheight;
}
th {
- font-weight: bold;
+ font-weight: 500;
vertical-align: top;
}
td {
}
}
-/* Rules for the search box */
-
-#search_form {
- position: relative;
- padding: $lineheight;
- background-color: $lightgrey;
- border-bottom: $keyline;
-
- #query_wrapper {
- position: relative;
- overflow: hidden;
- }
-
- input {
- width: 100%;
- height: 30px;
- border-right: none;
- border-radius: 2px 0 0 2px;
-
- transition: 300ms linear;
- -webkit-transition: 300ms linear;
- -moz-transition: 300ms linear;
- }
-
- input:focus {
- outline: none;
- box-shadow: 0px 0px 7px #9ED485;
- }
-
- input[type=submit] {
- float: right;
- width: auto;
- min-width: 0;
- border-radius: 0 2px 2px 0;
- }
-
- #describe_location {
- position: absolute;
- top: 6px;
- right: 6px;
- font-size: 10px;
- color: $blue;
- }
-}
-
/* Utility for de-emphasizing content */
.deemphasize {
}
}
-/* Rules for donation request box */
-
-a.donate {
- display: block;
- width: 163px;
- padding: $lineheight/4;
- border: 1px solid #AED1A0;
- background: #cbeea7;
- font-size: $typeheight;
- line-height: 1.4;
- text-align: center;
- border-radius: 2px;
- color: #222;
- margin: $lineheight/2 auto;
-
- &:hover {
- background: #9ed485;
- text-decoration: none;
- }
-}
-
/* Rules for the header */
header {
height: $headerHeight;
position: relative;
- border-bottom: $keyline;
+ // border-bottom: $keyline;
z-index: 1001;
+ font-size: 13px;
h1, nav, nav > ul, nav > ul > li, .dropdown {
display: inline-block;
> * {
height: 100%;
- padding: $lineheight;
+ padding: $lineheight/2 $lineheight;
}
h1, nav.primary {
}
img.logo {
- width: 40px;
- height: 40px;
+ width: 30px;
+ height: 30px;
+ margin-top: -4px;
vertical-align: middle;
}
h1 {
margin: 0;
- border-right: $keyline;
+ padding: ($lineheight - 3) $lineheight ($lineheight + 3);
a {
color: #000;
nav.primary {
> ul {
- $border: 1px solid darken($green, 20%);
+ $border: 1px solid $green;
border: $border;
- border-radius: 4px;
+ border-radius: $border-radius;
> li {
border-right: $border;
- &:last-child { border-right: 0; }
+ &:last-child {
+ border-right: 0;
+ > a { border-radius: 0 $border-radius $border-radius 0; }
+ }
+ &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
+ > a:hover { background: lighten($green, 30%); }
+ &.current > a:hover { background: $green; }
+ &.disabled > a:hover { background: lighten($green, 38%); }
+ &.dropdown {
+ > a.tab { border-right: 1px solid lighten($green, 30%); }
+ &.current > a.tab { border-right: 1px solid lighten($green, 10%); }
+ }
}
}
a.tab,
.dropdown-toggle {
display: inline-block;
- font-weight: bold;
+ font-weight: 500;
color: $green;
padding: 5px 15px;
}
.dropdown-toggle {
- padding: 5px 10px;
- }
-
- #edit_tab a.tab {
- border-right: 1px solid lighten($green, 20%);
+ padding: 5px 6px;
}
.caret {
border-top-color: $green;
+ margin-top: 10px;
}
.disabled a {
> ul a,
.dropdown-toggle {
display: inline-block;
- font-weight: bold;
text-decoration: none;
color: $darkgrey;
- padding: 5px 5px;
+ padding: 5px;
+
+ &:hover { color: darken($darkgrey, 10%); }
}
> ul li.current a {
.user-menu {
$border: 1px solid $grey;
+ font-weight: 500;
border: $border;
- border-radius: 4px;
+ border-radius: $border-radius;
margin-left: 10px;
> li {
border-right: $border;
- &:last-child { border-right: 0; }
+ &:last-child {
+ border-right: 0;
+
+ > a {
+ border-radius: 0 $border-radius $border-radius 0;
+ }
+ }
+ &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
+ &:hover a { background: lighten($darkgrey, 30%); }
}
a {
padding: 5px 15px;
}
+
+ &.logged-in > a {
+ padding: 0;
+ > .user-button {
+ padding: 5px 10px 5px 6px;
+ display: inline-block;
+ }
+ }
}
.caret {
border-top-color: $grey;
- margin-top: 10px;
+ margin-top: 9px;
}
img.user_thumbnail_tiny {
border: 0;
vertical-align: top;
- margin-top: 2px;
- border-radius: 2px 0 0 2px;
+ margin-top: 0px;
+ margin: 3px 0 0 3px;
+ border-radius: 2px;
}
#inboxanchor {
display: inline-block;
vertical-align: top;
- height: 20px;
- margin: 2px 7px 0 0;
- background-color: $grey;
- border-radius: 0 2px 2px 0;
+ height: 25px;
+ margin: 3px 0 3px 3px;
+ background-color: lighten($grey, 10%);
+ line-height: 20px;
+ border-radius: 2;
}
.dropdown-menu {
border-radius: 0 0 0 4px;
}
-/* Rules for the home page */
+/* Rules for the sidebar and main map area */
-#map {
- height: 100%;
- overflow: hidden;
-}
+.map-layout {
+ #content {
+ position: absolute;
+ top: $headerHeight;
+ bottom: 0;
+ width: 100%;
+ }
-#map-ui {
- display: none;
- position: relative;
- float: right;
- width: 250px;
- height: 100%;
- background: white;
- overflow: auto;
+ #sidebar, #map {
+ position: relative;
+ height: 100%;
+ overflow-x: hidden;
+ overflow-y: auto;
+ }
+
+ #sidebar {
+ float: left;
+ width: $sidebarWidth;
+ border-right: $keyline;
+
+ h2, h3, h4 {
+ padding: $lineheight $lineheight $lineheight/2;
+ }
+
+ h4 {
+ font-weight: normal;
+ color: #666;
+ font-size: 12px;
+ }
+
+ .icon.close {
+ position: absolute;
+ right: $lineheight;
+ }
+
+ .footer {
+ position: absolute;
+ bottom: 0;
+ }
+
+ p.credits {
+ font-size: 11px;
+ color: #999;
+
+ a {
+ color: #666;
+ }
+ }
+
+ p.large-text {
+ font-size: 1.7em;
+ line-height: 1.4em;
+ font-weight: 300;
+ }
+ }
+
+ #sidebar.minimized {
+ position: absolute;
+ z-index: 1000;
+ height: auto;
+ border-right: none;
+
+ #sidebar_content {
+ display: none;
+ }
+
+ #search_form {
+ background: none;
+ width: 78%;
+ }
+ }
- .section {
- border-bottom: 1px solid #DDD;
- padding: 15px;
+ #map {
+ height: 100%;
+ overflow: hidden;
}
- a.close-button {
+ #map-ui {
+ display: none;
+ position: relative;
float: right;
- padding:5px;
- font-size:20px;
- line-height:10px;
- color:#222;
- border:1px solid #ddd;
+ width: 250px;
+ height: 100%;
+ background: white;
+ overflow: auto;
+
+ .section {
+ border-bottom: 1px solid #DDD;
+ padding: 15px;
+ }
+
+ a.close-button {
+ float: right;
+ padding:5px;
+ font-size:20px;
+ line-height:10px;
+ color:#222;
+ border:1px solid #ddd;
+ }
}
}
/* Rules for the sidebar */
-#sidebar {
- border-right: $keyline;
-
- .alert {
- background: #e00;
- }
-
- h2, h3, h4 {
- padding: $lineheight;
- border-bottom: $keyline;
- }
-
- h4 {
- font-weight: normal;
- }
-
- .icon.close {
- position: absolute;
- right: $lineheight;
- }
-
- .footer {
- position: absolute;
- bottom: 0;
- }
-
- p.credits {
- font-size: 11px;
- color: #999;
-
- a {
- color: #666;
- }
- }
-}
-
.sidebar_heading {
position: relative;
padding: $lineheight/2 $lineheight;
#sidebar_content {
position: absolute;
- top: 72px;
+ top: 50px;
bottom: 0;
width: 100%;
overflow-y: auto;
+
+ .loader,
+ .load_more {
+ text-align: center;
+ margin: $lineheight auto;
+ width: $lineheight;
+ display: block;
+ }
+}
+
+/* Rules for the search box */
+
+#search_form {
+ position: relative;
+ padding: $lineheight/2 $lineheight;
+ background-color: $lightgrey;
+
+ #query_wrapper {
+ position: relative;
+ overflow: hidden;
+ }
+
+ input {
+ width: 100%;
+ height: 30px;
+ border-right: none;
+ border-radius: 2px 0 0 2px;
+
+ transition: 300ms linear;
+ -webkit-transition: 300ms linear;
+ -moz-transition: 300ms linear;
+ }
+
+ input:focus {
+ outline: none;
+ box-shadow: 0px 0px 7px #9ED485;
+ }
+
+ input[type=submit] {
+ float: right;
+ width: auto;
+ min-width: 0;
+ border-radius: 0 2px 2px 0;
+ }
+
+ #describe_location {
+ position: absolute;
+ top: 6px;
+ right: 6px;
+ font-size: 10px;
+ color: $blue;
+ }
+}
+
+/* Rules for donation request box */
+
+a.donate {
+ display: block;
+ width: 163px;
+ padding: $lineheight/4;
+ border: 1px solid #AED1A0;
+ background: #cbeea7;
+ font-size: $typeheight;
+ line-height: 1.4;
+ text-align: center;
+ border-radius: 2px;
+ color: #222;
+ margin: $lineheight/2 auto;
+
+ &:hover {
+ background: #9ed485;
+ text-decoration: none;
+ }
+}
+
+/* Rules for rotating sidebar ads */
+
+.ad-container {
+ display: block;
+ height: 120px;
+ margin: auto;
+ overflow: hidden;
+ position: relative;
+ border-bottom: 1px solid #ccc;
+
+ a {
+ display: block;
+ width: 165px;
+ margin: auto;
+ }
+
+ .ad {
+ height: 100px;
+ border: 0;
+ background: #fff;
+ }
}
/* Rules for the map key which appears in the popout sidebar */
/* Rules for search results which appear in the popout sidebar */
-.search_searching {
- margin-top: $lineheight/4;
- margin-bottom: $lineheight/4;
-}
-
.search_results_entry {
- .search_searching {
- text-align: center;
- margin: $lineheight auto;
- width: $lineheight;
- display: block;
- }
-
ul li {
- border-bottom: 1px solid #ccc;
+ border-bottom: $keyline;
+ &:first-child { border-top: $keyline; }
}
.search_details {
}
}
-.browse_details {
- position: relative;
+/* Rules for entity history */
+#sidebar_content {
+ .browse_details {
+ position: relative;
+ border-bottom: $keyline;
+ }
}
.browse_status {
display: none;
}
+/* Rules for the changeset list shown by the history tab */
+
+#sidebar .changesets {
+ li {
+ padding: $lineheight;
+ border-bottom: $keyline;
+ cursor: pointer;
+ }
+
+ li.selected {
+ background: #FCFEA4;
+ }
+}
+
+/* Rules for the data browser */
+
+#sidebar_content {
+ .browse-section {
+ padding: 10px 20px;
+
+ h4 {
+ padding: 0;
+ }
+ }
+
+ .paginate ul {
+ padding-left: 20px;
+ }
+
+ .browse-field {
+ margin-bottom: 10px;
+
+ h4 {
+ padding: 5px 0 5px 10px;
+ font-size: 12px;
+ border: 1px solid #CCC;
+ border-radius: 4px 4px 0 0;
+ background-color: #F6F6F6;
+ }
+
+ p {
+ padding: 7px 10px;
+ font-size: 12px;
+ background-color: #FFF;
+ border: 1px solid #CCC;
+ border-top: 0;
+ border-radius: 0 0 4px 4px;
+ }
+ }
+
+ .browse-tag-list {
+ border: 1px solid #CCC;
+ border-radius: 4px;
+ font-size: 12px;
+
+ li {
+ border-bottom: 1px solid #CCC;
+ }
+
+ li:last-child {
+ border-bottom: 0;
+ }
+
+ .browse-tag-k,
+ .browse-tag-v {
+ display: inline-block;
+ width: 50%;
+ height: 30px;
+ float: left;
+ padding: 6px 10px;
+ }
+
+ .browse-tag-k {
+ font-weight: 500;
+ background-color: #F6F6F6;
+ border-radius: 4px 0 0 4px;
+ }
+
+ .browse-tag-v {
+ border-left: 1px solid #CCC;
+ }
+ }
+}
+
+/* Rules for the changeset details */
+
+#sidebar_content {
+ .browse-section.header {
+ padding: 20px;
+ border-bottom: $keyline;
+
+ h2 {
+ padding: 0 0 5px 0;
+ border-bottom: none;
+ }
+ }
+}
+
/* Rules for export information which appears in the popout sidebar */
.export_bounds {
margin: $lineheight/4;
}
-/* Rules for the sidebar and main content area */
+/* Rules for edit pages */
-.map-layout {
+.site-edit {
#content {
position: absolute;
top: $headerHeight;
width: 100%;
}
- #sidebar, #map {
- position: relative;
+ #map {
height: 100%;
- overflow-x: hidden;
- overflow-y: auto;
- }
-
- #sidebar {
- float: left;
- width: $sidebarWidth;
}
}
+/* Rules for non-map content pages */
+
.content-heading {
background: $lightgrey;
- border-bottom: $keyline;
+ // border-bottom: $keyline;
}
.content-body {
float: right;
}
-/* Rules for the changeset list shown by the history tab */
-
-#sidebar .changesets {
- li {
- padding: $lineheight;
- border-bottom: $keyline;
- }
-}
-
-/* Rules for the data browser */
-
-body.browse #sidebar_content {
- .browse-section {
- padding: 20px;
- border-bottom: 1px solid #CCC;
- }
-
- .browse-field {
- margin-bottom: 10px;
-
- h4 {
- padding: 5px 0 5px 10px;
- font-size: 12px;
- border: 1px solid #CCC;
- border-radius: 4px 4px 0 0;
- background-color: #F6F6F6;
- }
-
- p {
- padding: 7px 10px;
- font-size: 12px;
- background-color: #FFF;
- border: 1px solid #CCC;
- border-top: 0;
- border-radius: 0 0 4px 4px;
- }
- }
-
- .browse-tag-list {
- border: 1px solid #CCC;
- border-radius: 4px;
- font-size: 12px;
-
- li {
- border-bottom: 1px solid #CCC;
- }
-
- li:last-child {
- border-bottom: 0;
- }
-
- .browse-tag-k,
- .browse-tag-v {
- display: inline-block;
- width: 50%;
- height: 30px;
- float: left;
- padding: 9px 10px;
- }
-
- .browse-tag-k {
- font-weight: bold;
- background-color: #F6F6F6;
- border-radius: 4px 0 0 4px;
- }
-
- .browse-tag-v {
- border-left: 1px solid #CCC;
- }
- }
-}
-
/* Rules for the trace list shown by the traces tab etc */
#trace_list {
/* Rules for "flash" notice boxes shown at the top of the content area */
-.flash {
- padding: $lineheight;
- &#error {
- background-color: #ff7070;
- }
- &#warning {
- background-color: #ffe0cc;
- }
- &#notice {
- background-color: #CBEEA7;
- }
+.error {
+ padding: $lineheight;
+ background-color: #ff7070;
+}
+
+.warning {
+ padding: $lineheight;
+ background-color: #ffe0cc;
+}
+
+.notice {
+ padding: $lineheight;
+ background-color: #CBEEA7;
}
/* Rules for highlighting fields with rails validation errors */
h2 {
margin: 0 -10px 10px -10px;
padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
- font-weight: bold;
+ font-weight: 500;
font-size: 12px;
background-color: #c00;
color: #fff;
display: block;
margin-bottom: $lineheight/4;
font-size: $typeheight;
- font-weight: bold;
+ font-weight: 500;
line-height: 1.5;
}
label.standard-label.secondary {
}
}
+div.secondary-actions {
+ padding: 10px;
+ border-top: 1px solid #ccc;
+ text-align: center;
+}
+
/* Utility for managing inner content areas */
.inner22 { padding: $lineheight;}
}
}
-/*
- * Rules for the iD editor
- */
+/* Rules for the iD editor */
.id-embed {
width: 100%;
height: 100%;
}
-/* Rules for rotating sidebar ads */
-.ad-container {
- display: block;
- height: 120px;
- margin: auto;
- overflow: hidden;
- position: relative;
- border-bottom: 1px solid #ccc;
-
- a {
- display: block;
- width: 165px;
- margin: auto;
- }
-
- .ad {
- height: 100px;
- border: 0;
- background: #fff;
- }
-}
-
/* Rules for dropdown menus */
.dropdown {
.dropdown-menu {
position: absolute;
top: 100%;
- left: 0;
+ left: -1px;
z-index: 1000;
display: none;
float: left;
width: 240px;
height: 150px;
padding: 20px 20px 20px 40px;
- font: bold 24px/25px Helvetica, Arial, sans-serif;
+ font: 500 24px/25px Helvetica, Arial, sans-serif;
white-space: nowrap;
color: #fff;
background: #76c551
projects / rails.git / blobdiff