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