-/* Parameters */
-$lineheight: 20px;
-$typeheight: 14px;
-
-$offwhite: #f4f4ff;
-$blue: #7092FF;
-$lightblue: #B8C5F0;
-$green: #7ebc6f;
-$grey: #CCC;
-$red: red;
-$lightgrey: #EEE;
-$darkgrey: #AAA;
-$hovercolor: 20%;
-$headerHeight: 54px;
-$sidebarWidth: 300px;
-$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
+@import "parameters";
/* Styles common to large and small screens */
cursor: help;
}
-strong { font-weight: 500; }
+strong {
+ font-weight: bold;
+}
/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
margin: 0px;
padding: 0px;
text-align: left;
+ height: 100%;
}
body.slim {
}
h1, h2, h3 {
- font-weight: 500;
+ font-weight: 600;
line-height: 1.2;
}
-h4, h5 { font-weight: 500; }
+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;
/* Rules for links */
a {
- color: #00f;
+ color: #24d;
text-decoration: none;
-webkit-appearance: none;
outline: 0;
line-height: $lineheight;
}
th {
- font-weight: 500;
+ font-weight: 600;
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;
+ font-size: 14px;
h1, nav, nav > ul, nav > ul > li, .dropdown {
display: inline-block;
> * {
height: 100%;
- padding: $lineheight/2 $lineheight;
+ padding: $lineheight/2;
}
h1, nav.primary {
img.logo {
width: 30px;
height: 30px;
- margin-top: -4px;
+ margin-top: -2px;
vertical-align: middle;
}
h1 {
margin: 0;
- padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+ padding-top: 15px;
a {
color: #000;
> li {
border-right: $border;
+ 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; }
> a:hover { background: lighten($green, 30%); }
&.current > a:hover { background: $green; }
&.disabled > a:hover { background: lighten($green, 38%); }
position: absolute;
right: 0;
- > ul a,
- .dropdown-toggle {
- display: inline-block;
- text-decoration: none;
- color: $darkgrey;
- padding: 5px;
+ > ul {
+ vertical-align: middle;
+ a, .dropdown-toggle {
+ display: inline-block;
+ text-decoration: none;
+ color: $darkgrey;
+ padding: 5px;
- &:hover { color: darken($darkgrey, 10%); }
+ &:hover { color: darken($darkgrey, 25%); }
+ }
}
> ul li.current a {
.user-menu {
$border: 1px solid $grey;
-
- font-weight: 500;
border: $border;
border-radius: $border-radius;
margin-left: 10px;
> li {
border-right: $border;
+ float: left;
&:last-child {
border-right: 0;
a {
padding: 5px 15px;
+
}
&.logged-in > a {
padding: 0;
> .user-button {
- padding: 5px 10px 5px 6px;
+ line-height: 1.8;
+ padding: 5px 10px 3px 6px;
display: inline-block;
+ color: $darkgrey;
}
+ &:hover > .user-button { color: darken($darkgrey, 5%); }
}
}
border: 0;
vertical-align: top;
margin-top: 0px;
- margin: 3px 0 0 3px;
+ margin: 4px 0 0 4px;
border-radius: 2px;
}
.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;
.map-layout {
#content {
+ overflow: hidden;
position: absolute;
top: $headerHeight;
bottom: 0;
#sidebar {
float: left;
width: $sidebarWidth;
+ background: #fff;
+ font-size: 12px;
- h2, h3, h4 {
+ h2 {
padding: $lineheight $lineheight $lineheight/2;
}
- h4 {
- font-weight: normal;
- color: #666;
- font-size: 12px;
+ h3, h4 {
+ margin-top: $lineheight;
+ margin-bottom: $lineheight/2;
+ font-size: 13px;
}
.icon.close {
- position: absolute;
- right: $lineheight;
+ float: right;
cursor: pointer;
}
+ }
- .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;
- }
+ .welcome {
+ display: none;
}
- #sidebar.minimized {
+ .overlay-sidebar #sidebar {
position: absolute;
z-index: 1000;
height: auto;
- border-right: none;
-
+ border-bottom-right-radius: 5px;
+ overflow: hidden;
+ .welcome {
+ display: block;
+ }
#sidebar_content {
display: none;
}
+ }
+
+ .welcome {
+ p {
+ padding: $lineheight/2 $lineheight $lineheight;
+ font-size: 110%;
+ font-weight: 300;
+ }
+
+ .button {
+ width: 50%;
+ float: left;
+ margin: 0;
+ border-radius: 0;
+ font-weight: normal;
+ padding: .6em;
- #search_form {
- background: none;
- width: 78%;
+ &.learn-more {
+ border-right: 1px solid #fff;
+ }
}
}
color:#222;
border:1px solid #ddd;
}
+
+ .tooltip {
+ opacity: 1;
+ border: 1px solid #ccc;
+ .tooltip-arrow {
+ border-top-color: #ccc;
+ }
+ }
}
}
label {
position: absolute;
- top: 10px;
- left: 8px;
+ top: 0;
+ left: 0;
padding: 2px 6px;
- border-radius: 3px;
+ border-bottom-right-radius: 3px;
cursor: pointer;
- font-weight: 500;
+ font-weight: 600;
font-size: 16px;
text-stroke: 2px #fff;
- background: rgba(255,255,255,.8);
- text-shadow:
- -2px -2px 1px #fff,
- 2px -2px 1px #fff,
- -2px 2px 1px #fff,
- 2px 2px 1px #fff;
+ background: rgba(255,255,255,.9);
+ z-index: 2; // For IE9
input[type="radio"] {
- vertical-align: middle;
- margin-bottom: 4px;
+ display: none;
}
}
font-size: 13px;
margin-bottom: 8px;
}
+ li.disabled { color: #999; }
}
}
}
}
-.leaflet-top.leaflet-right {
- top: $lineheight !important;
+.leaflet-top {
+ top: $lineheight/2 !important;
.leaflet-control {
margin-right: 0px !important;
margin-top: 0px !important;
text-align: center;
}
+.donate-attr { color: darken($green, 10%) !important; }
+
/* Rules for the sidebar */
.sidebar_heading {
}
}
-#sidebar_content {
- position: absolute;
- top: 50px;
- bottom: 0;
- width: 100%;
- overflow-y: auto;
+#browse_status {
+ p {
+ padding: $lineheight;
+ }
+ input {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ }
+}
+
+#sidebar {
+ #sidebar_loader,
.loader,
.load_more {
text-align: center;
margin: $lineheight auto;
- width: $lineheight;
+ width: 40px;
display: block;
}
}
/* Rules for the search box */
-#search_form {
+header .search_form {
+ display: none;
+}
+
+.search_form {
position: relative;
- padding: $lineheight/2 $lineheight;
+ padding: $lineheight/2;
+ padding-top: 1px;
background-color: $lightgrey;
- #query_wrapper {
+ .query_wrapper {
position: relative;
overflow: hidden;
+ border-radius: 2px 0 0 2px;
}
- input {
+ input[type=text] {
width: 100%;
height: 30px;
border-right: none;
- border-radius: 2px 0 0 2px;
transition: 300ms linear;
-webkit-transition: 300ms linear;
border-radius: 0 2px 2px 0;
}
- #describe_location {
- position: absolute;
- top: 6px;
- right: 6px;
+ .query_options {
+ text-align: right;
font-size: 10px;
color: $blue;
}
-}
-
-/* Rules for donation request box */
-
-a.donate {
- display: block;
- 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 $lineheight;
-
- &:hover {
- background: $green;
- 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;
+ .routing {
+ display: none;
}
}
}
}
-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */
.search_results_entry {
ul li {
color: #f00;
}
-/* Rules for data browser information which appears in the popout sidebar */
+/* Rules for routing */
-#browse_content {
- position: relative;
- .browse_show_list.button {
- position: absolute;
- left: $lineheight;
- right: $lineheight;
- bottom: -40px;
- margin-bottom: 0;
- }
- a.more-details {
- position: absolute;
- top: 0;
- right: $lineheight;
- }
- ul li {
- margin-bottom: 0;
- }
+#sidebar_content>table {
+ padding: 5px 20px 10px 15px;
+ width: 100%;
+ border-collapse: separate;
+}
+
+td.direction {
+ background-image: image-url('routing-sprite.png');
+ width: 20px; height: 20px;
+ background-repeat: no-repeat;
+}
+@for $i from 1 through 17 {
+td.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
}
+td.instruction, td.distance {
+ padding-top: 0;
+ border-bottom: 1px solid #DDD;
+}
+td.distance {
+ color: #BBB;
+ text-align: right;
+ font-size: x-small;
+}
+tr.turn {
+ cursor: pointer;
+}
+tr.turn:hover {
+ background: lighten($green, 30%);
+}
+.routing_engines, #route_from, #route_to { margin-left: 25px; }
+.routing_marker { width: 15px; position: absolute; }
+
/* Rules for entity history */
+
#sidebar_content {
.browse_details {
position: relative;
display: none;
}
-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */
#sidebar .changesets {
li {
- padding: $lineheight;
- border-bottom: $keyline;
+ padding: 15px 20px;
+ border-bottom: 1px solid #ddd;
cursor: pointer;
- &.selected { background: lighten($green, 35%); }
+ &.selected { background: #FFFFE6; }
+ /* color is derived from changeset bbox fillColor in history.js */
+ }
+
+ h4 {
+ margin: 0;
+ a {
+ color: #000;
+ }
}
}
-/* Rules for the data browser */
+/* Rules for the browse sidebar */
#sidebar_content {
.browse-section {
- padding: 10px 20px;
+ padding: $lineheight/2 $lineheight;
+ border-bottom: 1px solid #ddd;
- h4 {
- padding: 0;
+ h4:first-child {
+ margin-top: 0;
+ word-wrap: break-word;
}
}
- .paginate ul, .note-comments ul {
+ .browse-section:last-of-type {
+ border-bottom: none;
+ }
+
+ .paginate {
+ float: right;
+ padding: 1px 6px;
+ border: 1px solid #eee;
+ border-radius: 3px;
+ }
+
+ .paginate ul {
padding-left: 20px;
}
}
.browse-tag-list {
- border: 1px solid #CCC;
- border-radius: 4px;
+ background-color: #F6F6F6;
+ border: 1px solid #ddd;
+ border-radius: 3px;
font-size: 12px;
+ table-layout: fixed;
+ border-collapse: separate;
- li {
- border-bottom: 1px solid #CCC;
+ th, td {
+ border-bottom: 1px solid #ddd;
}
- li:last-child {
+ tr:last-child th, tr:last-child td {
border-bottom: 0;
}
.browse-tag-k,
.browse-tag-v {
- display: inline-block;
width: 50%;
- height: 30px;
- float: left;
padding: 6px 10px;
+ word-wrap: break-word;
}
.browse-tag-k {
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 the changeset details */
+ .warning {
+ margin: $lineheight/2 0;
+ padding: $lineheight/2;
+ font-size: 90%;
+ }
-#sidebar_content {
- .browse-section.header {
- padding: 20px;
- border-bottom: 1px solid #ccc;
+ .note-comments li {
+ margin: $lineheight/2 0;
- h2 {
- padding: 0 0 5px 0;
- border-bottom: none;
+ p {
+ margin-left: 10px;
}
}
+
+ .note-description {
+ overflow: hidden;
+ margin: 0 0 10px 10px;
+ }
}
-/* Rules for export information which appears in the popout sidebar */
+/* Rules for export sidebar */
-.export_bounds {
- text-align: center;
-}
+.export_form {
+ padding: $lineheight;
-.export_area_inputs {
- margin-bottom: $lineheight/2;
- input[type="text"] {
- width: 80px;
- margin-bottom: 5px;
+ .export_area_inputs,
+ .export_button {
+ text-align: center;
}
-}
-.export_bound {
- margin: $lineheight/4;
-}
+ .export_area_inputs {
+ margin-bottom: $lineheight/2;
+ input[type="text"] {
+ width: 80px;
+ text-align: center;
+ margin-bottom: 5px;
+ }
+ }
-#export_osm {
- span.small-title {
- font-weight: 500;
- display: block;
- font-size: 14px;
- padding-bottom: 5px;
+ .export_boxy {
+ background: #eee;
+ border: 1px solid #ccc;
+ border-radius: 3px;
+
+ #maxlat { margin-top: -1px; }
+ #minlon {
+ float: left;
+ margin-left: -1px;
+ }
+ #maxlon {
+ float: right;
+ margin-right: -1px;
+ }
+ #minlat { margin-bottom: 0; }
+ }
+
+ .export_bound {
+ margin: $lineheight/4;
+ }
+
+ .export_button {
+ margin-top: $lineheight;
+ margin-bottom: $lineheight;
}
dl {
- padding-left: 30px;
- font-size: 13px;
- color: #666;
+ padding-left: $lineheight/2;
dd {
margin-left: 0;
margin-bottom: 10px;
#map {
height: 100%;
+ overflow: hidden;
}
}
}
.content-body {
- h1, h2, h3, p {
+ h1, h2, h3, p, ul, ol {
margin-bottom: $lineheight;
}
}
}
-@media only screen and (max-width:900px) {
- .header-illustration.new-user-arm {
- display: none;
- }
-}
-
#content.maximised {
top: 0;
left: 0;
right: 0;
bottom: 0;
border: 0;
- z-index: 1000;
+ z-index: 2000;
}
#slim_container {
}
.user-view {
+ // Silly exception; remove when user page is redesigned.
+ .content-inner {
+ max-width: none;
+ }
p#no_home_location {
margin: $lineheight;
}
padding: $lineheight;
margin-bottom: $lineheight;
overflow: auto;
- height: 10em;
+ height: 20em;
}
#decline {
background: darken($lightblue, $hovercolor);
}
}
-
- .form-row {
- margin: auto;
- max-width: 370px;
- }
}
/* Rules for the account settings page */
vertical-align: middle;
}
+.inbox-sent {
+ white-space: nowrap;
+}
+
.inbox-mark-unread,
.inbox-mark-read,
.inbox-delete {
.message-read .message-buttons {
margin-top: $lineheight;
+ margin-bottom: $lineheight * 1.5;
padding-top: $lineheight;
border-top: 1px solid $lightgrey;
}
/* Rules for highlighting fields with rails validation errors */
-.field_with_errors {
- padding: 2px;
- background-color: #ff7070;
- display: inline-block;
-}
-
.formError {
display: inline-block;
padding: 5px 10px;
h2 {
margin: 0 -10px 10px -10px;
padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
- font-weight: 500;
+ font-weight: bold;
font-size: 12px;
background-color: #c00;
color: #fff;
display: block;
margin-bottom: $lineheight/4;
font-size: $typeheight;
- font-weight: 500;
+ font-weight: bold;
line-height: 1.5;
}
label.standard-label.secondary {
padding: 2px 5px;
margin: 0;
width: 200px;
+
+ &.field_with_errors {
+ border: 2px solid #ff7070;
+ }
}
textarea {
}
img.user_thumbnail_tiny {
+ width: auto;
+ height: auto;
max-width: 25px;
max-height: 25px;
border: 1px solid #ccc;
div.secondary-actions {
padding: 10px;
- border-top: 1px solid #ccc;
text-align: center;
}
float: left;
border-radius: 0;
margin:0;
- min-width: 100px;
+ min-width: 75px;
max-width: 180px;
border-right:1px solid white;
text-overflow: ellipsis;
/* Rules for rich text editors */
+input.richtext_title[type="text"] {
+ width: 50%;
+ width: -moz-calc(100% - 235px);
+ width: -webkit-calc(100% - 235px);
+ width: calc(100% - 235px);
+
+ @media only screen and (max-width:768px) {
+ width: 100%;
+ }
+}
+
.richtext_container {
margin-bottom: $lineheight;
.richtext_content {
width: 50%;
+ width: -moz-calc(100% - 235px);
+ width: -webkit-calc(100% - 235px);
+ width: calc(100% - 235px);
display: inline-block;
vertical-align: top;
+ @media only screen and (max-width:768px) {
+ width: 100%;
+ }
+
.richtext_preview {
display: inline-block;
padding: $lineheight;
}
}
-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
- padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
- h2 {
- margin-bottom: $lineheight/2;
- }
-
- div {
- margin-top: $lineheight/2;
- }
-
- .permalink {
- position: absolute;
- top: $lineheight/4;
- left: $lineheight/4;
- min-width: 15px;
- min-height: 15px;
- }
-
- .permalink span {
- display: none;
- padding-left: $lineheight;
- }
-
- .permalink:hover span {
- display: block;
- }
-
- .warning {
- display: block;
- background-color: #ffe0cc;
- padding: 4px 6px;
- margin-bottom: $lineheight/2;
- }
-
- .comment_body {
- margin-top: 2px;
- margin-bottom: 2px;
-
- p {
- margin-top: 0px;
- margin-bottom: 0px;
- }
- }
-
- .comment {
- width: 100%;
- height: 100px;
- }
-
- .buttons {
- margin-top: $lineheight/4;
- text-align: right;
- }
-}
-
/* Rules for the iD editor */
.id-embed {
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);
}
/* Rules for the "Welcome" page */
-.site-welcome {
+.site-welcome, .site-fixthemap {
.center {
text-align: center;
.sprite {
}
.site-about #content {
- background-color: #000;
+ //background-color: #000;
+ background-color: #eee;
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: cover;
&.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