.small_icon {
vertical-align: middle;
- margin-right: $lineheight/4;
+ margin-right: $lineheight * 0.25;
}
[dir=rtl] { /* no-r2 */ text-align: right; }
.icon.clipboard { /* no-r2 */ background-position: -160px 0; }
.icon.link { /* no-r2 */ background-position: -180px 0; }
.icon.close { /* no-r2 */ background-position: -200px 0; }
-.close-wrap:hover .icon.close,
.icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
.icon.check { /* no-r2 */ background-position: -220px 0; }
.icon.note { /* no-r2 */ background-position: -240px 0; }
.icon.note.grey { /* no-r2 */ background-position: -240px -20px; }
.icon.query { /* no-r2 */ background-position: -260px 0; }
-/* Rules for links */
-
-a {
- color: #24d;
- text-decoration: none;
- outline: 0;
- &:hover {
- text-decoration: underline;
- }
-}
-
/* Utility for de-emphasizing content */
.text-muted a {
color: $blue;
}
+/* Rules for borders */
+/* These add additional colours to those provided by bootstrap */
+.border-grey {
+ border-color: $grey !important;
+}
+
+.border-lightgrey {
+ border-color: $lightgrey !important;
+}
+
/* Rules for the header */
#menu-icon {
- display: none !important;
+ display: none;
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;
> * {
height: 100%;
- padding: $lineheight/2;
+ padding: $lineheight * 0.5;
}
h1, nav.primary {
nav.primary {
.btn-outline-primary {
- @include button-outline-variant($green, $white);
+ @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
}
.disabled {
.login-menu {
.btn-outline-secondary {
- @include button-outline-variant($darkgrey);
+ @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);
}
}
.user-menu {
.btn-outline-secondary {
- @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
+ @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);
border-color: $grey;
&:hover {
border-color: $grey;
}
- &:focus {
- background-color: white;
- box-shadow: none;
- }
}
- &.show .btn-outline-secondary {
- background-color: white;
- &:focus {
- box-shadow: none;
- }
- }
- }
-
- img.user_thumbnail_tiny {
- border: 0;
- border-radius: 3px;
}
#inboxanchor {
- display: inline-block;
- height: 25px;
- margin: 3px 0 3px 3px;
background-color: lighten($grey, 10%);
- line-height: 20px;
- border-radius: 3;
- }
-
- .dropdown-menu {
- .count-number {
- font-size: 14px;
- }
}
}
}
}
+body.small-nav {
+ #menu-icon {
+ display: block;
+ }
+
+ nav.primary,
+ nav.secondary {
+ float: none !important;
+ position: relative;
+ display: block;
+ clear: both;
+ }
+
+ header {
+ height: auto;
+ min-height: $headerHeight;
+ background: #fff;
+
+ &.closed nav {
+ display: none;
+ }
+
+ .search_forms {
+ display: block;
+ }
+ }
+
+ #sidebar .search_forms,
+ #edit_tab,
+ #export_tab {
+ display: none;
+ }
+
+ nav.primary {
+ padding: 0;
+
+ ul, li {
+ border: none;
+ border-radius: 0;
+ width: 100%;
+ }
+
+ ul {
+ border-top: 1px solid #eee;
+ li {
+ border-bottom: 1px solid #eee;
+ border-right: none;
+ > a {
+ border-radius: 0;
+ width: 100%;
+ text-align: center;
+ font-size: 15px;
+ }
+ }
+ }
+
+ .btn-group {
+ width: 100%;
+ padding: 10px;
+ }
+ }
+
+ nav.secondary {
+ .user-menu, .login-menu {
+ width: 100%;
+ }
+ }
+
+ #compact-secondary-nav {
+ display: none;
+ }
+
+ .compact-hide {
+ display: inline-block;
+ }
+
+ .overlay-sidebar #sidebar .welcome {
+ display: none;
+ }
+
+ .overlay-sidebar #sidebar #banner {
+ display: none;
+ }
+}
+
/* Utility for styling notification numbers */
.count-number {
- padding: 2px $lineheight/4;
- border-radius: 2px;
background: lighten($green, 30%);
- margin: 0 2px;
- font-size: 11px;
- color: #333;
+ color: $gray-800;
+ font-weight: $font-weight-normal;
}
/* Rules for the message shown in place of the map when javascript is disabled */
/* Rules for Leaflet maps */
+.leaflet-top.leaflet-right,
+.leaflet-top.leaflet-left {
+ height: 100%;
+ column-gap: 10px;
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap-reverse;
+}
+
.leaflet-control .control-button {
display: block;
height: 40px;
width: 40px;
background-color: #333;
background-color: rgba(0,0,0,.6);
- border-radius: 4px 0 0 4px;
- margin-bottom: 10px;
outline: none;
- &:hover {
+ &:hover,
+ &:focus {
background-color: black;
}
background-color: $vibrant-green;
}
- .icon {
- margin: 10px;
+ &-first {
+ border-start-start-radius: 4px;
}
-}
-
-.leaflet-control .zoomin,
-.control-layers .control-button {
- margin-bottom: 0px;
- border-radius: 4px 0 0 0;
-}
-.leaflet-control .zoomout,
-.control-key .control-button {
- margin-bottom: 0;
- border-radius: 0;
-}
+ &-last {
+ border-end-start-radius: 4px;
+ margin-bottom: 10px;
+ }
-.control-locate .control-button,
-.control-share .control-button {
- border-radius: 0 0 0 4px;
+ .icon {
+ margin: 10px;
+ }
}
/* Rules for the sidebar and main map area */
> div {
position: relative;
- float: left;
- clear: both;
- width: 100%;
- }
-
- h2 {
- font-size: 1.5rem;
- }
-
- h3, h4 {
- font-size: 1.25rem;
- }
-
- .close-wrap {
- cursor: pointer;
- position: absolute;
- top: 0;
- right: 0;
- width: 60px;
- height: 60px;
-
- .icon.close {
- pointer-events: none;
- position: absolute;
- right: 20px;
- top: 20px;
- }
}
}
}
.welcome {
- display: none;
-
- &.visible {
- display: block;
- }
+ display: block;
}
#sidebar_content {
display: block;
width: $sidebarWidth;
}
+
+ button.btn-close {
+ background-color: rgba(255, 255, 255, 0.5);
+ opacity: 1.0;
+ }
}
#map {
.section {
border-bottom: 1px solid $grey;
- padding: 10px 20px;
+ padding: $spacer;
}
+ }
+}
- a.close-button {
- float: right;
- padding:5px;
- font-size:20px;
- line-height:10px;
- color:#222;
- border:1px solid $grey;
+@include media-breakpoint-down(md) {
+ body.map-layout {
+ #sidebar, #map {
+ position: relative;
+ overflow-x: hidden;
+ width: 100%;
+ height: 50%;
}
- .tooltip {
- opacity: 1;
- border: 1px solid $grey;
- .tooltip-arrow {
- border-top-color: $grey;
- }
+ #map-ui {
+ z-index: 9999;
+ width: 100%;
+ height: 50%;
+ overflow-y: scroll;
}
- }
-}
-.layers-ui,
-.share-ui {
- li:last-child {
- margin-bottom: 0;
+ .overlay-sidebar {
+ #sidebar {
+ position: absolute;
+ width: 350px;
+ height: auto;
+ overflow: hidden;
+ }
+
+ #map, #map-ui {
+ height: 100%;
+ }
+ }
}
}
}
.share-ui {
- .share-tabs {
- margin-bottom: 10px;
-
- a {
- color: #fff;
- text-decoration: none;
- background-color: $lightblue;
- padding: 5px 10px;
- border-right: 1px solid #fff;
- }
-
- a:first-child {
- border-right: 1px solid #fff;
- border-radius: 4px 0 0 4px;
- }
-
- a:last-child {
- border-radius: 0 4px 4px 0;
- }
-
- a.active {
- background-color: $blue;
- }
- }
-
- .share-tab {
- display: none;
- }
-
- .share-link {
- input[type=text],
- textarea {
- width: 100%;
- font-family: monospace;
- font-size: small;
- line-height: 1.3;
- }
- }
-
- .share-image {
- label {
- margin-right: 10px;
- }
- }
-
- #embed_html {
- resize: vertical;
- }
-
#mapnik_scale {
width: 100px;
}
}
.leaflet-top {
- top: $lineheight/2 !important;
+ top: 10px !important;
.leaflet-control {
margin-right: 0px !important;
margin-top: 0px !important;
#attribution {
display: none;
-
- table {
- width: 100%
- }
-}
-
-.attribution_license,
-.attribution_project {
- text-align: left;
-}
-
-.attribution_notice {
- 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 $grey;
- > .close {
- float: right;
- margin-top: 2px;
- cursor: pointer;
- }
-}
-
#browse_status {
input {
display: block;
}
}
-#sidebar {
- #sidebar_loader,
- .search_more {
- width: 100%;
- margin: $lineheight auto;
- }
-
- .loader {
- text-align: center;
- margin: auto;
- width: 40px;
- display: block;
- }
-}
-
/* Temporary label size override until we remove site-wide font customisation */
form {
label {
font-size: 16px;
}
+ .col-form-label {
+ font-size: 16px;
+ }
+}
+
+/* Stop bootstrap 5 from floating legends when they don't need to be */
+legend {
+ float: none;
+}
+
+/* Override the text colour for primary and secondary buttons, to match our
+ bootstrap 4 colours. Note this has accessibility issues, which is why
+ bootstrap 5 calculates black as the appropriate colour, and we should
+ reconsider our colours at some point with that in mind. */
+
+.btn-primary {
+ @include button-variant($primary, $primary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
+}
+
+.btn-secondary {
+ @include button-variant($secondary, $secondary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
+}
+
+.btn-outline-secondary {
+ @include button-outline-variant($secondary, $color-hover: $white, $active-color: $white);
}
/* Rules for the search and direction forms */
.search_more .loader {
display: none;
- width: 100%;
}
}
div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
}
-td.instruction, td.distance {
- padding-top: $lineheight/5;
- padding-bottom: $lineheight/5;
- border-bottom: 1px solid $grey;
-}
td.distance {
color: $darkgrey;
text-align: right;
.routing_marker { width: 15px; cursor: move; }
-/* Rules for entity history */
-
-#sidebar_content {
- .browse_details {
- position: relative;
- border-bottom: $keyline;
- }
-}
-
.browse_status {
display: none;
}
#sidebar .changesets {
li {
- cursor: pointer;
-
&.selected { background: $list-highlight; }
/* color is derived from changeset bbox fillColor in history.js */
+
+ a.stretched-link > span, a:not(.stretched-link), [title] {
+ position: relative;
+ z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
+ }
}
.comments {
border-bottom: none;
}
- .paginate {
- border: 1px solid $lightgrey;
- border-radius: 3px;
- }
-
- .browse-field {
- margin-bottom: 10px;
-
- h4 {
- padding: 5px 0 5px 10px;
- font-size: 12px;
- border: 1px solid $grey;
- border-radius: 4px 4px 0 0;
- background-color: $offwhite;
- }
-
- p {
- padding: 7px 10px;
- font-size: 12px;
- background-color: #FFF;
- border: 1px solid $grey;
- border-top: 0;
- border-radius: 0 0 4px 4px;
- }
- }
-
.browse-tag-list {
background-color: $offwhite;
- border: 1px solid $grey;
- border-radius: 3px;
table-layout: fixed;
border-collapse: separate;
border-spacing: 0;
}
}
- .note-comments li, .changeset-comments li {
- margin: $lineheight/2 0;
-
- p {
- margin: 10px 6px 0 6px;
- line-height: 1.5;
- }
- }
-
- .comments-header {
- float: left;
- }
-
- .subscribe-buttons {
- float: left;
- margin: 0 10px;
- min-width: 80px;
- }
-
.subscribe-buttons input {
font-size: 90%;
line-height: 15px;
.export_boxy {
background: $lightgrey;
- border: 1px solid $grey;
- border-radius: 3px;
#maxlat { margin-top: -1px; }
#minlon {
}
#minlat { margin-bottom: -1px; }
}
-
- .export_bound {
- margin: $lineheight/4;
- }
-
- dl {
- padding-left: $lineheight/2;
- dd {
- margin-left: 0;
- margin-bottom: 10px;
- }
- }
}
/* Rules for edit pages */
[dir=rtl] .header-illustration {
transform: scaleX(-1);
+
+ h1 {
+ transform: scaleX(-1);
+ }
}
#content.maximised {
.content_map {
height: 200px;
- border: 1px solid $grey;
margin-bottom: $lineheight;
}
/* Rules for the user map */
.content_map .leaflet-popup-content {
- margin: $lineheight/2;
+ margin: $spacer;
min-height: 50px;
}
min-width: 200px;
p {
padding: 0 0 5px 0;
- margin-top: 0 0 0 60px;
+ margin: 0 0 0 60px;
font-size: 12px;
}
}
width: 100%;
}
-/* Rules for the diary list page */
-
-.diary_post {
- position: relative;
- padding-top: $lineheight;
- padding-bottom: $lineheight/2;
- border-top: 1px solid $grey;
-
- &:first-of-type {
- margin-top: $lineheight/2;
- }
-
- &.deleted {
- background-color: #fee;
- }
-
- .post_heading {
- margin-bottom: $lineheight;
-
- h2 {
- margin-top: 0;
- margin-bottom: $lineheight/2;
- }
- }
-
- img.user_thumbnail {
- float: left;
- }
-}
-
/* Rules for the diary entry page */
.diary_entries {
#map {
height: 400px;
- border: 1px solid $grey;
display: none;
- margin-bottom: $lineheight;
}
.comments {
max-width: 740px;
}
.diary-comment {
border-top: 1px dashed $grey;
- padding-top: $lineheight/2;
- padding-bottom: $lineheight/2;
&:first-child {
- margin-top: $lineheight/2;
- padding-top: $lineheight;
border-top: 1px solid $grey;
}
- &.deleted {
- background-color: #fee;
- }
- p {
- margin-bottom: $lineheight/2;
- }
- .comment-heading {
- margin-bottom: 0;
- margin-top: 0;
- }
- }
-}
-
-.diary_entries-show img.user_thumbnail {
- float: left;
-}
-
-/* Rules for the log in page */
-
-#login_auth_buttons {
- margin-bottom: 0;
-
- li {
- float: left;
- padding: $lineheight/4 $lineheight/2;
}
}
.users-terms {
.legale {
- border: 1px solid $grey;
padding: $lineheight;
margin-bottom: $lineheight;
overflow: auto;
}
}
-/* Rules for the account settings page */
-
-#accountForm .user_image {
- margin-bottom: 0;
-}
-
-#accountForm #user_image {
- margin-left: 20px;
-}
-
-#accountForm ul.accountImage-options {
- margin-left: 120px;
-}
-
-.nohome .location {
- display: none;
-}
-
-#homerow .message {
- display: none;
-}
-
-.nohome .message {
- display: inline !important;
-}
-
-/* Rules for the oauth settings page */
-
-.oauth_clients .buttons .oauth-edit {
- border-radius: 2px 0 0 2px;
-}
-
-.oauth_clients .buttons .oauth-delete {
- border-radius: 0 2px 2px 0;
-}
-
/* Rules for the oauth authorization page */
.oauth-authorize ul {
/* Rules for messages pages */
.messages {
- input[type="submit"] {
- margin: auto;
- }
-
.inbox-row {
background: $offwhite;
}
.inbox-row-unread {
background: #CBEEA7;
}
-
- .right {
- float: right;
- }
-}
-
-.inbox-row .inbox-mark-read {
- display: none;
-}
-
-.info-line {
- margin-bottom: $lineheight;
- padding: $lineheight/4 0px 4px 0px;
- border-bottom: 1px solid $grey;
-
- form, form div {
- display: inline;
- }
-}
-
-.info-line .user_thumbnail_tiny {
- vertical-align: middle;
-}
-
-.inbox-sent {
- white-space: nowrap;
-}
-
-.inbox-mark-unread,
-.inbox-mark-read,
-.inbox-delete {
- width: 1%;
-}
-
-.inbox-row-unread .inbox-mark-unread {
- display: none;
-}
-
-/* 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;
- }
-}
-
-/* Rules for highlighting fields with rails validation errors */
-
-.formError {
- display: inline-block;
- padding: 5px 10px;
- margin-top: 5px;
- border-radius: 4px;
- font-size: 12px;
- color: #fff;
- background-color: #ff7070;
-}
-
-/* Rules for rails validation error boxes */
-
-#errorExplanation {
- width: 400px;
- border: 2px solid #ff7070;
- padding: 0 $lineheight/2;
- margin-bottom: $lineheight;
- background-color: #f0f0f0;
-
- h2 {
- margin: 0 -10px 10px -10px;
- padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
- font-weight: bold;
- font-size: 12px;
- background-color: #c00;
- color: #fff;
- text-align: left;
- }
-
- p {
- color: #333;
- margin-bottom: 0px;
- padding: $lineheight/4;
- }
}
.search_form {
.directions_form {
background-color: $lightgrey;
-
- .loader_copy {
- display: none;
-
- img {
- vertical-align: middle;
- }
- }
-
- a.reverse_directions {
- cursor: pointer;
- }
}
/* Rules for user images */
img.user_image {
max-width: 100px;
max-height: 100px;
- border: 1px solid $grey;
}
img.user_thumbnail {
max-width: 50px;
max-height: 50px;
- border: 1px solid $grey;
}
img.user_thumbnail_tiny {
height: auto;
max-width: 25px;
max-height: 25px;
- border: 1px solid $grey;
}
-/* Rules for geo microformats */
-
-abbr.geo {
- border-bottom: none;
-}
-
-/* General styles for action lists / subnavs / pager navs */
-
+/* General styles for action lists / subnavs */
nav.secondary-actions {
margin-left: -11px;
margin-bottom: 0;
margin-left: -1px;
padding: 0;
- &.pager {
- display: inline-block;
- margin-right: 60px;
- }
> li {
flex-basis: auto;
list-style: none;
border-left: 1px solid $grey;
- padding-left: $lineheight/2;
- margin-right: $lineheight/2;
- margin-bottom: $lineheight/8;
+ padding-left: $lineheight * 0.5;
+ margin-right: $lineheight * 0.5;
+ margin-bottom: $lineheight * 0.125;
}
}
}
text-align: center;
}
-.buttons {
- min-width: 200px;
- input[type="submit"],
- input[type="button"],
- input[type="reset"],
- .button,
- .button_to {
- box-sizing: border-box;
- float: left;
- border-radius: 0;
- margin:0;
- min-width: 75px;
- max-width: 180px;
- border-right:1px solid white;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- }
- input:first-child,
- .button:first-child,
- .button_to:first-child {
- border-radius:2px 0 0 2px;
- }
- input:last-child,
- .button:last-child,
- .button_to:last-child {
- border-radius:0 2px 2px 0;
- border-right-width: 0;
- }
- input:only-child,
- .button:only-child,
- .button_to:only-child,
- *[value="Hide"] + input:last-child,
- *[value="Hide"] + .button:last-child,
- *[value="Hide"] + .button_to:last-child {
- border-radius:2px;
- border-right-width: 0;
- }
- /* if a 3-button set has a hidden middle button */
- *[value="Hide"] + input:nth-child(3),
- *[value="Hide"] + .button:nth-child(3),
- *[value="Hide"] + .button_to:nth-child(3) {
- border-radius:0 2px 2px 0;
- border-right-width: 0;
- }
- /* if a 3-button set starts with a hidden button */
- *[value="Hide"] + input:nth-child(2):not(:last-child),
- *[value="Hide"] + .button:nth-child(2):not(:last-child),
- *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
- border-radius:2px 0 0 2px;
- border-right-width: 1px;
- }
-}
-
-/* Create a single-line dl */
-
-dl.dl-inline {
- dt, dd {
- display: inline-block;
- }
- dd {
- margin-right: 1em;
- }
-}
-
-/* Customise the background colour of striped tables */
-
-.table-striped > tbody > tr:nth-child(2n+1) > td,
-.table-striped > tbody > tr:nth-child(2n+1) > th {
- background-color: $offwhite;
-}
-
-/* Rules for OpenID logo */
-
-.openid_logo {
- vertical-align: text-bottom;
- border: 0;
-}
-
/* Rules for rich text */
.richtext,
.prose {
code {
- font-size: 13px;
background: $lightgrey;
padding: 2px 3px;
}
pre {
- font-size: 13px;
background: $lightgrey;
padding: 2px 3px;
white-space: pre-wrap;
}
}
-/* Rules for the user notes list */
-
-.note_list {
- tr.creator {
- background-color: $offwhite;
- }
-}
-
/* Rules for the iD editor */
.id-embed {
/* Rules for the "Welcome" page */
.site-welcome, .site-fixthemap {
- .center {
- text-align: center;
- .sprite {
- float: none;
- margin: auto;
- }
- }
-
.sprite {
background-image: image-url("welcome-sprite.png");
background-size: 500px 250px;
display: block;
- float: left;
}
- .icon-list {
- padding-bottom: 20px;
- div {
- margin-bottom: 10px;
- p {
- padding-top: 10px;
- }
- }
- }
.sprite.small {
width: 50px;
height: 50px;
/* no-r2 */ background-position: -350px 0;
}
- .start-mapping {
- margin: auto;
- cursor: pointer;
- border: none;
- padding: 20px 40px;
- font-size: 30px;
- text-decoration: none;
- }
-
.icon.note {
background-color: #333;
border-radius: 4px;
.site-about #content {
background-color: $lightgrey;
- background-position: 50% 50%;
- background-repeat: no-repeat;
- background-size: cover;
- background-attachment: fixed;
.content-inner {
max-width: 760px;
.icon {
width: 30px;
height: 30px;
- margin-right: 10px;
- vertical-align: middle;
background: 40px 40px image-url('about/sprite.png') no-repeat;
&.local {
}
@import 'browse';
-
-@media only screen and (max-width:960px) {
- .header-illustration.new-user-arm {
- display: none;
- }
-}
projects / rails.git / blobdiff