X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cf0fccec1fa081251af21ce056ae4aff41724b01..50ea797f33409aecb6061f3f6baceb5c499edb2a:/app/assets/stylesheets/common.css.scss
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 07428268a..9e614f906 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -38,7 +38,6 @@ abbr, acronym {
strong {
font-weight: bold;
- font-weight: 500;
}
/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
@@ -105,18 +104,12 @@ body {
height: 100%;
}
-body.slim {
- background-color: #f0f0f0;
-}
-
h1, h2, h3 {
- font-weight: bold;
- font-weight: 500;
+ font-weight: 600;
line-height: 1.2;
}
h4, h5 {
- font-weight: bold;
font-weight: 500;
}
@@ -178,7 +171,7 @@ small, aside {
.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; }
+.icon.query { background-position: -260px 0; }
/* Rules for links */
@@ -212,8 +205,7 @@ table {
line-height: $lineheight;
}
th {
- font-weight: bold;
- font-weight: 500;
+ font-weight: 600;
vertical-align: top;
}
td {
@@ -310,7 +302,6 @@ nav.primary {
a.tab,
.dropdown-toggle {
display: inline-block;
- font-weight: bold;
font-weight: 500;
color: $green;
padding: 5px 15px;
@@ -632,7 +623,7 @@ nav.secondary {
float: left;
width: $sidebarWidth;
background: #fff;
- font-size: 13px;
+ font-size: 12px;
h2 {
padding: $lineheight $lineheight $lineheight/2;
@@ -641,6 +632,7 @@ nav.secondary {
h3, h4 {
margin-top: $lineheight;
margin-bottom: $lineheight/2;
+ font-size: 13px;
}
.icon.close {
@@ -671,7 +663,6 @@ nav.secondary {
p {
padding: $lineheight/2 $lineheight $lineheight;
font-size: 110%;
- font-weight: normal;
font-weight: 300;
}
@@ -692,6 +683,14 @@ nav.secondary {
#map {
height: 100%;
overflow: hidden;
+
+ &.query-active {
+ cursor: help;
+ }
+
+ &.query-disabled {
+ cursor: not-allowed;
+ }
}
#map-ui {
@@ -757,8 +756,7 @@ nav.secondary {
padding: 2px 6px;
border-bottom-right-radius: 3px;
cursor: pointer;
- font-weight: bold;
- font-weight: 500;
+ font-weight: 600;
font-size: 16px;
text-stroke: 2px #fff;
background: rgba(255,255,255,.9);
@@ -894,6 +892,12 @@ nav.secondary {
p {
padding: $lineheight;
}
+
+ input {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ }
}
#sidebar {
@@ -1031,10 +1035,11 @@ header .search_form {
h4:first-child {
margin-top: 0;
+ word-wrap: break-word;
}
}
- :last-child {
+ .browse-section:last-of-type {
border-bottom: none;
}
@@ -1075,25 +1080,25 @@ header .search_form {
border: 1px solid #ddd;
border-radius: 3px;
font-size: 12px;
+ table-layout: fixed;
+ border-collapse: separate;
- li {
+ 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%;
- float: left;
padding: 6px 10px;
+ word-wrap: break-word;
}
.browse-tag-k {
- font-weight: bold;
font-weight: 500;
background-color: #F6F6F6;
}
@@ -1119,8 +1124,41 @@ header .search_form {
}
.note-description {
+ overflow: hidden;
margin: 0 0 10px 10px;
}
+
+ .query-intro p {
+ padding: $lineheight $lineheight $lineheight/2;
+ }
+
+ .query-results {
+ display: none;
+
+ h3 {
+ padding: $lineheight $lineheight $lineheight/2;
+ margin: 0;
+ }
+
+ ul {
+ li {
+ padding: 15px 20px;
+ border-bottom: 1px solid #ddd;
+
+ &.query-result {
+ cursor: pointer;
+ }
+
+ &.selected {
+ background: #FFFFE6;
+ }
+
+ a {
+ color: #000;
+ }
+ }
+ }
+ }
}
/* Rules for export sidebar */
@@ -1165,6 +1203,7 @@ header .search_form {
.export_button {
margin-top: $lineheight;
+ margin-bottom: $lineheight;
}
dl {
@@ -1188,6 +1227,7 @@ header .search_form {
#map {
height: 100%;
+ overflow: hidden;
}
}
@@ -1200,7 +1240,7 @@ header .search_form {
}
.content-body {
- h1, h2, h3, p {
+ h1, h2, h3, p, ul, ol {
margin-bottom: $lineheight;
}
@@ -1272,43 +1312,7 @@ header .search_form {
right: 0;
bottom: 0;
border: 0;
- z-index: 1000;
-}
-
-#slim_container {
- width: 100%;
-}
-
-#slim_container_content {
- max-width: 50em;
- background-color: #FFFFFF;
- margin: $lineheight/2 auto;
- padding: 3px;
- border-radius: 25px;
- -moz-border-radius: 25px;
- border: 1px solid #e6e6e6;
-}
-
-#slim_content {
- margin: $lineheight/2;
- margin-top: 95px;
- max-width: 50em;
-
- .content-heading {
- margin-bottom: 15px;
- }
-}
-
-#slim_header {
- margin: 30px $lineheight/2;
- position: absolute;
- top: 0px;
- margin-right: $lineheight/4;
- img {
- vertical-align: middle;
- margin-bottom: $lineheight/4;
- margin-right: $lineheight/4;
- }
+ z-index: 2000;
}
/* Rules for small maps in content areas */
@@ -1678,6 +1682,10 @@ header .search_form {
vertical-align: middle;
}
+.inbox-sent {
+ white-space: nowrap;
+}
+
.inbox-mark-unread,
.inbox-mark-read,
.inbox-delete {
@@ -1690,6 +1698,7 @@ header .search_form {
.message-read .message-buttons {
margin-top: $lineheight;
+ margin-bottom: $lineheight * 1.5;
padding-top: $lineheight;
border-top: 1px solid $lightgrey;
}
@@ -1717,12 +1726,6 @@ header .search_form {
/* 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;
@@ -1746,7 +1749,6 @@ header .search_form {
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;
@@ -1780,7 +1782,6 @@ header .search_form {
margin-bottom: $lineheight/4;
font-size: $typeheight;
font-weight: bold;
- font-weight: 500;
line-height: 1.5;
}
label.standard-label.secondary {
@@ -1837,6 +1838,10 @@ textarea {
padding: 2px 5px;
margin: 0;
width: 200px;
+
+ &.field_with_errors {
+ border: 2px solid #ff7070;
+ }
}
textarea {
@@ -1863,6 +1868,8 @@ img.user_thumbnail {
}
img.user_thumbnail_tiny {
+ width: auto;
+ height: auto;
max-width: 25px;
max-height: 25px;
border: 1px solid #ccc;
@@ -2110,14 +2117,32 @@ a.button {
/* 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;
@@ -2327,7 +2352,7 @@ a.button {
}
/* Rules for the "Welcome" page */
-.site-welcome {
+.site-welcome, .site-fixthemap {
.center {
text-align: center;
.sprite {
@@ -2486,7 +2511,6 @@ a.button {
h1 {
display: block;
color: white;
- font-weight: normal;
font-weight: 300;
font-size: 34px;
span {