$lightblue: #B8C5F0;
$green: #7ebc6f;
$grey: #CCC;
+$red: red;
$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 */
cursor: help;
}
+strong { font-weight: 500; }
+
/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
.clearfix:before,
margin: 0px;
padding: 0px;
text-align: left;
+ height: 100%;
}
body.slim {
}
h1, h2, h3 {
- font-weight: bold;
+ font-weight: 500;
line-height: 1.2;
}
+h4, h5 { font-weight: 500; }
+
h1 {
font-size: 18px;
}
font-size: 12px;
}
+#container { position: relative; }
+
.column-1 {
width: 50%;
margin: 0 0 $lineheight/2 0;
margin-right: $lineheight/4;
}
+.red { color: $red; }
+
/* Rules for icons */
.icon {
.icon.clipboard { background-position: -160px 0; }
.icon.link { background-position: -180px 0; }
.icon.close { background-position: -200px 0; }
+.icon.close:hover { background-position: -200px -20px; }
.icon.check { background-position: -220px 0; }
.icon.note { background-position: -240px 0; }
.icon.gear { background-position: -260px 0; }
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 header */
+#menu-icon {
+ display: none !important;
+ float: right;
+ background: image-url("menu-icon.png") no-repeat;
+ background-size: 30px 30px;
+ display: block;
+ width: 30px;
+ height: 30px;
+ margin: 14px 10px 0 0;
+ opacity: 0.6;
+}
+
header {
height: $headerHeight;
position: relative;
- 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; }
+ float: left;
+ &:last-child {
+ border-right: 0;
+ }
+ > 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 {
position: absolute;
right: 0;
- > ul a,
- .dropdown-toggle {
- display: inline-block;
- font-weight: bold;
- text-decoration: none;
- color: $darkgrey;
- padding: 5px 5px;
+ > ul {
+ vertical-align: middle;
+ a, .dropdown-toggle {
+ display: inline-block;
+ text-decoration: none;
+ color: $darkgrey;
+ 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; }
+ float: left;
+ &: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;
+ color: $darkgrey;
+ }
+ &:hover > .user-button { color: darken($darkgrey, 5%); }
}
}
.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 {
left: auto;
- right: 0;
+ right: -1px;
+ border-radius: 3px 0 3px 3px;
.count-number {
float: right;
}
}
+#compact-secondary-nav {
+ display: none;
+ ul li a {
+ width: 100%;
+ color: #333;
+ &:hover { color: #fff; }
+ }
+}
+
+@media only screen and (max-width:960px) {
+ #compact-secondary-nav {
+ display: inline-block;
+ }
+ .compact-hide {
+ display: none;
+ }
+}
+
/* Utility for styling notification numbers */
.count-number {
padding: 2px $lineheight/4;
border-radius: 2px;
- background: #d7d7ff;
+ background: lighten($green, 30%);
margin: 0 2px;
font-size: 11px;
color: #333;
#sidebar {
float: left;
width: $sidebarWidth;
- border-right: $keyline;
-
- .alert {
- background: #e00;
- }
+ background: #fff;
h2, h3, h4 {
- padding: $lineheight;
- border-bottom: $keyline;
+ padding: $lineheight $lineheight $lineheight/2;
}
h4 {
font-weight: normal;
+ color: #666;
+ font-size: 12px;
}
.icon.close {
position: absolute;
right: $lineheight;
+ cursor: pointer;
}
- .footer {
- position: absolute;
- bottom: 0;
+ -webkit-transition: margin 300ms linear;
+ -moz-transition: margin 300ms linear;
+ transition: margin 300ms linear;
+ }
+
+ .overlay-sidebar #sidebar {
+ position: absolute;
+ z-index: 1000;
+ height: auto;
+ border-radius: 5px;
+ overflow: hidden;
+ margin-top: $typeheight;
+ margin-left: $typeheight;
+ }
+
+ .welcome {
+ p {
+ padding: $lineheight/2 $lineheight $lineheight;
+ font-size: 110%;
+ font-weight: 300;
}
- p.credits {
- font-size: 11px;
- color: #999;
+ .button {
+ width: 50%;
+ float: left;
+ margin: 0;
+ border-radius: 0;
+ font-weight: 400;
+ padding: .6em;
- a {
- color: #666;
+ &.learn-more {
+ border-right: 1px solid #fff;
}
}
}
.section {
border-bottom: 1px solid #DDD;
- padding: 15px;
+ padding: 10px 20px;
}
a.close-button {
}
.layers-ui {
- li {
- border-radius: 4px;
- overflow: hidden;
- margin-bottom: 10px;
- }
-
- label {
- display: block;
- padding: 5px 5px 5px 7px;
- background-color: #eee;
- cursor: pointer;
- }
-
- li.active label {
- background-color: #ccc;
- }
-
.base-layers {
.leaflet-container {
width: 100%;
height: 50px;
cursor: pointer;
}
+
+ li {
+ overflow: hidden;
+ border-radius: 3px;
+ border: 2px solid #fff;
+ margin-bottom: 8px;
+ position: relative;
+ transition: border-color 0.08s ease-in;
+
+ label {
+ position: absolute;
+ top: 0;
+ left: 0;
+ padding: 2px 6px;
+ border-bottom-right-radius: 3px;
+ cursor: pointer;
+ font-weight: 500;
+ font-size: 16px;
+ text-stroke: 2px #fff;
+ background: rgba(255,255,255,.9);
+ text-shadow:
+ -2px -2px 1px #fff,
+ 2px -2px 1px #fff,
+ -2px 2px 1px #fff,
+ 2px 2px 1px #fff;
+ input[type="radio"] {
+ display: none;
+ }
+ }
+
+ &.active { border-color: darken($green, 10%); }
+ &:hover {
+ border-color: $grey;
+ &.active { border-color: darken($green, 20%); }
+ }
+ }
+ }
+
+ .overlay-layers {
+ p {
+ font-size: 13px;
+ margin-bottom: 8px;
+ }
}
}
}
}
-.leaflet-top.leaflet-right {
+.leaflet-top {
top: $lineheight !important;
.leaflet-control {
margin-right: 0px !important;
text-align: center;
}
+.donate-attr { color: darken($green, 10%) !important; }
+
/* Rules for the sidebar */
.sidebar_heading {
position: relative;
padding: $lineheight/2 $lineheight;
- background: $offwhite;
- border-bottom: 1px solid #ccc;
+ // background: $offwhite;
+ // border-bottom: 1px solid #ccc;
+ > .close {
+ float: right;
+ margin-top: 2px;
+ cursor: pointer;
+ }
}
-.sidebar_close {
- position: absolute;
- height: $lineheight;
- top: 0px;
- bottom: 0;
- right: $lineheight;
- margin: auto;
+#browse_status {
+ p {
+ padding: $lineheight;
+ }
}
#sidebar_content {
- position: absolute;
- top: 72px;
- 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;
+ padding: $lineheight/2;
background-color: $lightgrey;
- border-bottom: $keyline;
#query_wrapper {
position: relative;
a.donate {
display: block;
- width: 163px;
- padding: $lineheight/4;
- border: 1px solid #AED1A0;
- background: #cbeea7;
+ padding: $lineheight/4 $lineheight;
+ border: 1px solid $green;
font-size: $typeheight;
line-height: 1.4;
text-align: center;
border-radius: 2px;
color: #222;
- margin: $lineheight/2 auto;
+ margin: $lineheight/2 $lineheight;
&:hover {
- background: #9ed485;
+ background: $green;
text-decoration: none;
}
}
/* 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 {
li {
padding: $lineheight;
border-bottom: $keyline;
+ cursor: pointer;
+
+ &.selected { background: #FFFFE6; }
+ /* color is derived from changeset bbox fillColor in history.js */
+
+ h4 {
+ padding: 0;
+ }
+ }
+
+ .comment a {
+ font-weight: 500;
+ color: #000;
}
}
#sidebar_content {
.browse-section {
- padding: 20px;
- border-bottom: 1px solid #CCC;
+ padding: 10px 20px;
+
+ h4 {
+ padding: 0;
+ }
+
+ .paginate {
+ float: right;
+ padding: 1px 6px;
+ border: 1px solid #eee;
+ border-radius: 3px;
+ }
+ }
+
+ .paginate ul, .note-comments ul {
+ padding-left: 20px;
}
.browse-field {
}
.browse-tag-list {
- border: 1px solid #CCC;
- border-radius: 4px;
+ background-color: #F6F6F6;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
font-size: 12px;
+ margin-left: -$lineheight;
+ margin-right: -$lineheight;
li {
- border-bottom: 1px solid #CCC;
+ border-bottom: 1px solid #ddd;
}
li:last-child {
.browse-tag-v {
display: inline-block;
width: 50%;
- height: 30px;
float: left;
- padding: 9px 10px;
+ padding: 6px 10px 6px $lineheight;
}
.browse-tag-k {
- font-weight: bold;
+ font-weight: 500;
background-color: #F6F6F6;
- border-radius: 4px 0 0 4px;
}
.browse-tag-v {
- border-left: 1px solid #CCC;
+ border-left: 1px solid #ddd;
+ background-color: #fff;
}
}
}
/* Rules for export information which appears in the popout sidebar */
-.export_bounds {
+.export_bounds, .export_button {
text-align: center;
}
margin: $lineheight/4;
}
+#export_osm {
+ span.small-title {
+ font-weight: 500;
+ display: block;
+ font-size: 14px;
+ padding-bottom: 5px;
+ }
+
+ dl {
+ padding-left: 30px;
+ font-size: 13px;
+ color: #666;
+ dd {
+ margin-left: 0;
+ margin-bottom: 10px;
+ }
+ }
+}
+
+/* Rules for edit pages */
+
+.site-edit {
+ #content {
+ position: absolute;
+ top: $headerHeight;
+ bottom: 0;
+ width: 100%;
+ }
+
+ #map {
+ height: 100%;
+ }
+}
+
/* Rules for non-map content pages */
.content-heading {
background: $lightgrey;
- border-bottom: $keyline;
+
+ h1 { font-size: 22px; }
}
.content-body {
}
}
-@media only screen and (max-width:900px) {
- .header-illustration.new-user-arm {
- display: none;
- }
-}
-
#content.maximised {
top: 0;
left: 0;
/* 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 {
.rsssmall {
position: relative;
- top: 5px;
+ top: 3px;
}
/* General styles for action lists / subnavs / pager navs */
float: left;
list-style: none;
border-left: 1px solid #ccc;
- padding-left: $lineheight/4;
- margin-right: $lineheight/4;
+ padding-left: $lineheight/2;
+ margin-right: $lineheight/2;
&:first-child {
border-left: 0;
padding-left: 0;
}
}
+div.secondary-actions {
+ padding: 10px;
+ border-top: 1px solid #ccc;
+ text-align: center;
+}
+
/* Utility for managing inner content areas */
.inner22 { padding: $lineheight;}
.dropdown-menu {
position: absolute;
top: 100%;
- left: 0;
+ left: -1px;
z-index: 1000;
display: none;
float: left;
list-style: none;
background-color: #ffffff;
border: 1px solid #ccc;
+ border-radius: 0 3px 3px;
*border-right-width: 2px;
*border-bottom-width: 2px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
}
.site-about #content {
- background-color: #000;
+ //background-color: #000;
+ background-color: #eee;
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: cover;
.caption {
max-width: 200px;
- font: italic 14px/20px 'Times New Roman', serif;
+ font: 13px/20px Helvetica, Arial, sans-serif;
position: fixed;
text-align: right;
right: 20px;
bottom: 60px;
text-shadow: #000 0px 1px 5px;
- color: #fff;
+ color: #eee;
+ opacity: 0.8;
display: none;
}
.attr {
position: relative;
- padding: 170px 20px 20px 20px;
+ padding: 170px 40px 20px;
background: #333;
background: rgba(0, 0, 0, .8);
margin-bottom: 0;
+ margin-top: -20px;
- strong {
+ h1 {
display: block;
color: white;
- font-size: 25px;
+ font-weight: 300;
+ font-size: 34px;
span {
color: #76c551;
}
width: 240px;
height: 150px;
padding: 20px 20px 20px 40px;
- font: bold 24px/25px Helvetica, Arial, sans-serif;
+ font: 500 20px/24px Helvetica, Arial, sans-serif;
white-space: nowrap;
color: #fff;
- background: #76c551
+ background: #76c551;
}
.byosm span {
display: inline-block;
- width: 25px;
- margin-left: -25px;
+ width: 20px;
+ margin-left: -20px;
}
}
&.local { background-position: 0px 0px; }
&.community { background-position: 0px -40px; }
&.open { background-position: 0px -80px; }
- &.contributors { background-position: 0px -120px; }
+ &.partners { background-position: 0px -120px; }
&.infringement { background-position: 0px -160px; }
}
}
@import 'browse';
+
+@media only screen and (max-width:960px) {
+ .header-illustration.new-user-arm {
+ display: none;
+ }
+}
+
projects / rails.git / blobdiff