Make more use of SCSS nesting

This commit is contained in:
Thomas Levine 2013-06-10 19:05:56 -04:00 committed by Tom Hughes
parent a501ad8762
commit a2a5863561

View file

@ -214,12 +214,10 @@ table {
.sidebar-copy {
padding: 5px 10px;
}
.sidebar-copy p {
p {
margin: 5px 0;
}
}
.sidebar-copy.intro {
border-top: 1px solid #ccc;
}
@ -272,32 +270,31 @@ table {
list-style-type: none;
border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc;
}
.left_menu img {
img {
margin: 10px 0px;
}
.left_menu ul {
ul {
padding: 0;
margin: 0;
}
.left_menu li {
li {
list-style-type: none;
padding: 0;
margin: 0;
}
.left_menu h4 {
h4 {
padding: 5px 0 5px 0;
font-size: 12px;
margin: 0;
}
.left_menu li:last-child h4 {
li:last-child h4 {
padding-top: 0;
}
}
/* Rules for SOTM advert */
@ -307,11 +304,10 @@ table {
padding: 0px;
border: 0px;
background: #fff;
}
#sotm img {
img {
width: 165px;
}
}
/*
* Rules for "optional boxes" which appear in the left sidebar on
@ -328,15 +324,14 @@ table {
/* Rules for the search box */
#search_field form {
#search_field {
position: relative;
form {
width: 165px;
}
#search_field {
position: relative;
}
#search_field input[type="text"] {
input[type="text"] {
width: 165px;
padding: 3px;
font-size: 14px;
@ -346,18 +341,17 @@ table {
box-shadow: inset #DDD 0px 1px 3px;
}
#search_field input[type="text"]:focus {
input[type="text"]:focus {
outline: none;
border: 1px solid #000;
}
#search_field input[type="submit"] {
input[type="submit"] {
border: 0;
margin: 0;
padding: 0;
width: 15px;
height: 15px;
min-width: 15px;
text-indent: -1000px;
overflow: hidden;
background: image-url("sprite.png") 0 0 no-repeat;
@ -366,6 +360,7 @@ table {
right: 5px;
cursor: pointer;
}
}
.search_help {
margin: 5px 0 0 0;
@ -436,13 +431,10 @@ table {
height: 30px;
margin-bottom:0;
overflow: hidden;
}
#tabnav li {
li {
display: inline;
}
#tabnav a, #tabnav a:link, #tabnav a:visited {
a, a:link, a:visited {
float: left;
font-weight: bold;
padding: 3px 10px;
@ -455,6 +447,7 @@ table {
-o-transition: color 200ms ease-in;
transition: color 200ms ease-in;
}
}
.site-index #tabnav a#viewanchor,
.site-edit #tabnav a#editanchor,
@ -475,14 +468,10 @@ table {
#tabnav a:visited:hover.disabled {
color: #ccc;
cursor: default;
}
#tabnav a:link.disabled:hover,
#tabnav a:visited.disabled:hover,
#tabnav a:link:hover.disabled:hover,
#tabnav a:visited:hover.disabled:hover {
&:hover {
text-decoration: none;
}
}
/* Utility for styling notification numbers */
@ -577,17 +566,15 @@ table {
background-color: #ffffff;
border: 1px solid #cccccc;
border-top: 0px;
}
.menu ul {
ul {
margin: 0px;
}
.menu li {
li {
padding: 2px 5px;
border-top: 1px solid #eee;
white-space: nowrap;
}
}
/* Rules for attribution text under the main map shown on printouts */
@ -661,17 +648,15 @@ table {
#mapkey {
padding: 20px;
}
#mapkey .mapkey-table-key img {
.mapkey-table-key img {
display: block;
margin-left: auto;
margin-right: auto;
}
#mapkey td {
td {
padding: 0 5px 5px 5px;
}
}
/* Rules for search results which appear in the popout sidebar */
@ -829,13 +814,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
position: absolute;
top: 0px;
margin-right: 5px;
}
#slim_header img {
img {
vertical-align: middle;
margin-bottom: 5px;
margin-right: 5px;
}
}
.content-heading {
position: relative;
@ -1006,32 +990,32 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
font-size: 10px;
border-width: 0px;
text-align: right;
}
#trace_list .trace_summary {
.trace_summary {
font-size: 12px;
color: gray;
}
#trace_list .trace_pending {
.trace_pending {
color: red;
}
#trace_list .trace_public {
.trace_public {
color: green;
}
#trace_list .trace_identifiable {
.trace_identifiable {
color: green;
}
#trace_list .trace_trackable {
.trace_trackable {
color: red;
}
#trace_list .trace_private {
.trace_private {
color: red;
}
}
/* Rules for the user profile page */
@ -1082,14 +1066,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
margin-left: 72px;
}
.user-view p#no_home_location {
.user-view {
p#no_home_location {
margin: 20px;
}
.user-view .user_thumbnail {
.user_thumbnail {
margin-top: 5px;
float: left;
}
}
/* Rules for the user map */
@ -1102,42 +1087,37 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
.user_popup {
min-width: 200px;
}
.user_popup p {
p {
padding-top: 0;
padding-bottom: 5px;
margin-top: 0;
}
.user_popup img.user_thumbnail {
float: left;
margin: 0 10px 0 0;
}
/* Rules for user popups on maps */
.user_popup p {
margin-bottom: 0;
margin-left: 60px;
font-size: 12px;
}
img.user_thumbnail {
float: left;
margin: 0 10px 0 0;
}
}
/* Rules for the user list */
#user_list {
font-size: 10px;
width: 100%;
}
#user_list tr {
tr {
vertical-align: middle;
}
#user_list p {
p {
margin-top: 0px;
margin-bottom: 0px;
}
}
#user_list_actions {
float: right;
@ -1323,17 +1303,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
.messages {
width: 100%;
border: 1px solid #ddd;
}
.messages tbody tr {
tbody tr {
border-top: 1px solid #ccc;
}
.messages .inbox-row {
.inbox-row {
background: #f8f8ff;
}
.messages .inbox-row-unread {
.inbox-row-unread {
background:#CBEEA7;
}
@ -1341,10 +1320,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
float: right;
}
.messages tr td,
.messages tr th {
tr td,
tr th {
padding: 5px;
}
}
.inbox-row .inbox-mark-read {
display: none;
@ -1354,12 +1334,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
margin-bottom: 20px;
padding: 5px 0px 4px 0px;
border-bottom: 1px solid #ccc;
}
.info-line form,
.info-line form div {
form, form div {
display: inline;
}
}
.info-line .user_thumbnail_tiny {
vertical-align: middle;
@ -1400,9 +1379,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
padding: 10px;
margin-bottom: 20px;
background-color: #f0f0f0;
}
#errorExplanation h2 {
h2 {
margin: -10px;
padding: 5px 5px 5px 15px;
font-weight: bold;
@ -1412,24 +1389,26 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
text-align: left;
}
#errorExplanation p {
p {
color: #333;
margin-bottom: 0px;
padding: 5px;
}
#errorExplanation ul li {
ul li {
font-size: 12px;
list-style: disc;
}
/* Rules for forms */
.standard-form fieldset {
margin-bottom: 20px;
}
.standard-form label {
/* Rules for forms */
.standard-form {
fieldset {
margin-bottom: 20px;
}
label {
display: block;
width: 300px;
margin-right: 10px;
@ -1437,14 +1416,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
font-weight: bold;
line-height: 1.5;
}
.standard-form .form-row {
.form-row {
margin-bottom: 10px;
}
.standard-form input[name=remember_me] {
input[name=remember_me] {
float: left;
}
}
#remember_me_openid {
display: block;